diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5dbc2dc6c2..d59088df9d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,28 @@ +19990624-15:15 EDT David G. Holm + * makefile.b31 + - Removed genobj + * makefile.icc + - removed genobj + * source/rtl/copyfile.c + - Added type override to hb_xgrab() call + * source/rtl/files.c + - Removed test printf() calls that I forgot to remove from + hb_fsWrite() after debugging hb_fsCreate() last night + * source/rtl/set.c + - Minor change in last if block in HB___SETCENTURY() to avoid + a signed/unsigned comparison complaint by some compilers. + * source/tools/hb_f.c + - In hb_hbfskip(), made x the same type as read_len to avoid + a signed/unsigned comparison complaint by some compilers. + * tests/working/Makefile + - Added box.prg + * tests/working/test_all.prg + - Added optional second command line parameter. If not used, + testall.bat uses call, otherwise it uses the command shell + specified and automatically adds /c. Examples: + test_all hbdos ==> call hbdos ainstest + test_all hbdos command ==> command /c hbdos ainstest + 19990624-13:40 EDT David G. Holm * source/rtl/gt/gtwin.c - New functions for gtWhereX() and gtWhereY() contributed by Paul Tucker diff --git a/harbour/makefile.b31 b/harbour/makefile.b31 index 8b92a33063..f75c5be99e 100644 --- a/harbour/makefile.b31 +++ b/harbour/makefile.b31 @@ -22,7 +22,7 @@ harbour.lib : arrays.obj asort.obj classes.obj codebloc.obj copyfile.c \ math.obj mtran.obj objfunc.obj \ set.obj strings.obj strcmp.obj symbols.obj tclass.obj transfrm.obj -hbtools.lib : datesx.obj debug.obj genobj.obj io.obj mathx.obj \ +hbtools.lib : datesx.obj debug.obj io.obj mathx.obj \ stringp.obj stringsx.obj \ asciisum.obj ascpos.obj atdiff.obj \ chareven.obj charmix.obj charodd.obj \ @@ -74,7 +74,6 @@ initsymb.obj : source\vm\initsymb.c extend.h types.h datesx.obj : source\tools\datesx.c extend.h types.h debug.obj : source\tools\debug.c extend.h types.h ctoharb.h itemapi.h -genobj.obj : source\contrib\genobj.c extend.h types.h io.obj : source\tools\io.c extend.h types.h mathx.obj : source\tools\mathx.c extend.h types.h stringp.obj : source\tools\stringp.prg extend.h types.h init.h pcode.h harbour.exe @@ -108,10 +107,6 @@ strright.obj : source\tools\strright.c extend.h types.h bcc -c $(c_opt) -o$@ $*.c tlib .\libs\b16\harbour.lib -+$@,, -{source\contrib}.c{obj}.obj: - bcc -c $(c_opt) -o$@ $< - tlib .\libs\b16\hbtools.lib -+$@,, - {source\vm}.c{obj}.obj: bcc -c $(c_opt) -o$@ $< tlib .\libs\b16\harbour.lib -+$@,, diff --git a/harbour/makefile.icc b/harbour/makefile.icc index e55e3401ed..1bfb82da56 100644 --- a/harbour/makefile.icc +++ b/harbour/makefile.icc @@ -59,7 +59,6 @@ $(path_lib)\hbtools.lib: \ $(path_obj)\chrtotal.obj \ $(path_obj)\datesx.obj \ $(path_obj)\debug.obj \ - $(path_obj)\genobj.obj \ $(path_obj)\hb_f.obj \ $(path_obj)\io.obj \ $(path_obj)\mathx.obj \ @@ -192,10 +191,6 @@ $(path_obj)\stringp.obj : {$(path_prg)}\stringp.prg $(path_h)\pcode.h $(path_h icc /C+ $(c_opt) /Fo$@ /Tp$< ilib .\libs\icc\hbtools.lib -+$@,, -{source\contrib}.c{$(path_obj)}.obj: - icc /C+ $(c_opt) /Fo$@ /Tp$< - ilib .\libs\icc\hbtools.lib -+$@,, - $(path_exe)\harbour.exe : $(path_obj)\harboury.obj $(path_obj)\harbourl.obj $(path_obj)\genobj32.obj $(path_obj)\harbour.obj $(path_obj)\hbpp.obj $(path_obj)\hbppint.obj $(path_obj)\table.obj icc /C- $(c_opt) /Fe$(path_exe)\harbour.exe /Isource\compiler \ $(path_obj)\harboury.obj \ diff --git a/harbour/source/rtl/copyfile.c b/harbour/source/rtl/copyfile.c index c1e5a062bb..7a3b553f6b 100644 --- a/harbour/source/rtl/copyfile.c +++ b/harbour/source/rtl/copyfile.c @@ -55,7 +55,7 @@ static long hb_fsCopy(BYTEP source,BYTEP dest) hb_errRelease(pError); return( -2L) ; } - buffer = hb_xgrab( BUFFER_SIZE ); + buffer = (char *)hb_xgrab( BUFFER_SIZE ); usCount = hb_fsRead(sHANDLE,buffer,BUFFER_SIZE); while( TRUE ) { diff --git a/harbour/source/rtl/files.c b/harbour/source/rtl/files.c index ec84b5a9c7..66eab950df 100644 --- a/harbour/source/rtl/files.c +++ b/harbour/source/rtl/files.c @@ -299,9 +299,7 @@ USHORT hb_fsWrite ( FHANDLE handle, BYTEP buff, USHORT count ) USHORT bytes; #if defined(HAVE_POSIX_IO) errno = 0; -printf("\nhb_fsWrite: handle = %d", handle); bytes = write(handle,buff,count); -printf(", bytes = %u", bytes); last_error = errno; #else bytes = 0; diff --git a/harbour/source/rtl/set.c b/harbour/source/rtl/set.c index 5bd86092ed..1738a3f66f 100644 --- a/harbour/source/rtl/set.c +++ b/harbour/source/rtl/set.c @@ -242,11 +242,13 @@ HARBOUR HB___SETCENTURY (void) szNewFormat = (char*)hb_xgrab (size + 1); if (szNewFormat) { + int format_len; if (y_start > 0) memcpy (szNewFormat, szDateFormat, y_start); szNewFormat [y_start] = 0; strcat (szNewFormat, "YY"); if (hb_set_century) strcat (szNewFormat, "YY"); - if (y_stop < strlen (szDateFormat)) strcat (szNewFormat, szDateFormat + y_stop); + format_len = strlen (szDateFormat); + if (y_stop < format_len) strcat (szNewFormat, szDateFormat + y_stop); hb_xfree (szDateFormat); hb_set.HB_SET_DATEFORMAT = szNewFormat; } diff --git a/harbour/source/tools/hb_f.c b/harbour/source/tools/hb_f.c index 335e540b24..758d210dc7 100644 --- a/harbour/source/tools/hb_f.c +++ b/harbour/source/tools/hb_f.c @@ -101,9 +101,8 @@ long hb_hbfskip( int recs ) { - int x; long read_pos; - size_t read_len; + size_t x, read_len; long y; diff --git a/harbour/tests/working/Makefile b/harbour/tests/working/Makefile index 3ca0ace7f9..fa8de295d2 100644 --- a/harbour/tests/working/Makefile +++ b/harbour/tests/working/Makefile @@ -13,6 +13,7 @@ PRG_SOURCES=\ arrindex.prg \ asctest.prg \ atest.prg \ + box.prg \ byref.prg \ calling.prg \ cdow.prg \ diff --git a/harbour/tests/working/test_all.prg b/harbour/tests/working/test_all.prg index 734df5a189..c9591bf80c 100644 --- a/harbour/tests/working/test_all.prg +++ b/harbour/tests/working/test_all.prg @@ -7,7 +7,7 @@ // The TESTALL.BAT batch file has restart capability. For example, if there is an error // in testgt.prg, find and fix the problem, then restart by running "TESTALL TESTGT". -Function Main( cOption ) +Function Main( cOption, cCmd ) LOCAL aDir,f,n,o,p,cRead aDir:=Directory("*.PRG") @@ -17,6 +17,11 @@ LOCAL aDir,f,n,o,p,cRead ELSEIF Upper( cOption ) == "HRB" fWrite(o,"del test_all.out"+chr(13)+chr(10)) ENDIF + IF Empty( cCmd ) + cCmd := "call " + ELSE + cCmd += " /c " + ENDIF fWrite(o,"if not .%1==. goto %1" + Chr(13) + Chr(10)) @@ -32,7 +37,7 @@ LOCAL aDir,f,n,o,p,cRead "if errorlevel 1 goto end"+Chr(13)+Chr(10)+; "runner "+Left(aDir[f][1],Len(aDir[f][1])-4)+".hrb >> test_all.out"+Chr(13)+Chr(10) ) ELSE - fWrite(o,"call " + cOption + " " + n + Chr(13) + Chr(10); + fWrite(o,cCmd + cOption + " " + n + Chr(13) + Chr(10); + "if errorlevel 1 goto end" + Chr(13) + Chr(10) + Chr(13) + Chr(10)) ENDIF ENDIF