From 4fd9dbda0942f1be19d07cadc2887ae6683ea660 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 29 Jul 1999 03:49:30 +0000 Subject: [PATCH] *** empty log message *** --- harbour/include/{version.h => hbver.h} | 0 harbour/makefile.icc | 236 ------------------------- harbour/source/rtl/strcmp.c | 95 ---------- 3 files changed, 331 deletions(-) rename harbour/include/{version.h => hbver.h} (100%) delete mode 100644 harbour/makefile.icc delete mode 100644 harbour/source/rtl/strcmp.c diff --git a/harbour/include/version.h b/harbour/include/hbver.h similarity index 100% rename from harbour/include/version.h rename to harbour/include/hbver.h diff --git a/harbour/makefile.icc b/harbour/makefile.icc deleted file mode 100644 index 83cbda234f..0000000000 --- a/harbour/makefile.icc +++ /dev/null @@ -1,236 +0,0 @@ -# makefile for IBM C Compiler (32 bits) - -.SUFFIXES : .prg .c - -path_c = source\compiler;source\hbpp;source\vm;source\rtl;source\rtl\gt;source\rtl\natmsg;source\tools;source\contrib -path_h = include -path_l = source\compiler -path_y = source\compiler -path_exe = bin -path_lib = libs\icc -path_obj = obj -path_prg = source\rtl;source\tools - -c_opt = /DHARBOUR_USE_GTAPI /W2 /Se /Sd+ /I.\include /Ti+ - -all: $(path_exe)\harbour.exe $(path_lib)\harbour.lib $(path_lib)\hbtools.lib $(path_lib)\terminal.lib - -$(path_lib)\harbour.lib : \ - $(path_obj)\arrays.obj \ - $(path_obj)\asort.obj \ - $(path_obj)\classes.obj \ - $(path_obj)\codebloc.obj \ - $(path_obj)\console.obj \ - $(path_obj)\copyfile.obj \ - $(path_obj)\descend.obj \ - $(path_obj)\devoutp.obj \ - $(path_obj)\dates.obj \ - $(path_obj)\dir.obj \ - $(path_obj)\dynsym.obj \ - $(path_obj)\environ.obj \ - $(path_obj)\error.obj \ - $(path_obj)\errorapi.obj \ - $(path_obj)\errorsys.obj \ - $(path_obj)\extend.obj \ - $(path_obj)\files.obj \ - $(path_obj)\gtapi.obj \ - $(path_obj)\hardcr.obj \ - $(path_obj)\initsymb.obj \ - $(path_obj)\itemapi.obj \ - $(path_obj)\math.obj \ - $(path_obj)\memvars.obj \ - $(path_obj)\msguk.obj \ - $(path_obj)\mtran.obj \ - $(path_obj)\objfunc.obj \ - $(path_obj)\set.obj \ - $(path_obj)\setcolor.obj \ - $(path_obj)\strcmp.obj \ - $(path_obj)\strings.obj \ - $(path_obj)\tclass.obj \ - $(path_obj)\transfrm.obj - @echo Harbour.lib - -$(path_lib)\hbtools.lib: \ - $(path_obj)\asciisum.obj \ - $(path_obj)\ascpos.obj \ - $(path_obj)\atdiff.obj \ - $(path_obj)\chareven.obj \ - $(path_obj)\charmix.obj \ - $(path_obj)\charodd.obj \ - $(path_obj)\chrcount.obj \ - $(path_obj)\chrfirst.obj \ - $(path_obj)\chrtotal.obj \ - $(path_obj)\dates2.obj \ - $(path_obj)\datesx.obj \ - $(path_obj)\debug.obj \ - $(path_obj)\hb_f.obj \ - $(path_obj)\io.obj \ - $(path_obj)\mathx.obj \ - $(path_obj)\strasint.obj \ - $(path_obj)\strcount.obj \ - $(path_obj)\strcspn.obj \ - $(path_obj)\strdiff.obj \ - $(path_obj)\strexpan.obj \ - $(path_obj)\stringp.obj \ - $(path_obj)\stringsx.obj \ - $(path_obj)\strleft.obj \ - $(path_obj)\strpbrk.obj \ - $(path_obj)\strright.obj - @echo HBtools.lib - -$(path_lib)\terminal.lib :$(path_obj)\console.obj \ - $(path_obj)\gtos2.obj - @echo terminal.lib - -$(path_obj)\console.obj : {$(path_c)}console.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\gtapi.h $(path_h)\ctoharb.h $(path_h)\dates.h $(path_h)\set.h - icc /C+ $(c_opt) /Fo$@ /Tpsource\rtl\console.c - ilib .\libs\icc\terminal.lib -+$@,, - -$(path_obj)\gtos2.obj : {$(path_c)}gtos2.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\gtapi.h - icc /C+ $(c_opt) /Fo$@ /Tpsource\rtl\gt\gtos2.c - ilib .\libs\icc\terminal.lib -+$@,, - -$(path_obj)\arrays.obj : {$(path_c)}arrays.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\itemapi.h $(path_h)\errorapi.h $(path_h)\ctoharb.h $(path_h)\error.ch -$(path_obj)\classes.obj : {$(path_c)}classes.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\errorapi.h $(path_h)\ctoharb.h $(path_h)\error.ch -$(path_obj)\codebloc.obj : {$(path_c)}codebloc.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\itemapi.h -$(path_obj)\copyfile.obj : {$(path_c)}copyfile.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\itemapi.h $(path_h)\errorapi.h $(path_h)\error.ch $(path_h)\filesys.h $(path_h)\fileio.ch $(path_h)\filesys.api -$(path_obj)\dates.obj : {$(path_c)}dates.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\dates.h $(path_h)\set.h $(path_h)\errorapi.h $(path_h)\error.ch -$(path_obj)\dates2.obj : {$(path_c)}dates2.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\datesx.obj : {$(path_c)}datesx.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\debug.obj : {$(path_c)}debug.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\itemapi.h $(path_h)\ctoharb.h -$(path_obj)\descend.obj : {$(path_c)}descend.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\dir.obj : {$(path_c)}dir.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\itemapi.h -$(path_obj)\environ.obj : {$(path_c)}environ.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\version.h -$(path_obj)\errorapi.obj : {$(path_c)}errorapi.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\errorapi.h $(path_h)\error.ch $(path_h)\ctoharb.h -$(path_obj)\extend.obj : {$(path_c)}extend.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\set.h $(path_h)\dates.h -$(path_obj)\files.obj : {$(path_c)}files.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\gtapi.obj : {$(path_c)}gtapi.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\gtapi.h -$(path_obj)\hardcr.obj : {$(path_c)}hardcr.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\hb_f.obj : {$(path_c)}hb_f.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\filesys.h -$(path_obj)\io.obj : {$(path_c)}io.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\filesys.h -$(path_obj)\initsymb.obj : {$(path_c)}initsymb.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\itemapi.obj : {$(path_c)}itemapi.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\itemapi.h $(path_h)\set.h $(path_h)\ctoharb.h $(path_h)\dates.h -$(path_obj)\math.obj : {$(path_c)}math.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\errorapi.h $(path_h)\error.ch -$(path_obj)\memvars.obj : {$(path_c)}memvars.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\mathx.obj : {$(path_c)}mathx.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\mtran.obj : {$(path_c)}mtran.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\set.obj : {$(path_c)}set.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\set.h $(path_h)\errorapi.h $(path_h)\error.ch -$(path_obj)\setcolor.obj : {$(path_c)}setcolor.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\init.h $(path_h)\pcode.h -$(path_obj)\strcmp.obj : {$(path_c)}strcmp.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\set.h -$(path_obj)\strings.obj : {$(path_c)}strings.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\set.h $(path_h)\errorapi.h $(path_h)\error.ch -$(path_obj)\stringsx.obj : {$(path_c)}stringsx.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\transfrm.obj : {$(path_c)}transfrm.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\set.h $(path_h)\errorapi.h $(path_h)\ctoharb.h $(path_h)\error.ch $(path_h)\dates.h - -$(path_obj)\asciisum.obj : {$(path_c)}asciisum.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\ascpos.obj : {$(path_c)}ascpos.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\atdiff.obj : {$(path_c)}atdiff.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\chareven.obj : {$(path_c)}chareven.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\charmix.obj : {$(path_c)}charmix.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\charodd.obj : {$(path_c)}charodd.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\chrcount.obj : {$(path_c)}chrcount.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\chrfirst.obj : {$(path_c)}chrfirst.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\chrtotal.obj : {$(path_c)}chrtotal.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\strasint.obj : {$(path_c)}strasint.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\strcount.obj : {$(path_c)}strcount.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\strcspn.obj : {$(path_c)}strcspn.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\strdiff.obj : {$(path_c)}strdiff.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\strexpan.obj : {$(path_c)}strexpan.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\strleft.obj : {$(path_c)}strleft.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\strpbrk.obj : {$(path_c)}strpbrk.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\strright.obj : {$(path_c)}strright.c $(path_h)\extend.h $(path_h)\hbdefs.h - -$(path_obj)\msgdut.obj : {$(path_c)}msgdut.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\msggal.obj : {$(path_c)}msggal.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\msgpor.obj : {$(path_c)}msgpor.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\msgspa.obj : {$(path_c)}msgspa.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\msguk.obj : {$(path_c)}msguk.c $(path_h)\extend.h $(path_h)\hbdefs.h - -$(path_obj)\dynsym.obj : source\vm\dynsym.c $(path_h)\extend.h $(path_h)\hbdefs.h - icc /C+ $(c_opt) /Fo$@ /Tpsource\vm\dynsym.c - ilib .\libs\icc\harbour.lib -+$@,, - -$(path_obj)\asort.obj : {$(path_prg)}\asort.prg $(path_h)\pcode.h $(path_h)\init.h $(path_h)\extend.h $(path_h)\hbdefs.h {$(path_exe)}harbour.exe - $(path_exe)\harbour source\rtl\asort /n /osource\rtl - icc /C+ $(c_opt) /Fo$@ /Tpsource\rtl\asort.c - ilib .\libs\icc\harbour.lib -+$@,, - -$(path_obj)\devoutp.obj : {$(path_prg)}\devoutp.prg $(path_h)\pcode.h $(path_h)\init.h $(path_h)\extend.h $(path_h)\hbdefs.h {$(path_exe)}harbour.exe - $(path_exe)\harbour source\rtl\devoutp /n /osource\rtl - icc /C+ $(c_opt) /Fo$@ /Tpsource\rtl\devoutp.c - ilib .\libs\icc\harbour.lib -+$@,, - -$(path_obj)\error.obj : {$(path_prg)}\error.prg $(path_h)\pcode.h $(path_h)\init.h $(path_h)\extend.h $(path_h)\hbdefs.h {$(path_exe)}harbour.exe - $(path_exe)\harbour source\rtl\error /n /osource\rtl - icc /C+ $(c_opt) /Fo$@ /Tpsource\rtl\error.c - ilib .\libs\icc\harbour.lib -+$@,, - -$(path_obj)\errorsys.obj : {$(path_prg)}\errorsys.prg $(path_h)\pcode.h $(path_h)\init.h $(path_h)\extend.h $(path_h)\hbdefs.h {$(path_exe)}harbour.exe - $(path_exe)\harbour source\rtl\errorsys /n /osource\rtl - icc /C+ $(c_opt) /Fo$@ /Tpsource\rtl\errorsys.c - ilib .\libs\icc\harbour.lib -+$@,, - -$(path_obj)\objfunc.obj : {$(path_prg)}\objfunc.prg $(path_h)\pcode.h $(path_h)\init.h $(path_h)\extend.h $(path_h)\hbdefs.h {$(path_exe)}harbour.exe - $(path_exe)\harbour source\rtl\objfunc /n /osource\rtl - icc /C+ $(c_opt) /Fo$@ /Tpsource\rtl\objfunc.c - ilib .\libs\icc\harbour.lib -+$@,, - -$(path_obj)\tclass.obj : {$(path_prg)}\tclass.prg $(path_h)\pcode.h $(path_h)\init.h $(path_h)\extend.h $(path_h)\hbdefs.h {$(path_exe)}harbour.exe - $(path_exe)\harbour source\rtl\tclass /n /osource\rtl - icc /C+ $(c_opt) /Fo$@ /Tpsource\rtl\tclass.c - ilib .\libs\icc\harbour.lib -+$@,, - -$(path_obj)\msguk.obj : {$(path_c)}msguk.c $(path_h)\extend.h $(path_h)\hbdefs.h - icc /C+ $(c_opt) /Fo$@ /Tpsource\rtl\natmsg\msguk.c - ilib .\libs\icc\harbour.lib -+$@,, - -$(path_obj)\stringp.obj : {$(path_prg)}\stringp.prg $(path_h)\pcode.h $(path_h)\init.h $(path_h)\extend.h $(path_h)\hbdefs.h {$(path_exe)}harbour.exe - $(path_exe)\harbour source\tools\stringp /n /osource\tools - icc /C+ $(c_opt) /Fo$@ /Tpsource\tools\stringp.c - ilib .\libs\icc\hbtools.lib -+$@,, - -{source\rtl}.c{$(path_obj)}.obj: - icc /C+ $(c_opt) /Fo$@ /Tp$< - ilib .\libs\icc\harbour.lib -+$@,, - -{source\rtl\natmsg}.c{$(path_obj)}.obj: - icc /C+ $(c_opt) /Fo$@ /Tp$< - -{source\vm}.c{$(path_obj)}.obj: - icc /C+ $(c_opt) /Fo$@ /Tp$< - ilib .\libs\icc\harbour.lib -+$@,, - -{source\tools}.c{$(path_obj)}.obj: - icc /C+ $(c_opt) /Fo$@ /Tp$< - ilib .\libs\icc\hbtools.lib -+$@,, - -source\compiler\harboury.c : source\compiler\harbour.y - bison -d -v -y -osource\compiler\harboury.c source\compiler\harbour.y - -source\compiler\harbourl.c : source\compiler\harbour.l - flex -i -8 -osource\compiler\harbourl.c source\compiler\harbour.l - echo.>include\unistd.h - -$(path_obj)\genobj32.obj : {$(path_c)}genobj32.c -$(path_obj)\harbour.obj : {$(path_c)}harbour.c -$(path_obj)\harbourl.obj : source\compiler\harbourl.c -$(path_obj)\harboury.obj : source\compiler\harboury.c -$(path_obj)\hbpp.obj : {$(path_c)}hbpp.c -$(path_obj)\hbppint.obj : {$(path_c)}hbppint.c -$(path_obj)\table.obj : {$(path_c)}table.c - -{source\compiler}.c{$(path_obj)}.obj: - icc /C+ $(c_opt) /Fo$@ /Tp$< - -{source\hbpp}.c{$(path_obj)}.obj: - icc /C+ $(c_opt) /Fo$@ /Tp$< - -$(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 \ - $(path_obj)\harbourl.obj \ - $(path_obj)\genobj32.obj \ - $(path_obj)\hbpp.obj \ - $(path_obj)\hbppint.obj \ - $(path_obj)\table.obj \ - $(path_obj)\harbour.obj - del include\unistd.h diff --git a/harbour/source/rtl/strcmp.c b/harbour/source/rtl/strcmp.c deleted file mode 100644 index e89338787c..0000000000 --- a/harbour/source/rtl/strcmp.c +++ /dev/null @@ -1,95 +0,0 @@ -/* - * $Id$ - */ - -/* - * StrCmp. String comparision functions - * - * hb_itemStrCmp : Copyright (C) 1999 Eddie Runia (eddie@runia.com) - */ -/* Harbour Project source code - http://www.Harbour-Project.org/ - The following function is Copyright 1999 David G. Holm : - hb_stricmp(). - See doc/hdr_tpl.txt, Version 1.2 or later, for licensing terms. -*/ - -#include -#include -#include -#include - -int hb_stricmp( const char *s1, const char *s2 ) -{ - int rc = 0, c1, c2; - USHORT l1, l2, count; - l1 = strlen( s1 ); - l2 = strlen( s2 ); - if( l1 < l2 ) count = l1; - else count = l2; - while( rc == 0 && count > 0 ) - { - count--; - c1 = toupper( *s1++ ); - c2 = toupper( *s2++ ); - if( c1 != c2 ) rc = ( c1 < c2 ? -1 : 1 ); - } - if( rc == 0 && l1 != l2 ) - { - if( l1 < l2 ) rc = -1; - else rc = 1; - } - return rc; -} - -/* Check whether two strings are equal (0), smaller (-1), or greater (1) */ -int hb_itemStrCmp( PHB_ITEM pFirst, PHB_ITEM pSecond, BOOL bForceExact ) -{ - char *szFirst = pFirst->item.asString.value; - char *szSecond = pSecond->item.asString.value; - ULONG lLenFirst = pFirst->item.asString.length; - ULONG lLenSecond = pSecond->item.asString.length; - long lMinLen; - long lCounter; - int iRet = 0; /* Current status */ - - if (hb_set.HB_SET_EXACT && !bForceExact) - { /* SET EXACT ON and not using == */ - /* Don't include trailing spaces */ - while( lLenFirst > 0 && szFirst[ lLenFirst - 1 ] == ' ') lLenFirst--; - while( lLenSecond > 0 && szSecond[ lLenSecond - 1 ] == ' ') lLenSecond--; - } - lMinLen = lLenFirst < lLenSecond ? lLenFirst : lLenSecond; - if( lMinLen ) /* One of the strings is empty */ - { - for( lCounter = 0; lCounter < lMinLen && !iRet; lCounter++ ) - { - if( *szFirst != *szSecond ) /* Difference found */ - iRet = (*szFirst < *szSecond) ? -1 : 1; - else /* TODO : #define some constants*/ - { - szFirst++; - szSecond++; - } - } - if( hb_set.HB_SET_EXACT || bForceExact || lLenSecond > lCounter ) - { /* Force an exact comparison */ - if( !iRet && lLenFirst != lLenSecond ) - /* If length is different ! */ - iRet = (lLenFirst < lLenSecond) ? -1 : 1; - } - } - else - { - if( lLenFirst != lLenSecond ) /* Both empty ? */ - { - if( hb_set.HB_SET_EXACT || bForceExact ) - iRet = (lLenFirst < lLenSecond) ? -1 : 1; - else - iRet = (lLenSecond == 0) ? 0 : -1; - } - else - iRet = 0; /* Both empty => Equal ! */ - } - return(iRet); -}