fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-07-15 02:35 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/config/hpux/gcc.cf
  * harbour/config/darwin/gcc.cf
  * harbour/config/dos/watcom.cf
  * harbour/config/dos/djgpp.cf
  * harbour/config/win/watcom.cf
  * harbour/config/win/icc.cf
  * harbour/config/win/cygwin.cf
  * harbour/config/win/msvc.cf
  * harbour/config/win/xcc.cf
  * harbour/config/win/mingw.cf
  * harbour/config/win/pocc.cf
  * harbour/config/win/bcc.cf
  * harbour/config/linux/watcom.cf
  * harbour/config/linux/gcc.cf
  * harbour/config/linux/icc.cf
  * harbour/config/os2/watcom.cf
  * harbour/config/os2/gcc.cf
  * harbour/config/sunos/gcc.cf
  * harbour/config/bsd/gcc.cf
  * harbour/config/wce/msvcarm.cf
  * harbour/config/wce/mingwarm.cf
  * harbour/config/wce/poccarm.cf
    * cleanup: rtl -> hbrtl, rdd -> hbrdd

  * harbour/harbour.spec
  * harbour/harbour-win-spec
  * harbour/harbour-wce-spec
  * harbour/include/hbcomp.h
  * harbour/source/Makefile
  + harbour/source/nulrtl
  + harbour/source/nulrtl/nulrtl.c
  + harbour/source/nulrtl/Makefile
    + added hbnulrtl library to use non .prg harbour binaries

  * harbour/source/rtl/strmatch.c
  * harbour/source/common/Makefile
  + harbour/source/common/strwild.c
    * moved hb_strMatch*() functions from RTL to COMMON library
      Warning: copyright changed in new file. Viktor is rtl/strmatch.c
      copyright holder but hb_strMatch*() functions is my code.

  * harbour/source/rtl/Makefile
  - harbour/source/rtl/hbffind.c
  * harbour/source/common/Makefile
  * harbour/source/common/hbffind.c
    * moved hb_fsFind*() functions from RTL to COMMON library

  * harbour/source/main/harbour.c
  * harbour/source/main/Makefile
    * use hbnulrtl library to create harbour binaries

  * harbour/source/pp/Makefile
  * harbour/source/pp/hbpp.c
    * use hbnulrtl library to create hbpp binaries
    * added support for wildcard search

  * harbour/examples/pp/pp.c
  * harbour/examples/pp/pp.hbp
    * use hbnulrtl library to create pp binaries
      question: why is ignored -nohblib in pp.hbp?

  * harbour/contrib/rddads/ads1.c
    % removed always false if() { ... } statement
This commit is contained in:
Przemyslaw Czerpak
2009-07-15 00:37:09 +00:00
parent a03812d75a
commit e81c3d4058
42 changed files with 1117 additions and 909 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
harbour/ChangeLog
View File

@@ -17,6 +17,71 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-07-15 02:35 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/config/hpux/gcc.cf
* harbour/config/darwin/gcc.cf
* harbour/config/dos/watcom.cf
* harbour/config/dos/djgpp.cf
* harbour/config/win/watcom.cf
* harbour/config/win/icc.cf
* harbour/config/win/cygwin.cf
* harbour/config/win/msvc.cf
* harbour/config/win/xcc.cf
* harbour/config/win/mingw.cf
* harbour/config/win/pocc.cf
* harbour/config/win/bcc.cf
* harbour/config/linux/watcom.cf
* harbour/config/linux/gcc.cf
* harbour/config/linux/icc.cf
* harbour/config/os2/watcom.cf
* harbour/config/os2/gcc.cf
* harbour/config/sunos/gcc.cf
* harbour/config/bsd/gcc.cf
* harbour/config/wce/msvcarm.cf
* harbour/config/wce/mingwarm.cf
* harbour/config/wce/poccarm.cf
* cleanup: rtl -> hbrtl, rdd -> hbrdd
* harbour/harbour.spec
* harbour/harbour-win-spec
* harbour/harbour-wce-spec
* harbour/include/hbcomp.h
* harbour/source/Makefile
+ harbour/source/nulrtl
+ harbour/source/nulrtl/nulrtl.c
+ harbour/source/nulrtl/Makefile
+ added hbnulrtl library to use non .prg harbour binaries
* harbour/source/rtl/strmatch.c
* harbour/source/common/Makefile
+ harbour/source/common/strwild.c
* moved hb_strMatch*() functions from RTL to COMMON library
Warning: copyright changed in new file. Viktor is rtl/strmatch.c
copyright holder but hb_strMatch*() functions is my code.
* harbour/source/rtl/Makefile
- harbour/source/rtl/hbffind.c
* harbour/source/common/Makefile
* harbour/source/common/hbffind.c
* moved hb_fsFind*() functions from RTL to COMMON library
* harbour/source/main/harbour.c
* harbour/source/main/Makefile
* use hbnulrtl library to create harbour binaries
* harbour/source/pp/Makefile
* harbour/source/pp/hbpp.c
* use hbnulrtl library to create hbpp binaries
* added support for wildcard search
* harbour/examples/pp/pp.c
* harbour/examples/pp/pp.hbp
* use hbnulrtl library to create pp binaries
question: why is ignored -nohblib in pp.hbp?
* harbour/contrib/rddads/ads1.c
% removed always false if() { ... } statement
2009-07-14 14:07 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* contrib/hbqt/hbqt.h
* contrib/hbqt/hbqt_slots.cpp

6
harbour/config/bsd/gcc.cf
View File

@@ -40,13 +40,13 @@ LINKLIBS += -Wl,--start-group
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
# If LIBS specifies the RDD library, add all DB drivers.
ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)
LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
endif
# Add the specified GT driver library and other RTLs
ifeq ($(findstring rtl,$(LIBS)),rtl)
ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt))

6
harbour/config/darwin/gcc.cf
View File

@@ -52,13 +52,13 @@ LINKPATHS += -L$(LIB_DIR)
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
# If LIBS specifies the RDD library, add all DB drivers.
ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)
LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
endif
# Add the specified GT driver library and other RTLs
ifeq ($(findstring rtl,$(LIBS)),rtl)
ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -lhbrtl

6
harbour/config/dos/djgpp.cf
View File

@@ -39,13 +39,13 @@ LINKPATHS += -L$(LIB_DIR)
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
# If LIBS specifies the RDD library, add all DB drivers.
ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)
LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
endif
# Add the specified GT driver library and other RTLs
ifeq ($(findstring rtl,$(LIBS)),rtl)
ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt))
endif

6
harbour/config/dos/watcom.cf
View File

@@ -106,12 +106,12 @@ endif
LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib))
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
# If LIBS specifies the RDD library, add all DB drivers.
ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)
RDDLIBS = $(foreach drv, $(HB_DB_DRIVERS), $(LIB_DIR)/$(drv))
endif
ifeq ($(findstring rtl,$(LIBS)),rtl)
ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
GTLIBS = $(foreach gt, $(HB_GT_LIBS), $(LIB_DIR)/$(gt))
endif

6
harbour/config/hpux/gcc.cf
View File

@@ -46,13 +46,13 @@ LD_OUT = -o
LINKPATHS += -L$(LIB_DIR)
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
# If LIBS specifies the RDD library, add all DB drivers.
ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)
LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
endif
# Add the specified GT driver library
ifeq ($(findstring rtl,$(LIBS)),rtl)
ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -lhbrtl

6
harbour/config/linux/gcc.cf
View File

@@ -58,13 +58,13 @@ LINKLIBS += -Wl,--start-group
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
# If LIBS specifies the RDD library, add all DB drivers.
ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)
LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
endif
# Add the specified GT driver library and other RTLs
ifeq ($(findstring rtl,$(LIBS)),rtl)
ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt))

6
harbour/config/linux/icc.cf
View File

@@ -52,13 +52,13 @@ LINKLIBS += -Wl,--start-group
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
# If LIBS specifies the RDD library, add all DB drivers.
ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)
LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
endif
# Add the specified GT driver library and other RTLs
ifeq ($(findstring rtl,$(LIBS)),rtl)
ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt))

6
harbour/config/linux/watcom.cf
View File

@@ -71,12 +71,12 @@ endif
LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib))
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
# If LIBS specifies the RDD library, add all DB drivers.
ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)
RDDLIBS = $(foreach drv, $(HB_DB_DRIVERS), $(LIB_DIR)/$(drv))
endif
ifeq ($(findstring rtl,$(LIBS)),rtl)
ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
GTLIBS = $(foreach gt, $(HB_GT_LIBS), $(LIB_DIR)/$(gt))
endif

6
harbour/config/os2/gcc.cf
View File

@@ -49,13 +49,13 @@ LINKPATHS += -L$(LIB_DIR)
#LINKLIBS += -Wl,-(
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
# If LIBS specifies the RDD library, add all DB drivers.
ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)
LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
endif
# Add the specified GT driver library
ifeq ($(findstring rtl,$(LIBS)),rtl)
ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
ifeq ($(C_MAIN),)
ifeq ($(findstring os2pm,$(HB_GT_LIB)),os2pm)
# Special handling for PM mode

6
harbour/config/os2/watcom.cf
View File

@@ -92,12 +92,12 @@ endif
LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib))
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
# If LIBS specifies the RDD library, add all DB drivers.
ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)
RDDLIBS = $(foreach drv, $(HB_DB_DRIVERS), $(LIB_DIR)/$(drv))
endif
ifeq ($(findstring rtl,$(LIBS)),rtl)
ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
GTLIBS = $(foreach gt, $(HB_GT_LIBS), $(LIB_DIR)/$(gt))
endif

6
harbour/config/sunos/gcc.cf
View File

@@ -42,13 +42,13 @@ LD_OUT = -o
LINKPATHS += -L$(LIB_DIR)
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
# If LIBS specifies the RDD library, add all DB drivers.
ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)
LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
endif
# Add the specified GT driver library
ifeq ($(findstring rtl,$(LIBS)),rtl)
ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -lhbrtl

6
harbour/config/wce/mingwarm.cf
View File

@@ -43,13 +43,13 @@ LINKPATHS += -L$(LIB_DIR)
LDLIBS += $(foreach lib, $(LIBS), -l$(lib))
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
# If LIBS specifies the RDD library, add all DB drivers.
ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)
LDLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
endif
# Add the specified GT driver library
ifeq ($(findstring rtl,$(LIBS)),rtl)
ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
LDLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt))
endif

6
harbour/config/wce/msvcarm.cf
View File

@@ -59,13 +59,13 @@ LINKPATHS += /libpath:$(LIB_DIR)
# Add all libraries specified in LIBS.
LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
# If LIBS specifies the RDD library, add all DB drivers.
ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)
LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), $(drv)$(LIB_EXT))
endif
# Add the specified GT driver library
ifeq ($(findstring rtl,$(LIBS)),rtl)
ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT))
endif

6
harbour/config/wce/poccarm.cf
View File

@@ -46,13 +46,13 @@ LD_OUT = -OUT:
LINKPATHS += -LIBPATH:$(LIB_DIR)
LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
# If LIBS specifies the RDD library, add all DB drivers.
ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)
LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), $(drv)$(LIB_EXT))
endif
# Add the specified GT driver library
ifeq ($(findstring rtl,$(LIBS)),rtl)
ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT))
endif

6
harbour/config/win/bcc.cf
View File

@@ -45,13 +45,13 @@ LD_OUT = -e
LINKPATHS += -L$(LIB_DIR)
LIBLIST += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
# If LIBS specifies the RDD library, add all DB drivers.
ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)
LIBLIST += $(foreach drv, $(HB_DB_DRIVERS), $(drv)$(LIB_EXT))
endif
# Add the specified GT driver library
ifeq ($(findstring rtl,$(LIBS)),rtl)
ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
LIBLIST += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT))
endif

6
harbour/config/win/cygwin.cf
View File

@@ -47,13 +47,13 @@ LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
# This library is needed for CharToOemBuff() and OemToCharBuff() support.
LINKLIBS += -luser32 -lgdi32 -lws2_32
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
# If LIBS specifies the RDD library, add all DB drivers.
ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)
LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
endif
# Add the specified GT driver library
ifeq ($(findstring rtl,$(LIBS)),rtl)
ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -lhbrtl
endif

6
harbour/config/win/icc.cf
View File

@@ -44,13 +44,13 @@ LD_OUT = -Fe
LINKPATHS += /link /libpath:$(LIB_DIR)
LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
# If LIBS specifies the RDD library, add all DB drivers.
ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)
LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), $(drv)$(LIB_EXT))
endif
# Add the specified GT driver library
ifeq ($(findstring rtl,$(LIBS)),rtl)
ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT))
endif

6
harbour/config/win/mingw.cf
View File

@@ -45,8 +45,8 @@ LINKPATHS += -L$(LIB_DIR)
LDLIBS += $(foreach lib, $(LIBS), -l$(lib))
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
# If LIBS specifies the RDD library, add all DB drivers.
ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)
LDLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
endif
@@ -58,7 +58,7 @@ endif
endif
# Add the specified GT driver library
ifeq ($(findstring rtl,$(LIBS)),rtl)
ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
LDLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt))
endif

6
harbour/config/win/msvc.cf
View File

@@ -54,13 +54,13 @@ LD_OUT = /out:
LINKPATHS += /libpath:$(LIB_DIR)
LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
# If LIBS specifies the RDD library, add all DB drivers.
ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)
LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), $(drv)$(LIB_EXT))
endif
# Add the specified GT driver library
ifeq ($(findstring rtl,$(LIBS)),rtl)
ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT))
endif

6
harbour/config/win/pocc.cf
View File

@@ -43,13 +43,13 @@ LD_OUT = -OUT:
LINKPATHS += -LIBPATH:$(LIB_DIR)
LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
# If LIBS specifies the RDD library, add all DB drivers.
ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)
LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), $(drv)$(LIB_EXT))
endif
# Add the specified GT driver library
ifeq ($(findstring rtl,$(LIBS)),rtl)
ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT))
endif

6
harbour/config/win/watcom.cf
View File

@@ -95,12 +95,12 @@ endif
LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib))
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
# If LIBS specifies the RDD library, add all DB drivers.
ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)
RDDLIBS = $(foreach drv, $(HB_DB_DRIVERS), $(LIB_DIR)/$(drv))
endif
ifeq ($(findstring rtl,$(LIBS)),rtl)
ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
GTLIBS = $(foreach gt, $(HB_GT_LIBS), $(LIB_DIR)/$(gt))
endif

6
harbour/config/win/xcc.cf
View File

@@ -37,13 +37,13 @@ LD_OUT = -OUT:
LINKPATHS += -LIBPATH:$(LIB_DIR)
LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
# If LIBS specifies the RDD library, add all DB drivers.
ifeq ($(findstring hbrdd,$(LIBS)),hbrdd)
LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), $(drv)$(LIB_EXT))
endif
# Add the specified GT driver library
ifeq ($(findstring rtl,$(LIBS)),rtl)
ifeq ($(findstring hbrtl,$(LIBS)),hbrtl)
LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT))
endif

4
harbour/contrib/rddads/ads1.c
View File

@@ -1020,10 +1020,6 @@ static HB_ERRCODE adsSeek( ADSAREAP pArea, BOOL bSoftSeek, PHB_ITEM pKey, BOOL b
else
{
commonError( pArea, EG_DATATYPE, 1020, 0, NULL, 0, NULL );
#if defined( ADS_USE_OEM_TRANSLATION ) && ADS_LIB_VERSION < 600
if( pszKeyFree )
hb_adsOemAnsiFree( ( char * ) pszKeyFree );
#endif
return HB_FAILURE;
}

47
harbour/examples/pp/pp.c
View File

@@ -485,53 +485,6 @@ void hb_compGenWarning( HB_COMP_DECL, const char* _szWarnings[], char cPrefix, i
}
}
void * hb_xgrab( ULONG ulSize ) /* allocates fixed memory, exits on failure */
{
void * pMem = malloc( ulSize );
HB_TRACE(HB_TR_DEBUG, ("hb_xgrab(%lu)", ulSize));
if( ! pMem )
hb_compGenError( NULL, hb_pp_szErrors, 'P', HB_PP_ERR_MEMALLOC, NULL, NULL );
return pMem;
}
void * hb_xrealloc( void * pMem, ULONG ulSize ) /* reallocates memory */
{
void * pResult = realloc( pMem, ulSize );
HB_TRACE(HB_TR_DEBUG, ("hb_xrealloc(%p, %lu)", pMem, ulSize));
if( ! pResult )
hb_compGenError( NULL, hb_pp_szErrors, 'P', HB_PP_ERR_MEMREALLOC, NULL, NULL );
return pResult;
}
void hb_xfree( void * pMem ) /* frees fixed memory */
{
HB_TRACE(HB_TR_DEBUG, ("hb_xfree(%p)", pMem));
if( pMem )
free( pMem );
else
hb_compGenError( NULL, hb_pp_szErrors, 'P', HB_PP_ERR_MEMFREE, NULL, NULL );
}
char * hb_fsNameConv( char * szFileName, BOOL * pfFree )
{
if( pfFree )
* pfFree = FALSE;
return szFileName;
}
int hb_setGetDirSeparator( void )
{
return HB_OS_PATH_DELIM_CHR;
}
int hb_verSvnID( void )
{
return 0;

5
harbour/examples/pp/pp.hbp
View File

@@ -3,3 +3,8 @@
#
pp.c hbppcomp.c hbppcore.c hbpptbl.c hbpragma.c
-lhbcommon
-lhbnulrtl
-static
# it does not work here
-nohblib

1
harbour/harbour-wce-spec
View File

@@ -319,6 +319,7 @@ rm -fR $RPM_BUILD_ROOT
%{_libdir}/%{name}/libhbzlib.a
%{_libdir}/%{name}/libhbextern.a
%{_libdir}/%{name}/libhbnulrdd.a
%{_libdir}/%{name}/libhbnulrtl.a
%{_libdir}/%{name}/libhbpp.a
%{_libdir}/%{name}/libhbrdd.a
%{_libdir}/%{name}/libhbhsx.a

1
harbour/harbour-win-spec
View File

@@ -319,6 +319,7 @@ rm -fR $RPM_BUILD_ROOT
%{_libdir}/%{name}/libhbzlib.a
%{_libdir}/%{name}/libhbextern.a
%{_libdir}/%{name}/libhbnulrdd.a
%{_libdir}/%{name}/libhbnulrtl.a
%{_libdir}/%{name}/libhbpp.a
%{_libdir}/%{name}/libhbrdd.a
%{_libdir}/%{name}/libhbhsx.a

1
harbour/harbour.spec
View File

@@ -641,6 +641,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/%{name}/libhbzlib.a
%{_libdir}/%{name}/libhbextern.a
%{_libdir}/%{name}/libhbnulrdd.a
%{_libdir}/%{name}/libhbnulrtl.a
%{_libdir}/%{name}/libhbpp.a
%{_libdir}/%{name}/libhbrdd.a
%{_libdir}/%{name}/libhbhsx.a

2
harbour/include/hbcomp.h
View File

@@ -82,6 +82,8 @@ extern void hb_compPCodeTrace( PFUNCTION, const HB_PCODE_FUNC_PTR *, void * );
extern void hb_compGenLabelTable( PFUNCTION pFunc, PHB_LABEL_INFO label_info );
extern PHB_DEBUGINFO hb_compGetDebugInfo( HB_COMP_DECL );
extern void hb_compChkFileSwitches( int argc, char * argv[] );
extern void hb_compInitPP( HB_COMP_DECL, int argc, const char * const argv[] );
extern void hb_compCompileEnd( HB_COMP_DECL );

6
harbour/source/Makefile
View File

@@ -8,7 +8,8 @@ ifeq ($(HB_HOST_BUILD),yes)
DIRS=\
common \
pp{common} \
nulrtl \
pp{common,nulrtl} \
compiler{pp} \
main{compiler} \
@@ -24,7 +25,8 @@ endif
DIRS=\
common \
pp{common} \
nulrtl \
pp{common,nulrtl} \
compiler{pp} \
$(HB_COMP_DIR) \
rtl$(HB_COMP_REF) \

4
harbour/source/common/Makefile
View File

@@ -7,8 +7,9 @@ ROOT = ../../
C_SOURCES=\
expropt1.c \
expropt2.c \
hbfsapi.c \
hbffind.c \
hbfopen.c \
hbfsapi.c \
hbgete.c \
hbwince.c \
hbhash.c \
@@ -21,6 +22,7 @@ C_SOURCES=\
hbverdsp.c \
hbarch.c \
reserved.c \
strwild.c \
PRG_SOURCES=\

0
harbour/source/rtl/hbffind.c → harbour/source/common/hbffind.c
View File

285
harbour/source/common/strwild.c Normal file
View File

@@ -0,0 +1,285 @@
/*
* $Id$
*/
/*
* Harbour Project source code:
* wildcards / file match functions
*
* Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
* www - http://www.harbour-project.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
*
* As a special exception, the Harbour Project gives permission for
* additional uses of the text contained in its release of Harbour.
*
* The exception is that, if you link the Harbour libraries with other
* files to produce an executable, this does not by itself cause the
* resulting executable to be covered by the GNU General Public License.
* Your use of that executable is in no way restricted on account of
* linking the Harbour library code into it.
*
* This exception does not however invalidate any other reasons why
* the executable file might be covered by the GNU General Public License.
*
* This exception applies only to the code released by the Harbour
* Project under the name Harbour. If you copy code from other
* Harbour Project or Free Software Foundation releases into a copy of
* Harbour, as the General Public License permits, the exception does
* not apply to the code that you add in this way. To avoid misleading
* anyone as to the status of such modified files, you must delete
* this exception notice from them.
*
* If you write modifications of your own for Harbour, it is your choice
* whether to permit this exception to apply to your modifications.
* If you do not wish that, delete this exception notice.
*
*/
#include "hbapi.h"
#if defined( HB_OS_UNIX ) && !defined( HB_NO_FNMATCH )
# include <fnmatch.h>
#endif
#define HB_MAX_WILDPATTERN 256
BOOL hb_strMatchWild( const char *szString, const char *szPattern )
{
BOOL fMatch = TRUE, fAny = FALSE;
ULONG pulBufPosP[ HB_MAX_WILDPATTERN ], pulBufPosV[ HB_MAX_WILDPATTERN ],
ulBufSize = HB_MAX_WILDPATTERN;
ULONG * ulAnyPosP = pulBufPosP, * ulAnyPosV = pulBufPosV,
ulSize, ulLen, ulAny, i, j;
i = j = ulAny = 0;
ulLen = strlen( szString );
ulSize = strlen( szPattern );
while( i < ulSize )
{
if( szPattern[i] == '*' )
{
fAny = TRUE;
i++;
}
else if( j < ulLen && ( szPattern[i] == '?' || szPattern[i] == szString[j] ) )
{
if( fAny )
{
if( ulAny >= ulBufSize )
{
if( ( ulBufSize <<= 1 ) == ( HB_MAX_WILDPATTERN << 1 ) )
{
ulAnyPosP = ( ULONG * ) hb_xgrab( ulBufSize * sizeof( ULONG ) );
ulAnyPosV = ( ULONG * ) hb_xgrab( ulBufSize * sizeof( ULONG ) );
memcpy( ulAnyPosP, pulBufPosP, HB_MAX_WILDPATTERN * sizeof( ULONG ) );
memcpy( ulAnyPosV, pulBufPosV, HB_MAX_WILDPATTERN * sizeof( ULONG ) );
}
else
{
ulAnyPosP = ( ULONG * ) hb_xrealloc( ulAnyPosP, ulBufSize * sizeof( ULONG ) );
ulAnyPosV = ( ULONG * ) hb_xrealloc( ulAnyPosV, ulBufSize * sizeof( ULONG ) );
}
}
ulAnyPosP[ulAny] = i;
ulAnyPosV[ulAny] = j;
ulAny++;
fAny = FALSE;
}
j++;
i++;
}
else if( fAny && j < ulLen )
{
j++;
}
else if( ulAny > 0 )
{
ulAny--;
i = ulAnyPosP[ulAny];
j = ulAnyPosV[ulAny] + 1;
fAny = TRUE;
}
else
{
fMatch = FALSE;
break;
}
}
if( ulBufSize > HB_MAX_WILDPATTERN )
{
hb_xfree( ulAnyPosP );
hb_xfree( ulAnyPosV );
}
return fMatch;
}
BOOL hb_strMatchWildExact( const char *szString, const char *szPattern )
{
BOOL fMatch = TRUE, fAny = FALSE;
ULONG pulBufPosP[ HB_MAX_WILDPATTERN ], pulBufPosV[ HB_MAX_WILDPATTERN ],
ulBufSize = HB_MAX_WILDPATTERN;
ULONG * ulAnyPosP = pulBufPosP, * ulAnyPosV = pulBufPosV,
ulSize, ulLen, ulAny, i, j;
i = j = ulAny = 0;
ulLen = strlen( szString );
ulSize = strlen( szPattern );
while( i < ulSize || ( j < ulLen && !fAny ) )
{
if( i < ulSize && szPattern[i] == '*' )
{
fAny = TRUE;
i++;
}
else if( j < ulLen && i < ulSize &&
( szPattern[i] == '?' || szPattern[i] == szString[j] ) )
{
if( fAny )
{
if( ulAny >= ulBufSize )
{
if( ( ulBufSize <<= 1 ) == ( HB_MAX_WILDPATTERN << 1 ) )
{
ulAnyPosP = ( ULONG * ) hb_xgrab( ulBufSize * sizeof( ULONG ) );
ulAnyPosV = ( ULONG * ) hb_xgrab( ulBufSize * sizeof( ULONG ) );
memcpy( ulAnyPosP, pulBufPosP, HB_MAX_WILDPATTERN * sizeof( ULONG ) );
memcpy( ulAnyPosV, pulBufPosV, HB_MAX_WILDPATTERN * sizeof( ULONG ) );
}
else
{
ulAnyPosP = ( ULONG * ) hb_xrealloc( ulAnyPosP, ulBufSize * sizeof( ULONG ) );
ulAnyPosV = ( ULONG * ) hb_xrealloc( ulAnyPosV, ulBufSize * sizeof( ULONG ) );
}
}
ulAnyPosP[ulAny] = i;
ulAnyPosV[ulAny] = j;
ulAny++;
fAny = FALSE;
}
j++;
i++;
}
else if( fAny && j < ulLen )
{
j++;
}
else if( ulAny > 0 )
{
ulAny--;
i = ulAnyPosP[ulAny];
j = ulAnyPosV[ulAny] + 1;
fAny = TRUE;
}
else
{
fMatch = FALSE;
break;
}
}
if( ulBufSize > HB_MAX_WILDPATTERN )
{
hb_xfree( ulAnyPosP );
hb_xfree( ulAnyPosV );
}
return fMatch;
}
BOOL hb_strMatchCaseWildExact( const char *szString, const char *szPattern )
{
BOOL fMatch = TRUE, fAny = FALSE;
ULONG pulBufPosP[ HB_MAX_WILDPATTERN ], pulBufPosV[ HB_MAX_WILDPATTERN ],
ulBufSize = HB_MAX_WILDPATTERN;
ULONG * ulAnyPosP = pulBufPosP, * ulAnyPosV = pulBufPosV,
ulSize, ulLen, ulAny, i, j;
i = j = ulAny = 0;
ulLen = strlen( szString );
ulSize = strlen( szPattern );
while ( i < ulSize || ( j < ulLen && !fAny ) )
{
if( i < ulSize && szPattern[i] == '*' )
{
fAny = TRUE;
i++;
}
else if( j < ulLen && i < ulSize &&
( szPattern[i] == '?' ||
hb_charUpper( szPattern[i] ) == hb_charUpper( szString[j] ) ) )
{
if( fAny )
{
if( ulAny >= ulBufSize )
{
if( ( ulBufSize <<= 1 ) == ( HB_MAX_WILDPATTERN << 1 ) )
{
ulAnyPosP = ( ULONG * ) hb_xgrab( ulBufSize * sizeof( ULONG ) );
ulAnyPosV = ( ULONG * ) hb_xgrab( ulBufSize * sizeof( ULONG ) );
memcpy( ulAnyPosP, pulBufPosP, HB_MAX_WILDPATTERN * sizeof( ULONG ) );
memcpy( ulAnyPosV, pulBufPosV, HB_MAX_WILDPATTERN * sizeof( ULONG ) );
}
else
{
ulAnyPosP = ( ULONG * ) hb_xrealloc( ulAnyPosP, ulBufSize * sizeof( ULONG ) );
ulAnyPosV = ( ULONG * ) hb_xrealloc( ulAnyPosV, ulBufSize * sizeof( ULONG ) );
}
}
ulAnyPosP[ulAny] = i;
ulAnyPosV[ulAny] = j;
ulAny++;
fAny = FALSE;
}
j++;
i++;
}
else if( fAny && j < ulLen )
{
j++;
}
else if( ulAny > 0 )
{
ulAny--;
i = ulAnyPosP[ulAny];
j = ulAnyPosV[ulAny] + 1;
fAny = TRUE;
}
else
{
fMatch = FALSE;
break;
}
}
if( ulBufSize > HB_MAX_WILDPATTERN )
{
hb_xfree( ulAnyPosP );
hb_xfree( ulAnyPosV );
}
return fMatch;
}
BOOL hb_strMatchFile( const char * szString, const char * szPattern )
{
#if defined( HB_OS_UNIX )
# if defined( HB_NO_FNMATCH )
return hb_strMatchWildExact( szString, szPattern );
# else
return fnmatch( szPattern, szString, FNM_PERIOD | FNM_PATHNAME ) == 0;
# endif
#else
return hb_strMatchCaseWildExact( szString, szPattern );
#endif
}

1
harbour/source/main/Makefile
View File

@@ -12,5 +12,6 @@ LIBS=\
hbcplr \
hbpp \
hbcommon \
hbnulrtl \
include $(TOP)$(ROOT)config/bin.cf

510
harbour/source/main/harbour.c
View File

@@ -51,514 +51,7 @@
*/
#include "hbcomp.h"
#include "hbapifs.h"
#include "hbmemory.ch"
#include "hbverbld.h"
#include "hbset.h"
/* ------------------------------------------------------------------------- */
/* FM statistic module */
/* ------------------------------------------------------------------------- */
/* remove this 'undef' when number of memory leaks will be reduced to
reasonable size */
/* #undef HB_FM_STATISTICS */
#ifdef HB_FM_STATISTICS
#define HB_MEMINFO_SIGNATURE 0xDEADBEAF
#define HB_MEMSTR_BLOCK_MAX 256
#ifndef HB_MEMFILER
# define HB_MEMFILER 0xff
#endif
typedef struct _HB_MEMINFO
{
struct _HB_MEMINFO * pPrevBlock;
struct _HB_MEMINFO * pNextBlock;
ULONG ulSize;
UINT32 Signature;
} HB_MEMINFO, * PHB_MEMINFO;
#ifdef HB_ALLOC_ALIGNMENT
# define HB_MEMINFO_SIZE ( ( sizeof( HB_MEMINFO ) + HB_ALLOC_ALIGNMENT - 1 ) - \
( sizeof( HB_MEMINFO ) + HB_ALLOC_ALIGNMENT - 1 ) % HB_ALLOC_ALIGNMENT )
#else
# define HB_MEMINFO_SIZE sizeof( HB_MEMINFO )
#endif
static PHB_MEMINFO s_pMemBlocks = NULL;
static long s_ulMemoryBlocks = 0; /* memory blocks used */
static long s_ulMemoryMaxBlocks = 0; /* maximum number of used memory blocks */
static long s_ulMemoryMaxConsumed = 0; /* memory size consumed */
static long s_ulMemoryConsumed = 0; /* memory max size consumed */
#endif /* HB_FM_STATISTICS */
void * hb_xgrab( ULONG ulSize ) /* allocates fixed memory, exits on failure */
{
void * pMem;
if( ulSize == 0 )
hb_errInternal( HB_EI_XGRABNULLSIZE, "hb_xgrab requested to allocate zero bytes", NULL, NULL );
#ifdef HB_FM_STATISTICS
pMem = malloc( ulSize + HB_MEMINFO_SIZE + sizeof( UINT32 ) );
if( pMem )
{
if( s_pMemBlocks )
s_pMemBlocks->pPrevBlock = ( PHB_MEMINFO ) pMem;
( ( PHB_MEMINFO ) pMem )->pNextBlock = s_pMemBlocks;
( ( PHB_MEMINFO ) pMem )->pPrevBlock = NULL;
s_pMemBlocks = ( PHB_MEMINFO ) pMem;
( ( PHB_MEMINFO ) pMem )->ulSize = ulSize;
( ( PHB_MEMINFO ) pMem )->Signature = HB_MEMINFO_SIGNATURE;
HB_PUT_LE_UINT32( ( ( BYTE * ) pMem ) + HB_MEMINFO_SIZE + ulSize, HB_MEMINFO_SIGNATURE );
s_ulMemoryConsumed += ulSize;
if( s_ulMemoryMaxConsumed < s_ulMemoryConsumed )
s_ulMemoryMaxConsumed = s_ulMemoryConsumed;
s_ulMemoryBlocks++;
if( s_ulMemoryMaxBlocks < s_ulMemoryBlocks )
s_ulMemoryMaxBlocks = s_ulMemoryBlocks;
pMem = ( BYTE * ) pMem + HB_MEMINFO_SIZE;
}
else
#else
pMem = malloc( ulSize );
if( ! pMem )
#endif
hb_errInternal( HB_EI_XGRABALLOC, "hb_xgrab can't allocate memory", NULL, NULL );
return pMem;
}
void * hb_xrealloc( void * pMem, ULONG ulSize ) /* reallocates memory */
{
#ifdef HB_FM_STATISTICS
PHB_MEMINFO pMemBlock;
ULONG ulMemSize;
void * pResult;
if( ulSize == 0 )
{
if( pMem )
hb_xfree( pMem );
return NULL;
}
else if( ! pMem )
return hb_xgrab( ulSize );
pMemBlock = ( PHB_MEMINFO ) ( ( BYTE * ) pMem - HB_MEMINFO_SIZE );
ulMemSize = pMemBlock->ulSize;
if( pMemBlock->Signature != HB_MEMINFO_SIGNATURE )
hb_errInternal( HB_EI_XREALLOCINV, "hb_xrealloc called with an invalid pointer", NULL, NULL );
if( HB_GET_LE_UINT32( ( ( BYTE * ) pMem ) + ulMemSize ) != HB_MEMINFO_SIGNATURE )
hb_errInternal( HB_EI_XMEMOVERFLOW, "Memory buffer overflow", NULL, NULL );
HB_PUT_LE_UINT32( ( ( BYTE * ) pMem ) + ulMemSize, 0 );
pResult = realloc( pMemBlock, ulSize + HB_MEMINFO_SIZE + sizeof( UINT32 ) );
if( pResult )
{
if( s_pMemBlocks == pMemBlock )
s_pMemBlocks = ( PHB_MEMINFO ) pResult;
else
( ( PHB_MEMINFO ) pResult )->pPrevBlock->pNextBlock = ( PHB_MEMINFO ) pResult;
if( ( ( PHB_MEMINFO ) pResult )->pNextBlock )
( ( PHB_MEMINFO ) pResult )->pNextBlock->pPrevBlock = ( PHB_MEMINFO ) pResult;
s_ulMemoryConsumed += ( ulSize - ulMemSize );
if( s_ulMemoryMaxConsumed < s_ulMemoryConsumed )
s_ulMemoryMaxConsumed = s_ulMemoryConsumed;
( ( PHB_MEMINFO ) pResult )->ulSize = ulSize; /* size of the memory block */
HB_PUT_LE_UINT32( ( ( BYTE * ) pResult ) + ulSize + HB_MEMINFO_SIZE, HB_MEMINFO_SIGNATURE );
pResult = ( BYTE * ) pResult + HB_MEMINFO_SIZE;
}
#else
void * pResult = realloc( pMem, ulSize );
#endif
if( ! pResult && ulSize )
hb_errInternal( HB_EI_XREALLOC, "hb_xrealloc can't reallocate memory", NULL, NULL );
return pResult;
}
void hb_xfree( void * pMem ) /* frees fixed memory */
{
if( pMem )
{
#ifdef HB_FM_STATISTICS
PHB_MEMINFO pMemBlock = ( PHB_MEMINFO ) ( ( BYTE * ) pMem - HB_MEMINFO_SIZE );
if( pMemBlock->Signature != HB_MEMINFO_SIGNATURE )
hb_errInternal( HB_EI_XFREEINV, "hb_xfree called with an invalid pointer", NULL, NULL );
if( HB_GET_LE_UINT32( ( ( BYTE * ) pMem ) + pMemBlock->ulSize ) != HB_MEMINFO_SIGNATURE )
hb_errInternal( HB_EI_XMEMOVERFLOW, "Memory buffer overflow", NULL, NULL );
s_ulMemoryConsumed -= pMemBlock->ulSize;
s_ulMemoryBlocks--;
if( s_pMemBlocks == pMemBlock )
s_pMemBlocks = pMemBlock->pNextBlock;
else
pMemBlock->pPrevBlock->pNextBlock = pMemBlock->pNextBlock;
if( pMemBlock->pNextBlock )
pMemBlock->pNextBlock->pPrevBlock = pMemBlock->pPrevBlock;
pMemBlock->Signature = 0;
HB_PUT_LE_UINT32( ( ( BYTE * ) pMem ) + pMemBlock->ulSize, 0 );
pMem = ( BYTE * ) pMem - HB_MEMINFO_SIZE;
#endif
free( pMem );
}
else
hb_errInternal( HB_EI_XFREENULL, "hb_xfree called with a NULL pointer", NULL, NULL );
}
ULONG hb_xquery( int iMode )
{
ULONG ulResult = 0;
#ifdef HB_FM_STATISTICS
switch( iMode )
{
case HB_MEM_USED:
ulResult = s_ulMemoryConsumed;
break;
case HB_MEM_USEDMAX:
ulResult = s_ulMemoryMaxConsumed;
break;
}
#else
HB_SYMBOL_UNUSED( iMode );
#endif
return ulResult;
}
#ifdef HB_FM_STATISTICS
static char * hb_memToStr( char * szBuffer, void * pMem, ULONG ulSize )
{
unsigned char *byMem = ( BYTE * ) pMem;
char * pDest = szBuffer;
int iSize, i, iPrintable;
if( ulSize > HB_MEMSTR_BLOCK_MAX )
iSize = HB_MEMSTR_BLOCK_MAX;
else
iSize = ( int ) ulSize;
iPrintable = 0;
for( i = 0; i < iSize; ++i )
if( ( byMem[ i ] & 0x7f ) >= 0x20 )
iPrintable++;
if( ( iPrintable * 100 ) / iSize > 70 ) /* more then 70% printable chars */
{
/* format as string of original chars */
for( i = 0; i < iSize; ++i )
if( ( byMem[ i ] & 0x7f ) >= 0x20 )
* pDest++ = byMem[ i ];
else
* pDest++ = '.';
}
else
{
/* format as hex */
for( i = 0; i < iSize; ++i )
{
int iLo = byMem[ i ] & 0x0f, iHi = byMem[ i ] >> 4;
* pDest++ = '\\';
* pDest++ = iHi <= 9 ? '0' + iHi : 'A' - 10 + iHi;
* pDest++ = iLo <= 9 ? '0' + iLo : 'A' - 10 + iLo;
}
}
* pDest = '\0';
return szBuffer;
}
#endif
void hb_xexit( void )
{
#ifdef HB_FM_STATISTICS
if( s_ulMemoryBlocks /* || hb_cmdargCheck( "INFO" ) */ )
{
char szBuffer[ HB_MAX( 3 * HB_MEMSTR_BLOCK_MAX + 1, 100 ) ];
PHB_MEMINFO pMemBlock;
int i;
hb_conOutErr( hb_conNewLine(), 0 );
hb_conOutErr( "----------------------------------------", 0 );
hb_conOutErr( hb_conNewLine(), 0 );
hb_snprintf( szBuffer, sizeof( szBuffer ), "Total memory allocated: %lu bytes (%lu blocks)", s_ulMemoryMaxConsumed, s_ulMemoryMaxBlocks );
hb_conOutErr( szBuffer, 0 );
if( s_ulMemoryBlocks )
{
hb_conOutErr( hb_conNewLine(), 0 );
hb_snprintf( szBuffer, sizeof( szBuffer ), "WARNING! Memory allocated but not released: %lu bytes (%lu blocks)", s_ulMemoryConsumed, s_ulMemoryBlocks );
hb_conOutErr( szBuffer, 0 );
}
hb_conOutErr( hb_conNewLine(), 0 );
for( i = 1, pMemBlock = s_pMemBlocks; pMemBlock; ++i, pMemBlock = pMemBlock->pNextBlock )
HB_TRACE( HB_TR_ERROR, ( "Block %i %p (size %lu) \"%s\"", i,
( char * ) pMemBlock + HB_MEMINFO_SIZE, pMemBlock->ulSize,
hb_memToStr( szBuffer, ( char * ) pMemBlock + HB_MEMINFO_SIZE,
pMemBlock->ulSize ) ) );
}
#endif
}
/* NOTE: Use as minimal calls from here, as possible.
Don't allocate memory from this function. [vszakats] */
void hb_errInternal( ULONG ulIntCode, const char * szText, const char * szPar1, const char * szPar2 )
{
char buffer[ 1024 ];
HB_TRACE(HB_TR_DEBUG, ("hb_errInternal(%lu, %s, %s, %s)", ulIntCode, szText, szPar1, szPar2));
hb_conOutErr( hb_conNewLine(), 0 );
hb_snprintf( buffer, sizeof( buffer ), "Unrecoverable error %lu: ", ulIntCode );
hb_conOutErr( buffer, 0 );
if( szText )
{
hb_snprintf( buffer, sizeof( buffer ), szText, szPar1, szPar2 );
hb_conOutErr( buffer, 0 );
}
hb_conOutErr( hb_conNewLine(), 0 );
exit( EXIT_FAILURE );
}
void hb_conOutErr( const char * pStr, ULONG ulLen )
{
if( ulLen == 0 )
ulLen = strlen( pStr );
fprintf( stderr, "%.*s", ( int ) ulLen, pStr );
}
const char * hb_conNewLine( void )
{
return "\n";
}
static int s_iFileCase = HB_SET_CASE_MIXED;
static int s_iDirCase = HB_SET_CASE_MIXED;
static BOOL s_fFnTrim = FALSE;
static char s_cDirSep = HB_OS_PATH_DELIM_CHR;
const char * hb_fsNameConv( const char * szFileName, char ** pszFree )
{
if( s_fFnTrim || s_cDirSep != HB_OS_PATH_DELIM_CHR ||
s_iFileCase != HB_SET_CASE_MIXED || s_iDirCase != HB_SET_CASE_MIXED )
{
PHB_FNAME pFileName;
ULONG ulLen;
if( pszFree )
{
szFileName = *pszFree = hb_strncpy( ( char * ) hb_xgrab( HB_PATH_MAX ),
szFileName, HB_PATH_MAX - 1 );
}
if( s_cDirSep != HB_OS_PATH_DELIM_CHR )
{
char *p = ( char * ) szFileName;
while( *p )
{
if( *p == s_cDirSep )
*p = HB_OS_PATH_DELIM_CHR;
p++;
}
}
pFileName = hb_fsFNameSplit( szFileName );
/* strip trailing and leading spaces */
if( s_fFnTrim )
{
if( pFileName->szName )
{
ulLen = strlen( pFileName->szName );
while( ulLen && pFileName->szName[ulLen - 1] == ' ' )
--ulLen;
while( ulLen && pFileName->szName[0] == ' ' )
{
++pFileName->szName;
--ulLen;
}
( ( char * ) pFileName->szName )[ulLen] = '\0';
}
if( pFileName->szExtension )
{
ulLen = strlen( pFileName->szExtension );
while( ulLen && pFileName->szExtension[ulLen - 1] == ' ' )
--ulLen;
while( ulLen && pFileName->szExtension[0] == ' ' )
{
++pFileName->szExtension;
--ulLen;
}
( ( char * ) pFileName->szExtension )[ulLen] = '\0';
}
}
/* FILECASE */
if( s_iFileCase == HB_SET_CASE_LOWER )
{
if( pFileName->szName )
hb_strlow( ( char * ) pFileName->szName );
if( pFileName->szExtension )
hb_strlow( ( char * ) pFileName->szExtension );
}
else if( s_iFileCase == HB_SET_CASE_UPPER )
{
if( pFileName->szName )
hb_strupr( ( char * ) pFileName->szName );
if( pFileName->szExtension )
hb_strupr( ( char * ) pFileName->szExtension );
}
/* DIRCASE */
if( pFileName->szPath )
{
if( s_iDirCase == HB_SET_CASE_LOWER )
hb_strlow( ( char * ) pFileName->szPath );
else if( s_iDirCase == HB_SET_CASE_UPPER )
hb_strupr( ( char * ) pFileName->szPath );
}
hb_fsFNameMerge( ( char * ) szFileName, pFileName );
hb_xfree( pFileName );
}
else if( pszFree )
*pszFree = NULL;
return szFileName;
}
int hb_setGetDirSeparator( void )
{
return s_cDirSep;
}
static void hb_compChkFileSwitches( int argc, char * argv[] )
{
int i, n;
for( i = 1; i < argc; ++i )
{
if( HB_ISOPTSEP( argv[i][0] ) && argv[i][1] == 'f' )
{
n = 0;
switch( argv[i][2] )
{
case 'n':
if( !argv[i][3] )
{
s_iFileCase = HB_SET_CASE_MIXED;
n = 3;
}
else if( argv[i][3] == ':' )
{
if( argv[i][4] == 'u' )
{
s_iFileCase = HB_SET_CASE_UPPER;
n = 5;
}
else if( argv[i][4] == 'l' )
{
s_iFileCase = HB_SET_CASE_LOWER;
n = 5;
}
}
else if( argv[i][3] == '-' )
{
s_iFileCase = HB_SET_CASE_MIXED;
n = 4;
}
break;
case 'd':
if( !argv[i][3] )
{
s_iDirCase = HB_SET_CASE_MIXED;
n = 3;
}
else if( argv[i][3] == ':' )
{
if( argv[i][4] == 'u' )
{
s_iDirCase = HB_SET_CASE_UPPER;
n = 5;
}
else if( argv[i][4] == 'l' )
{
s_iDirCase = HB_SET_CASE_LOWER;
n = 5;
}
}
else if( argv[i][3] == '-' )
{
s_iDirCase = HB_SET_CASE_MIXED;
n = 4;
}
break;
case 'p':
if( !argv[i][3] )
{
s_cDirSep = HB_OS_PATH_DELIM_CHR;
n = 3;
}
else if( argv[i][3] == '-' )
{
s_cDirSep = HB_OS_PATH_DELIM_CHR;
n = 4;
}
else if( argv[i][3] == ':' && argv[i][4] )
{
s_cDirSep = argv[i][4];
n = 5;
}
break;
case 's':
if( !argv[i][3] )
{
s_fFnTrim = TRUE;
n = 3;
}
else if( argv[i][3] == '-' )
{
s_fFnTrim = FALSE;
n = 4;
}
break;
}
if( n )
{
argv[i] += n;
if( argv[i][0] )
--i;
else
argv[i] = ( char * ) "-";
}
}
}
}
/* ChangeLog SVN revision number */
int hb_verSvnID( void )
@@ -608,6 +101,8 @@ const char * hb_verFlagsPRG( void )
#endif
}
#if 0
/* build time Harbour architecture setting */
const char * hb_verHB_ARCH( void )
{
@@ -627,6 +122,7 @@ const char * hb_verHB_COMP( void )
return "";
#endif
}
#endif
int main( int argc, char * argv[] )
{

14
harbour/source/nulrtl/Makefile Normal file
View File

@@ -0,0 +1,14 @@
#
# $Id$
#
ROOT = ../../
C_SOURCES=\
nulrtl.c \
PRG_SOURCES=\
LIBNAME=hbnulrtl
include $(TOP)$(ROOT)config/lib.cf

600
harbour/source/nulrtl/nulrtl.c Normal file
View File

@@ -0,0 +1,600 @@
/*
* $Id$
*/
/*
* Harbour Project source code:
*
*
* Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
* www - http://www.harbour-project.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
*
* As a special exception, the Harbour Project gives permission for
* additional uses of the text contained in its release of Harbour.
*
* The exception is that, if you link the Harbour libraries with other
* files to produce an executable, this does not by itself cause the
* resulting executable to be covered by the GNU General Public License.
* Your use of that executable is in no way restricted on account of
* linking the Harbour library code into it.
*
* This exception does not however invalidate any other reasons why
* the executable file might be covered by the GNU General Public License.
*
* This exception applies only to the code released by the Harbour
* Project under the name Harbour. If you copy code from other
* Harbour Project or Free Software Foundation releases into a copy of
* Harbour, as the General Public License permits, the exception does
* not apply to the code that you add in this way. To avoid misleading
* anyone as to the status of such modified files, you must delete
* this exception notice from them.
*
* If you write modifications of your own for Harbour, it is your choice
* whether to permit this exception to apply to your modifications.
* If you do not wish that, delete this exception notice.
*
*/
#include "hbapi.h"
#include "hbapifs.h"
#include "hbapierr.h"
#include "hbset.h"
#include "hbvm.h"
#include "hbcomp.h"
/* ------------------------------------------------------------------------- */
/* FM statistic module */
/* ------------------------------------------------------------------------- */
/* remove this 'undef' when number of memory leaks will be reduced to
reasonable size */
/* #undef HB_FM_STATISTICS */
#ifdef HB_FM_STATISTICS
#define HB_MEMINFO_SIGNATURE 0xDEADBEAF
#define HB_MEMSTR_BLOCK_MAX 256
#ifndef HB_MEMFILER
# define HB_MEMFILER 0xff
#endif
typedef struct _HB_MEMINFO
{
struct _HB_MEMINFO * pPrevBlock;
struct _HB_MEMINFO * pNextBlock;
ULONG ulSize;
UINT32 Signature;
} HB_MEMINFO, * PHB_MEMINFO;
#ifdef HB_ALLOC_ALIGNMENT
# define HB_MEMINFO_SIZE ( ( sizeof( HB_MEMINFO ) + HB_ALLOC_ALIGNMENT - 1 ) - \
( sizeof( HB_MEMINFO ) + HB_ALLOC_ALIGNMENT - 1 ) % HB_ALLOC_ALIGNMENT )
#else
# define HB_MEMINFO_SIZE sizeof( HB_MEMINFO )
#endif
static PHB_MEMINFO s_pMemBlocks = NULL;
static long s_ulMemoryBlocks = 0; /* memory blocks used */
static long s_ulMemoryMaxBlocks = 0; /* maximum number of used memory blocks */
static long s_ulMemoryMaxConsumed = 0; /* memory size consumed */
static long s_ulMemoryConsumed = 0; /* memory max size consumed */
#endif /* HB_FM_STATISTICS */
void * hb_xgrab( ULONG ulSize ) /* allocates fixed memory, exits on failure */
{
void * pMem;
if( ulSize == 0 )
hb_errInternal( HB_EI_XGRABNULLSIZE, "hb_xgrab requested to allocate zero bytes", NULL, NULL );
#ifdef HB_FM_STATISTICS
pMem = malloc( ulSize + HB_MEMINFO_SIZE + sizeof( UINT32 ) );
if( pMem )
{
if( s_pMemBlocks )
s_pMemBlocks->pPrevBlock = ( PHB_MEMINFO ) pMem;
( ( PHB_MEMINFO ) pMem )->pNextBlock = s_pMemBlocks;
( ( PHB_MEMINFO ) pMem )->pPrevBlock = NULL;
s_pMemBlocks = ( PHB_MEMINFO ) pMem;
( ( PHB_MEMINFO ) pMem )->ulSize = ulSize;
( ( PHB_MEMINFO ) pMem )->Signature = HB_MEMINFO_SIGNATURE;
HB_PUT_LE_UINT32( ( ( BYTE * ) pMem ) + HB_MEMINFO_SIZE + ulSize, HB_MEMINFO_SIGNATURE );
s_ulMemoryConsumed += ulSize;
if( s_ulMemoryMaxConsumed < s_ulMemoryConsumed )
s_ulMemoryMaxConsumed = s_ulMemoryConsumed;
s_ulMemoryBlocks++;
if( s_ulMemoryMaxBlocks < s_ulMemoryBlocks )
s_ulMemoryMaxBlocks = s_ulMemoryBlocks;
pMem = ( BYTE * ) pMem + HB_MEMINFO_SIZE;
}
else
#else
pMem = malloc( ulSize );
if( ! pMem )
#endif
hb_errInternal( HB_EI_XGRABALLOC, "hb_xgrab can't allocate memory", NULL, NULL );
return pMem;
}
void * hb_xrealloc( void * pMem, ULONG ulSize ) /* reallocates memory */
{
#ifdef HB_FM_STATISTICS
PHB_MEMINFO pMemBlock;
ULONG ulMemSize;
void * pResult;
if( ulSize == 0 )
{
if( pMem )
hb_xfree( pMem );
return NULL;
}
else if( ! pMem )
return hb_xgrab( ulSize );
pMemBlock = ( PHB_MEMINFO ) ( ( BYTE * ) pMem - HB_MEMINFO_SIZE );
ulMemSize = pMemBlock->ulSize;
if( pMemBlock->Signature != HB_MEMINFO_SIGNATURE )
hb_errInternal( HB_EI_XREALLOCINV, "hb_xrealloc called with an invalid pointer", NULL, NULL );
if( HB_GET_LE_UINT32( ( ( BYTE * ) pMem ) + ulMemSize ) != HB_MEMINFO_SIGNATURE )
hb_errInternal( HB_EI_XMEMOVERFLOW, "Memory buffer overflow", NULL, NULL );
HB_PUT_LE_UINT32( ( ( BYTE * ) pMem ) + ulMemSize, 0 );
pResult = realloc( pMemBlock, ulSize + HB_MEMINFO_SIZE + sizeof( UINT32 ) );
if( pResult )
{
if( s_pMemBlocks == pMemBlock )
s_pMemBlocks = ( PHB_MEMINFO ) pResult;
else
( ( PHB_MEMINFO ) pResult )->pPrevBlock->pNextBlock = ( PHB_MEMINFO ) pResult;
if( ( ( PHB_MEMINFO ) pResult )->pNextBlock )
( ( PHB_MEMINFO ) pResult )->pNextBlock->pPrevBlock = ( PHB_MEMINFO ) pResult;
s_ulMemoryConsumed += ( ulSize - ulMemSize );
if( s_ulMemoryMaxConsumed < s_ulMemoryConsumed )
s_ulMemoryMaxConsumed = s_ulMemoryConsumed;
( ( PHB_MEMINFO ) pResult )->ulSize = ulSize; /* size of the memory block */
HB_PUT_LE_UINT32( ( ( BYTE * ) pResult ) + ulSize + HB_MEMINFO_SIZE, HB_MEMINFO_SIGNATURE );
pResult = ( BYTE * ) pResult + HB_MEMINFO_SIZE;
}
#else
void * pResult = realloc( pMem, ulSize );
#endif
if( ! pResult && ulSize )
hb_errInternal( HB_EI_XREALLOC, "hb_xrealloc can't reallocate memory", NULL, NULL );
return pResult;
}
void hb_xfree( void * pMem ) /* frees fixed memory */
{
if( pMem )
{
#ifdef HB_FM_STATISTICS
PHB_MEMINFO pMemBlock = ( PHB_MEMINFO ) ( ( BYTE * ) pMem - HB_MEMINFO_SIZE );
if( pMemBlock->Signature != HB_MEMINFO_SIGNATURE )
hb_errInternal( HB_EI_XFREEINV, "hb_xfree called with an invalid pointer", NULL, NULL );
if( HB_GET_LE_UINT32( ( ( BYTE * ) pMem ) + pMemBlock->ulSize ) != HB_MEMINFO_SIGNATURE )
hb_errInternal( HB_EI_XMEMOVERFLOW, "Memory buffer overflow", NULL, NULL );
s_ulMemoryConsumed -= pMemBlock->ulSize;
s_ulMemoryBlocks--;
if( s_pMemBlocks == pMemBlock )
s_pMemBlocks = pMemBlock->pNextBlock;
else
pMemBlock->pPrevBlock->pNextBlock = pMemBlock->pNextBlock;
if( pMemBlock->pNextBlock )
pMemBlock->pNextBlock->pPrevBlock = pMemBlock->pPrevBlock;
pMemBlock->Signature = 0;
HB_PUT_LE_UINT32( ( ( BYTE * ) pMem ) + pMemBlock->ulSize, 0 );
pMem = ( BYTE * ) pMem - HB_MEMINFO_SIZE;
#endif
free( pMem );
}
else
hb_errInternal( HB_EI_XFREENULL, "hb_xfree called with a NULL pointer", NULL, NULL );
}
ULONG hb_xquery( int iMode )
{
ULONG ulResult = 0;
#ifdef HB_FM_STATISTICS
switch( iMode )
{
case HB_MEM_USED:
ulResult = s_ulMemoryConsumed;
break;
case HB_MEM_USEDMAX:
ulResult = s_ulMemoryMaxConsumed;
break;
}
#else
HB_SYMBOL_UNUSED( iMode );
#endif
return ulResult;
}
#ifdef HB_FM_STATISTICS
static char * hb_memToStr( char * szBuffer, void * pMem, ULONG ulSize )
{
unsigned char *byMem = ( BYTE * ) pMem;
char * pDest = szBuffer;
int iSize, i, iPrintable;
if( ulSize > HB_MEMSTR_BLOCK_MAX )
iSize = HB_MEMSTR_BLOCK_MAX;
else
iSize = ( int ) ulSize;
iPrintable = 0;
for( i = 0; i < iSize; ++i )
if( ( byMem[ i ] & 0x7f ) >= 0x20 )
iPrintable++;
if( ( iPrintable * 100 ) / iSize > 70 ) /* more then 70% printable chars */
{
/* format as string of original chars */
for( i = 0; i < iSize; ++i )
if( ( byMem[ i ] & 0x7f ) >= 0x20 )
* pDest++ = byMem[ i ];
else
* pDest++ = '.';
}
else
{
/* format as hex */
for( i = 0; i < iSize; ++i )
{
int iLo = byMem[ i ] & 0x0f, iHi = byMem[ i ] >> 4;
* pDest++ = '\\';
* pDest++ = iHi <= 9 ? '0' + iHi : 'A' - 10 + iHi;
* pDest++ = iLo <= 9 ? '0' + iLo : 'A' - 10 + iLo;
}
}
* pDest = '\0';
return szBuffer;
}
#endif
void hb_xexit( void )
{
#ifdef HB_FM_STATISTICS
if( s_ulMemoryBlocks /* || hb_cmdargCheck( "INFO" ) */ )
{
char szBuffer[ HB_MAX( 3 * HB_MEMSTR_BLOCK_MAX + 1, 100 ) ];
PHB_MEMINFO pMemBlock;
int i;
hb_conOutErr( hb_conNewLine(), 0 );
hb_conOutErr( "----------------------------------------", 0 );
hb_conOutErr( hb_conNewLine(), 0 );
hb_snprintf( szBuffer, sizeof( szBuffer ), "Total memory allocated: %lu bytes (%lu blocks)", s_ulMemoryMaxConsumed, s_ulMemoryMaxBlocks );
hb_conOutErr( szBuffer, 0 );
if( s_ulMemoryBlocks )
{
hb_conOutErr( hb_conNewLine(), 0 );
hb_snprintf( szBuffer, sizeof( szBuffer ), "WARNING! Memory allocated but not released: %lu bytes (%lu blocks)", s_ulMemoryConsumed, s_ulMemoryBlocks );
hb_conOutErr( szBuffer, 0 );
}
hb_conOutErr( hb_conNewLine(), 0 );
for( i = 1, pMemBlock = s_pMemBlocks; pMemBlock; ++i, pMemBlock = pMemBlock->pNextBlock )
HB_TRACE( HB_TR_ERROR, ( "Block %i %p (size %lu) \"%s\"", i,
( char * ) pMemBlock + HB_MEMINFO_SIZE, pMemBlock->ulSize,
hb_memToStr( szBuffer, ( char * ) pMemBlock + HB_MEMINFO_SIZE,
pMemBlock->ulSize ) ) );
}
#endif
}
/* NOTE: Use as minimal calls from here, as possible.
Don't allocate memory from this function. [vszakats] */
void hb_errInternal( ULONG ulIntCode, const char * szText, const char * szPar1, const char * szPar2 )
{
char buffer[ 1024 ];
HB_TRACE(HB_TR_DEBUG, ("hb_errInternal(%lu, %s, %s, %s)", ulIntCode, szText, szPar1, szPar2));
hb_conOutErr( hb_conNewLine(), 0 );
hb_snprintf( buffer, sizeof( buffer ), "Unrecoverable error %lu: ", ulIntCode );
hb_conOutErr( buffer, 0 );
if( szText )
{
hb_snprintf( buffer, sizeof( buffer ), szText, szPar1, szPar2 );
hb_conOutErr( buffer, 0 );
}
hb_conOutErr( hb_conNewLine(), 0 );
exit( EXIT_FAILURE );
}
/* console */
void hb_conOutErr( const char * pStr, ULONG ulLen )
{
if( ulLen == 0 )
ulLen = strlen( pStr );
fprintf( stderr, "%.*s", ( int ) ulLen, pStr );
}
const char * hb_conNewLine( void )
{
return "\n";
}
int hb_charUpper( int iChar )
{
return HB_TOUPPER( iChar );
}
int hb_charLower( int iChar )
{
return HB_TOLOWER( iChar );
}
const char * hb_osEncode( const char * szFileName, char ** pszFree )
{
if( pszFree )
*pszFree = NULL;
return szFileName;
}
const char * hb_osDecode( const char * szFileName, char ** pszFree )
{
if( pszFree )
*pszFree = NULL;
return szFileName;
}
/* VM */
void hb_vmLock( void ) {}
void hb_vmUnlock( void ) {}
void hb_fsSetIOError( BOOL fResult, USHORT uiOperation )
{
HB_SYMBOL_UNUSED( fResult );
HB_SYMBOL_UNUSED( uiOperation );
}
/* file name conversion */
static int s_iFileCase = HB_SET_CASE_MIXED;
static int s_iDirCase = HB_SET_CASE_MIXED;
static BOOL s_fFnTrim = FALSE;
static char s_cDirSep = HB_OS_PATH_DELIM_CHR;
const char * hb_fsNameConv( const char * szFileName, char ** pszFree )
{
if( s_fFnTrim || s_cDirSep != HB_OS_PATH_DELIM_CHR ||
s_iFileCase != HB_SET_CASE_MIXED || s_iDirCase != HB_SET_CASE_MIXED )
{
PHB_FNAME pFileName;
ULONG ulLen;
if( pszFree )
{
szFileName = *pszFree = hb_strncpy( ( char * ) hb_xgrab( HB_PATH_MAX ),
szFileName, HB_PATH_MAX - 1 );
}
if( s_cDirSep != HB_OS_PATH_DELIM_CHR )
{
char *p = ( char * ) szFileName;
while( *p )
{
if( *p == s_cDirSep )
*p = HB_OS_PATH_DELIM_CHR;
p++;
}
}
pFileName = hb_fsFNameSplit( szFileName );
/* strip trailing and leading spaces */
if( s_fFnTrim )
{
if( pFileName->szName )
{
ulLen = strlen( pFileName->szName );
while( ulLen && pFileName->szName[ulLen - 1] == ' ' )
--ulLen;
while( ulLen && pFileName->szName[0] == ' ' )
{
++pFileName->szName;
--ulLen;
}
( ( char * ) pFileName->szName )[ulLen] = '\0';
}
if( pFileName->szExtension )
{
ulLen = strlen( pFileName->szExtension );
while( ulLen && pFileName->szExtension[ulLen - 1] == ' ' )
--ulLen;
while( ulLen && pFileName->szExtension[0] == ' ' )
{
++pFileName->szExtension;
--ulLen;
}
( ( char * ) pFileName->szExtension )[ulLen] = '\0';
}
}
/* FILECASE */
if( s_iFileCase == HB_SET_CASE_LOWER )
{
if( pFileName->szName )
hb_strlow( ( char * ) pFileName->szName );
if( pFileName->szExtension )
hb_strlow( ( char * ) pFileName->szExtension );
}
else if( s_iFileCase == HB_SET_CASE_UPPER )
{
if( pFileName->szName )
hb_strupr( ( char * ) pFileName->szName );
if( pFileName->szExtension )
hb_strupr( ( char * ) pFileName->szExtension );
}
/* DIRCASE */
if( pFileName->szPath )
{
if( s_iDirCase == HB_SET_CASE_LOWER )
hb_strlow( ( char * ) pFileName->szPath );
else if( s_iDirCase == HB_SET_CASE_UPPER )
hb_strupr( ( char * ) pFileName->szPath );
}
hb_fsFNameMerge( ( char * ) szFileName, pFileName );
hb_xfree( pFileName );
}
else if( pszFree )
*pszFree = NULL;
return szFileName;
}
int hb_setGetDirSeparator( void )
{
return s_cDirSep;
}
void hb_compChkFileSwitches( int argc, char * argv[] )
{
int i, n;
for( i = 1; i < argc; ++i )
{
if( HB_ISOPTSEP( argv[i][0] ) && argv[i][1] == 'f' )
{
n = 0;
switch( argv[i][2] )
{
case 'n':
if( !argv[i][3] )
{
s_iFileCase = HB_SET_CASE_MIXED;
n = 3;
}
else if( argv[i][3] == ':' )
{
if( argv[i][4] == 'u' )
{
s_iFileCase = HB_SET_CASE_UPPER;
n = 5;
}
else if( argv[i][4] == 'l' )
{
s_iFileCase = HB_SET_CASE_LOWER;
n = 5;
}
}
else if( argv[i][3] == '-' )
{
s_iFileCase = HB_SET_CASE_MIXED;
n = 4;
}
break;
case 'd':
if( !argv[i][3] )
{
s_iDirCase = HB_SET_CASE_MIXED;
n = 3;
}
else if( argv[i][3] == ':' )
{
if( argv[i][4] == 'u' )
{
s_iDirCase = HB_SET_CASE_UPPER;
n = 5;
}
else if( argv[i][4] == 'l' )
{
s_iDirCase = HB_SET_CASE_LOWER;
n = 5;
}
}
else if( argv[i][3] == '-' )
{
s_iDirCase = HB_SET_CASE_MIXED;
n = 4;
}
break;
case 'p':
if( !argv[i][3] )
{
s_cDirSep = HB_OS_PATH_DELIM_CHR;
n = 3;
}
else if( argv[i][3] == '-' )
{
s_cDirSep = HB_OS_PATH_DELIM_CHR;
n = 4;
}
else if( argv[i][3] == ':' && argv[i][4] )
{
s_cDirSep = argv[i][4];
n = 5;
}
break;
case 's':
if( !argv[i][3] )
{
s_fFnTrim = TRUE;
n = 3;
}
else if( argv[i][3] == '-' )
{
s_fFnTrim = FALSE;
n = 4;
}
break;
}
if( n )
{
argv[i] += n;
if( argv[i][0] )
--i;
else
argv[i] = ( char * ) "-";
}
}
}
}

1
harbour/source/pp/Makefile
View File

@@ -15,6 +15,7 @@ LIBNAME=hbpp
LIBS=\
hbcommon \
hbnulrtl \
ifeq ($(HB_PPGEN_PATH),)
HB_PPGEN_PATH=.

114
harbour/source/pp/hbpp.c
View File

@@ -52,26 +52,10 @@
*
*/
#include "hbset.h"
#include "hbapi.h"
/*
* library functions used by PP core code
* necessary to create standalone binaries
*/
void * hb_xgrab( ULONG ulSize ) { return malloc( ulSize ); }
void * hb_xrealloc( void * pMem, ULONG ulSize ) { return realloc( pMem, ulSize ); }
void hb_xfree( void * pMem ) { free( pMem ); }
const char * hb_fsNameConv( const char * szFileName, char ** pszFree ) { if( pszFree ) * pszFree = NULL; return szFileName; }
int hb_setGetDirSeparator( void ) { return HB_OS_PATH_DELIM_CHR; }
int hb_verSvnID( void ) { return 0; }
/* workaround for warning in some GCC versions which can lost
* user casting during function autoinline optimization.
*/
#define hb_xgrab malloc
#define hb_xfree free
#define hb_xrealloc realloc
#include "ppcore.c"
/*
@@ -434,60 +418,86 @@ static int hb_pp_generateVerInfo( char * szVerFile, int iSVNID, char * szChangeL
return iResult;
}
static char * hb_fsFileFind( const char * pszFileMask )
{
PHB_FFIND ffind;
char * pszFree;
pszFileMask = hb_fsNameConv( pszFileMask, &pszFree );
if( ( ffind = hb_fsFindFirst( pszFileMask, HB_FA_ALL ) ) != NULL )
{
char pszFileName[ HB_PATH_MAX ];
PHB_FNAME pFileName = hb_fsFNameSplit( pszFileMask );
pFileName->szName = ffind->szName;
hb_fsFNameMerge( pszFileName, pFileName );
hb_fsFindClose( ffind );
if( pszFree )
hb_xfree( pszFree );
hb_xfree( pFileName );
return hb_strdup( pszFileName );
}
if( pszFree )
hb_xfree( pszFree );
return NULL;
}
static int hb_pp_parseChangelog( PHB_PP_STATE pState, const char * pszFileName,
int iQuiet, int * piSVNID,
char ** pszChangeLogID, char ** pszLastEntry )
{
char * pszFree = NULL;
int iResult = 0;
const char * pszFile;
FILE * file_in;
int tmp;
BOOL bFound;
const char * names[] = { NULL
, "../../../../ChangeLog"
, "../../../../CHANGES"
#if defined( HB_OS_DOS )
, "../../../../ChangeLo"
, "../../../../Change~1"
, "../../../../Chang~01"
#endif
};
names[ 0 ] = pszFileName;
pszFile = NULL;
bFound = FALSE;
for( tmp = 0; tmp < ( int ) HB_SIZEOFARRAY( names ) && ! bFound; ++tmp )
if( !pszFileName )
{
pszFile = names[ tmp ];
static const char * s_szNames[] = {
"../../../../ChangeLog",
"../../../../CHANGES",
#if defined( HB_OS_DOS )
"../../../../ChangeLo",
"../../../../Change~1",
"../../../../Change~?",
"../../../../Chang~??",
#endif
NULL };
int i = 0;
if( pszFile )
pszFileName = s_szNames[ i++ ];
while( pszFileName )
{
while( *pszFile == '.' )
if( hb_fsFileExists( pszFileName ) )
break;
if( strchr( pszFileName, '?' ) != NULL )
{
if( hb_fsFileExists( pszFile ) )
pszFree = hb_fsFileFind( pszFileName );
if( pszFree )
{
bFound = TRUE;
pszFileName = pszFree;
break;
}
pszFile += 3;
}
/* disabled it was for old non GNU make system */
#if 0
if( *pszFileName == '.' )
pszFileName += 3;
else
#endif
pszFileName = s_szNames[ i++ ];
}
if( !pszFileName )
pszFileName = s_szNames[ 0 ];
}
if( pszFile )
fprintf( stdout, "Using ChangeLog file: %s\n", pszFile );
file_in = hb_fopen( pszFile, "r" );
file_in = hb_fopen( pszFileName, "r" );
if( !file_in )
{
if( iQuiet < 2 )
{
#if !defined( HB_OS_WIN_CE )
perror( pszFile );
perror( pszFileName );
#else
fprintf( stderr, "Cannot open the %s file.\n", pszFile );
fprintf( stderr, "Cannot open the %s file.\n", pszFileName );
#endif
}
iResult = 1;
@@ -500,6 +510,9 @@ static int hb_pp_parseChangelog( PHB_PP_STATE pState, const char * pszFileName,
char * szFrom, *szTo;
int iLen;
if( iQuiet == 0 )
fprintf( stdout, "Reading ChangeLog file: %s\n", pszFileName );
*szId = *szLog = '\0';
do
@@ -550,7 +563,7 @@ static int hb_pp_parseChangelog( PHB_PP_STATE pState, const char * pszFileName,
if( !*szLog )
{
if( iQuiet < 2 )
fprintf( stderr, "Cannot find valid $Id entry in the %s file.\n", pszFile );
fprintf( stderr, "Cannot find valid $Id entry in the %s file.\n", pszFileName );
iResult = 1;
}
else
@@ -592,12 +605,15 @@ static int hb_pp_parseChangelog( PHB_PP_STATE pState, const char * pszFileName,
else
{
if( iQuiet < 2 )
fprintf( stderr, "Unrecognized Id entry in the %s file.\n", pszFile );
fprintf( stderr, "Unrecognized Id entry in the %s file.\n", pszFileName );
iResult = 1;
}
}
}
if( pszFree )
hb_xfree( pszFree );
return iResult;
}

1
harbour/source/rtl/Makefile
View File

@@ -70,7 +70,6 @@ C_SOURCES=\
hbhex.c \
hbmd5.c \
hbntos.c \
hbffind.c \
hbfile.c \
hbgtcore.c \
hbi18n1.c \

232
harbour/source/rtl/strmatch.c
View File

@@ -53,225 +53,6 @@
#include "hbapi.h"
#include "hbregex.h"
#if defined( HB_OS_UNIX ) && !defined( HB_NO_FNMATCH )
# include <fnmatch.h>
#endif
#define HB_MAX_WILDPATTERN 256
BOOL hb_strMatchWild( const char *szString, const char *szPattern )
{
BOOL fMatch = TRUE, fAny = FALSE;
ULONG pulBufPosP[ HB_MAX_WILDPATTERN ], pulBufPosV[ HB_MAX_WILDPATTERN ],
ulBufSize = HB_MAX_WILDPATTERN;
ULONG * ulAnyPosP = pulBufPosP, * ulAnyPosV = pulBufPosV,
ulSize, ulLen, ulAny, i, j;
i = j = ulAny = 0;
ulLen = strlen( szString );
ulSize = strlen( szPattern );
while( i < ulSize )
{
if( szPattern[i] == '*' )
{
fAny = TRUE;
i++;
}
else if( j < ulLen && ( szPattern[i] == '?' || szPattern[i] == szString[j] ) )
{
if( fAny )
{
if( ulAny >= ulBufSize )
{
if( ( ulBufSize <<= 1 ) == ( HB_MAX_WILDPATTERN << 1 ) )
{
ulAnyPosP = ( ULONG * ) hb_xgrab( ulBufSize * sizeof( ULONG ) );
ulAnyPosV = ( ULONG * ) hb_xgrab( ulBufSize * sizeof( ULONG ) );
memcpy( ulAnyPosP, pulBufPosP, HB_MAX_WILDPATTERN * sizeof( ULONG ) );
memcpy( ulAnyPosV, pulBufPosV, HB_MAX_WILDPATTERN * sizeof( ULONG ) );
}
else
{
ulAnyPosP = ( ULONG * ) hb_xrealloc( ulAnyPosP, ulBufSize * sizeof( ULONG ) );
ulAnyPosV = ( ULONG * ) hb_xrealloc( ulAnyPosV, ulBufSize * sizeof( ULONG ) );
}
}
ulAnyPosP[ulAny] = i;
ulAnyPosV[ulAny] = j;
ulAny++;
fAny = FALSE;
}
j++;
i++;
}
else if( fAny && j < ulLen )
{
j++;
}
else if( ulAny > 0 )
{
ulAny--;
i = ulAnyPosP[ulAny];
j = ulAnyPosV[ulAny] + 1;
fAny = TRUE;
}
else
{
fMatch = FALSE;
break;
}
}
if( ulBufSize > HB_MAX_WILDPATTERN )
{
hb_xfree( ulAnyPosP );
hb_xfree( ulAnyPosV );
}
return fMatch;
}
BOOL hb_strMatchWildExact( const char *szString, const char *szPattern )
{
BOOL fMatch = TRUE, fAny = FALSE;
ULONG pulBufPosP[ HB_MAX_WILDPATTERN ], pulBufPosV[ HB_MAX_WILDPATTERN ],
ulBufSize = HB_MAX_WILDPATTERN;
ULONG * ulAnyPosP = pulBufPosP, * ulAnyPosV = pulBufPosV,
ulSize, ulLen, ulAny, i, j;
i = j = ulAny = 0;
ulLen = strlen( szString );
ulSize = strlen( szPattern );
while( i < ulSize || ( j < ulLen && !fAny ) )
{
if( i < ulSize && szPattern[i] == '*' )
{
fAny = TRUE;
i++;
}
else if( j < ulLen && i < ulSize &&
( szPattern[i] == '?' || szPattern[i] == szString[j] ) )
{
if( fAny )
{
if( ulAny >= ulBufSize )
{
if( ( ulBufSize <<= 1 ) == ( HB_MAX_WILDPATTERN << 1 ) )
{
ulAnyPosP = ( ULONG * ) hb_xgrab( ulBufSize * sizeof( ULONG ) );
ulAnyPosV = ( ULONG * ) hb_xgrab( ulBufSize * sizeof( ULONG ) );
memcpy( ulAnyPosP, pulBufPosP, HB_MAX_WILDPATTERN * sizeof( ULONG ) );
memcpy( ulAnyPosV, pulBufPosV, HB_MAX_WILDPATTERN * sizeof( ULONG ) );
}
else
{
ulAnyPosP = ( ULONG * ) hb_xrealloc( ulAnyPosP, ulBufSize * sizeof( ULONG ) );
ulAnyPosV = ( ULONG * ) hb_xrealloc( ulAnyPosV, ulBufSize * sizeof( ULONG ) );
}
}
ulAnyPosP[ulAny] = i;
ulAnyPosV[ulAny] = j;
ulAny++;
fAny = FALSE;
}
j++;
i++;
}
else if( fAny && j < ulLen )
{
j++;
}
else if( ulAny > 0 )
{
ulAny--;
i = ulAnyPosP[ulAny];
j = ulAnyPosV[ulAny] + 1;
fAny = TRUE;
}
else
{
fMatch = FALSE;
break;
}
}
if( ulBufSize > HB_MAX_WILDPATTERN )
{
hb_xfree( ulAnyPosP );
hb_xfree( ulAnyPosV );
}
return fMatch;
}
BOOL hb_strMatchCaseWildExact( const char *szString, const char *szPattern )
{
BOOL fMatch = TRUE, fAny = FALSE;
ULONG pulBufPosP[ HB_MAX_WILDPATTERN ], pulBufPosV[ HB_MAX_WILDPATTERN ],
ulBufSize = HB_MAX_WILDPATTERN;
ULONG * ulAnyPosP = pulBufPosP, * ulAnyPosV = pulBufPosV,
ulSize, ulLen, ulAny, i, j;
i = j = ulAny = 0;
ulLen = strlen( szString );
ulSize = strlen( szPattern );
while ( i < ulSize || ( j < ulLen && !fAny ) )
{
if( i < ulSize && szPattern[i] == '*' )
{
fAny = TRUE;
i++;
}
else if( j < ulLen && i < ulSize &&
( szPattern[i] == '?' ||
hb_charUpper( szPattern[i] ) == hb_charUpper( szString[j] ) ) )
{
if( fAny )
{
if( ulAny >= ulBufSize )
{
if( ( ulBufSize <<= 1 ) == ( HB_MAX_WILDPATTERN << 1 ) )
{
ulAnyPosP = ( ULONG * ) hb_xgrab( ulBufSize * sizeof( ULONG ) );
ulAnyPosV = ( ULONG * ) hb_xgrab( ulBufSize * sizeof( ULONG ) );
memcpy( ulAnyPosP, pulBufPosP, HB_MAX_WILDPATTERN * sizeof( ULONG ) );
memcpy( ulAnyPosV, pulBufPosV, HB_MAX_WILDPATTERN * sizeof( ULONG ) );
}
else
{
ulAnyPosP = ( ULONG * ) hb_xrealloc( ulAnyPosP, ulBufSize * sizeof( ULONG ) );
ulAnyPosV = ( ULONG * ) hb_xrealloc( ulAnyPosV, ulBufSize * sizeof( ULONG ) );
}
}
ulAnyPosP[ulAny] = i;
ulAnyPosV[ulAny] = j;
ulAny++;
fAny = FALSE;
}
j++;
i++;
}
else if( fAny && j < ulLen )
{
j++;
}
else if( ulAny > 0 )
{
ulAny--;
i = ulAnyPosP[ulAny];
j = ulAnyPosV[ulAny] + 1;
fAny = TRUE;
}
else
{
fMatch = FALSE;
break;
}
}
if( ulBufSize > HB_MAX_WILDPATTERN )
{
hb_xfree( ulAnyPosP );
hb_xfree( ulAnyPosV );
}
return fMatch;
}
BOOL hb_strMatchRegExp( const char * szString, const char * szPattern )
{
PHB_REGEX pRegEx;
@@ -290,19 +71,6 @@ BOOL hb_strMatchRegExp( const char * szString, const char * szPattern )
return hb_strMatchWildExact( szString, szPattern );
}
BOOL hb_strMatchFile( const char * szString, const char * szPattern )
{
#if defined( HB_OS_UNIX )
# if defined( HB_NO_FNMATCH )
return hb_strMatchWildExact( szString, szPattern );
# else
return fnmatch( szPattern, szString, FNM_PERIOD | FNM_PATHNAME ) == 0;
# endif
#else
return hb_strMatchCaseWildExact( szString, szPattern );
#endif
}
/*
* WildMatch( cPattern, cValue [, lExact] ) compares
* cValue with cPattern, cPattern * may contain wildcard characters (?*)