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

2006-12-09 17:10 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/config/bsd/gcc.cf
  * harbour/config/darwin/gcc.cf
  * harbour/config/dos/bcc16.cf
  * harbour/config/dos/djgpp.cf
  * harbour/config/dos/owatcom.cf
  * harbour/config/dos/rsx32.cf
  * harbour/config/hpux/gcc.cf
  * harbour/config/linux/gcc.cf
  * harbour/config/linux/owatcom.cf
  * harbour/config/os2/gcc.cf
  * harbour/config/os2/icc.cf
  * harbour/config/sunos/gcc.cf
  * harbour/config/w32/bcc32.cf
  * harbour/config/w32/gcc.cf
  * harbour/config/w32/mingw32.cf
  * harbour/config/w32/msvc.cf
  * harbour/config/w32/rsxnt.cf
  * harbour/config/w32/watcom.cf
    * added respecting HB_GT_DEFAULT, though it's quite possible that I'll
      remove it at all soon.
    * some other cleanup

  * harbour/source/compiler/complex.c
    ! fixed wrongly replicated from FLEX lexer condition used to DECLARE.
      Now they should be the same as in FLEX lexer but IMHO they are not
      Clipper compatible.

  * harbour/source/compiler/gencli.c
  * harbour/source/compiler/gencobj.c
  * harbour/source/compiler/genhrb.c
  * harbour/source/compiler/genjava.c
  * harbour/source/compiler/genobj32.c
  * harbour/source/compiler/harbour.c
  * harbour/source/rtl/hbffind.c
  * harbour/source/pp/ppcore.c
  * harbour/source/rdd/workarea.c
    ! fixed sizes of some C stack buffers and strncpy() parameters
    * use hb_strn*() instead of strn*() in few places to be sure that 0
      is always stored in destination buffer

  * harbour/source/rtl/gtcgi/gtcgi.c
    * change reported GT name from "Standard stream console" to
      "Raw stream console" to make it differ then GTSTD one.
This commit is contained in:
Przemyslaw Czerpak
2006-12-09 16:11:10 +00:00
parent b86b5a8fe7
commit 93e0db5a23
30 changed files with 240 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
harbour/ChangeLog
View File

@@ -8,6 +8,51 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2006-12-09 17:10 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/config/bsd/gcc.cf
* harbour/config/darwin/gcc.cf
* harbour/config/dos/bcc16.cf
* harbour/config/dos/djgpp.cf
* harbour/config/dos/owatcom.cf
* harbour/config/dos/rsx32.cf
* harbour/config/hpux/gcc.cf
* harbour/config/linux/gcc.cf
* harbour/config/linux/owatcom.cf
* harbour/config/os2/gcc.cf
* harbour/config/os2/icc.cf
* harbour/config/sunos/gcc.cf
* harbour/config/w32/bcc32.cf
* harbour/config/w32/gcc.cf
* harbour/config/w32/mingw32.cf
* harbour/config/w32/msvc.cf
* harbour/config/w32/rsxnt.cf
* harbour/config/w32/watcom.cf
* added respecting HB_GT_DEFAULT, though it's quite possible that I'll
remove it at all soon.
* some other cleanup
* harbour/source/compiler/complex.c
! fixed wrongly replicated from FLEX lexer condition used to DECLARE.
Now they should be the same as in FLEX lexer but IMHO they are not
Clipper compatible.
* harbour/source/compiler/gencli.c
* harbour/source/compiler/gencobj.c
* harbour/source/compiler/genhrb.c
* harbour/source/compiler/genjava.c
* harbour/source/compiler/genobj32.c
* harbour/source/compiler/harbour.c
* harbour/source/rtl/hbffind.c
* harbour/source/pp/ppcore.c
* harbour/source/rdd/workarea.c
! fixed sizes of some C stack buffers and strncpy() parameters
* use hb_strn*() instead of strn*() in few places to be sure that 0
is always stored in destination buffer
* harbour/source/rtl/gtcgi/gtcgi.c
* change reported GT name from "Standard stream console" to
"Raw stream console" to make it differ then GTSTD one.
2006-12-08 05:55 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/bin/hb-func.sh
* harbour/bin/hb-mkslib.sh

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

@@ -37,10 +37,17 @@ LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$
LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
endif
# Add the specified GT driver library
# Add the specified GT driver library and other RTLs
ifeq ($(findstring rtl,$(LIBS)),rtl)
LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH)
LINKLIBS += -l$(HB_GT_LIB)
ifneq ($(HB_GT_DEFAULT),)
ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB))
LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH)
LINKLIBS += -l$(HB_GT_DEFAULT)
endif
endif
# HB_SCREEN_LIB: empty, or one of ncurses, slang
@@ -49,6 +56,21 @@ HB_SCREEN_LIB:=ncurses
else
ifeq ($(HB_GT_LIB),gtsln)
HB_SCREEN_LIB:=slang
else
ifeq ($(HB_GT_LIB),gtalleg)
HB_GTALLEG:=yes
LINKLIBS += `allegro-config --static`
endif
endif
endif
ifeq ($(HB_GT_LIB),gtxvt)
LINKLIBS += -lX11
LINKPATHS += -L/usr/X11R6/lib
else
ifeq ($(HB_GT_LIB),gtxwc)
LINKLIBS += -lX11
LINKPATHS += -L/usr/X11R6/lib
endif
endif
@@ -57,6 +79,8 @@ LINKPATHS += -L/usr/local/lib
LINKLIBS += -l$(HB_SCREEN_LIB)
endif
endif
LINKLIBS += -lm -Wl,--end-group
LDFLAGS += $(LINKPATHS)

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

@@ -51,28 +51,31 @@ LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$
LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
endif
# Add the specified GT driver library
# Add the specified GT driver library and other RTLs
ifeq ($(findstring rtl,$(LIBS)),rtl)
LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH)
LINKLIBS += -l$(HB_GT_LIB)
ifneq ($(HB_GT_DEFAULT),)
ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB))
LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH)
LINKLIBS += -l$(HB_GT_DEFAULT)
endif
endif
# HB_SCREEN_LIB: empty, or one of ncurses, slang
ifeq ($(HB_GT_LIB),gtcrs)
HB_SCREEN_LIB:=ncurses
else
ifeq ($(HB_GT_LIB),gtsln)
HB_SCREEN_LIB:=slang
else
ifeq ($(HB_GT_LIB),gtalleg)
HB_GTALLEG:=yes
LINKLIBS += `allegro-config --static`
endif
endif
ifneq ($(HB_SCREEN_LIB),)
LINKLIBS += -l$(HB_SCREEN_LIB)
endif
# In BSD, slang still needs curses :(
ifeq ($(HB_GT_LIB),gtsln)
LINKLIBS += -lncurses
endif
ifeq ($(HB_GT_LIB),gtxvt)
@@ -85,6 +88,15 @@ LINKPATHS +=-L/usr/X11R6/lib
endif
endif
ifneq ($(HB_SCREEN_LIB),)
LINKLIBS += -l$(HB_SCREEN_LIB)
endif
# In BSD, slang still needs curses :(
ifeq ($(HB_GT_LIB),gtsln)
LINKLIBS += -lncurses
endif
# HB_GPM_MOUSE: use gpm mouse driver
# Actually, there is no gpm on BSD.
ifeq ($(HB_GPM_MOUSE),yes)

5
harbour/config/dos/bcc16.cf
View File

@@ -65,6 +65,11 @@ LD_RULE = $(link_exe_file)
# Add the specified GT driver library
ifeq ($(findstring rtl,$(LIBS)),rtl)
LINKLIBS += $(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH)/$(HB_GT_LIB)$(LIB_EXT)
ifneq ($(HB_GT_DEFAULT),)
ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB))
LINKLIBS += $(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH)/$(HB_GT_DEFAULT)$(LIB_EXT)
endif
endif
endif
# HB_SCREEN_LIB: empty, or one of ncurses, slang

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

@@ -42,6 +42,14 @@ endif
ifeq ($(findstring rtl,$(LIBS)),rtl)
LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH)
LINKLIBS += -l$(HB_GT_LIB)
ifneq ($(HB_GT_DEFAULT),)
ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB))
LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH)
LINKLIBS += -l$(HB_GT_DEFAULT)
endif
endif
endif
# NOTE: The empty line directly before 'endef' HAVE TO exist!

14
harbour/config/dos/owatcom.cf
View File

@@ -73,10 +73,11 @@ endif
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)
ifeq ($(HB_LIB_COMPILE),)
RDDLIBS := $(foreach drv, $(HB_DB_DRIVERS), $(subst /,\,$(TOP)$(ROOT)source/rdd/$(drv)/$(HB_ARCH)/$(drv)))
RDDLIBS := $(foreach drv, $(HB_DB_DRIVERS), $(TOP)$(ROOT)source/rdd/$(drv)/$(HB_ARCH)/$(drv))
else
RDDLIBS := $(foreach drv, $(HB_DB_DRIVERS), $(subst /,\,$(HB_LIB_COMPILE)/$(drv)))
RDDLIBS := $(foreach drv, $(HB_DB_DRIVERS), $(HB_LIB_COMPILE)/$(drv))
endif
RDDLIBS := $(subst /,\,$(RDDLIBS))
endif
ifeq ($(findstring rtl,$(LIBS)),rtl)
@@ -85,6 +86,15 @@ ifeq ($(findstring rtl,$(LIBS)),rtl)
else
GTLIBS := $(HB_LIB_COMPILE)/$(HB_GT_LIB)
endif
ifneq ($(HB_GT_DEFAULT),)
ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB))
ifeq ($(HB_LIB_COMPILE),)
GTLIBS += $(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH)/$(HB_GT_DEFAULT)
else
GTLIBS += $(HB_LIB_COMPILE)/$(HB_GT_DEFAULT)
endif
endif
endif
GTLIBS := $(subst /,\,$(GTLIBS))
endif

10
harbour/config/dos/rsx32.cf
View File

@@ -42,10 +42,18 @@ LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$
LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
endif
# Add the specified GT driver library
# Add the specified GT driver library and other RTLs
ifeq ($(findstring rtl,$(LIBS)),rtl)
LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH)
LINKLIBS += -l$(HB_GT_LIB)
ifneq ($(HB_GT_DEFAULT),)
ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB))
LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH)
LINKLIBS += -l$(HB_GT_DEFAULT)
endif
endif
endif
# HB_SCREEN_LIB: empty, or one of ncurses, slang

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

@@ -46,6 +46,13 @@ ifeq ($(findstring rtl,$(LIBS)),rtl)
LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH)
LINKLIBS += -l$(HB_GT_LIB)
ifneq ($(HB_GT_DEFAULT),)
ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB))
LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH)
LINKLIBS += -l$(HB_GT_DEFAULT)
endif
endif
# HB_SCREEN_LIB: empty, or one of curses, slang
ifeq ($(HB_GT_LIB),gtcrs)
HB_SCREEN_LIB:=curses

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

@@ -59,7 +59,7 @@ LINKLIBS += -l$(HB_GT_LIB)
ifneq ($(HB_GT_DEFAULT),)
ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB))
LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(ARCH)
LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH)
LINKLIBS += -l$(HB_GT_DEFAULT)
endif
endif
@@ -78,10 +78,6 @@ endif
endif
endif
ifneq ($(HB_SCREEN_LIB),)
LINKLIBS += -l$(HB_SCREEN_LIB)
endif
ifeq ($(HB_GT_LIB),gtxvt)
LINKLIBS += -lX11
#LINKPATHS += -L/usr/X11R6/lib64
@@ -94,6 +90,10 @@ LINKPATHS += -L/usr/X11R6/lib
endif
endif
ifneq ($(HB_SCREEN_LIB),)
LINKLIBS += -l$(HB_SCREEN_LIB)
endif
# HB_GPM_MOUSE: use gpm mouse driver
ifeq ($(HB_GPM_MOUSE),yes)
LINKLIBS += -lgpm

5
harbour/config/linux/owatcom.cf
View File

@@ -60,6 +60,11 @@ ifeq ($(findstring rtl,$(LIBS)),rtl)
else
GTLIBS := $(HB_LIB_COMPILE)/$(HB_GT_LIB)
endif
ifneq ($(HB_GT_DEFAULT),)
ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB))
GTLIBS := $(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH)/$(HB_GT_DEFAULT)
endif
endif
endif
LDFILES = $(subst $(space),$(comma) ,$(^F))

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

@@ -62,6 +62,14 @@ LINKLIBS += -lgtos2
else
LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH)
LINKLIBS += -l$(HB_GT_LIB)
ifneq ($(HB_GT_DEFAULT),)
ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB))
LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH)
LINKLIBS += -l$(HB_GT_DEFAULT)
endif
endif
endif
endif
endif

8
harbour/config/os2/icc.cf
View File

@@ -53,6 +53,14 @@ LINKLIBS += $(TOP)$(ROOT)contrib/hgf/$(HB_GT_LIB)/$(HB_ARCH)/$(HB_GT_LIB)$(LIB_E
LINKLIBS += $(TOP)$(ROOT)source/rtl/gtos2/$(HB_ARCH)/gtos2.lib
else
LINKLIBS += $(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH)/$(HB_GT_LIB)$(LIB_EXT)
ifneq ($(HB_GT_DEFAULT),)
ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB))
LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH)
LINKLIBS += -l$(HB_GT_DEFAULT)
endif
endif
endif
endif
endif

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

@@ -46,6 +46,13 @@ ifeq ($(findstring rtl,$(LIBS)),rtl)
LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH)
LINKLIBS += -l$(HB_GT_LIB)
ifneq ($(HB_GT_DEFAULT),)
ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB))
LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH)
LINKLIBS += -l$(HB_GT_DEFAULT)
endif
endif
# HB_SCREEN_LIB: empty, or one of curses, slang
ifeq ($(HB_GT_LIB),gtcrs)
HB_SCREEN_LIB:=curses

7
harbour/config/w32/bcc32.cf
View File

@@ -53,6 +53,13 @@ endif
# Add the specified GT driver library
ifeq ($(findstring rtl,$(LIBS)),rtl)
LINKLIBS += $(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH)/$(HB_GT_LIB)$(LIB_EXT)
ifneq ($(HB_GT_DEFAULT),)
ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB))
LINKLIBS += $(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH)/$(HB_GT_DEFAULT)$(LIB_EXT)
endif
endif
endif
# HB_SCREEN_LIB: empty, or one of ncurses, slang

8
harbour/config/w32/gcc.cf
View File

@@ -46,6 +46,14 @@ endif
ifeq ($(findstring rtl,$(LIBS)),rtl)
LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH)
LINKLIBS += -l$(HB_GT_LIB)
ifneq ($(HB_GT_DEFAULT),)
ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB))
LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH)
LINKLIBS += -l$(HB_GT_DEFAULT)
endif
endif
endif
# HB_SCREEN_LIB: empty, or one of ncurses, slang

8
harbour/config/w32/mingw32.cf
View File

@@ -51,6 +51,14 @@ endif
ifeq ($(findstring rtl,$(LIBS)),rtl)
LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH)
LDLIBS += -l$(HB_GT_LIB)
ifneq ($(HB_GT_DEFAULT),)
ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB))
LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH)
LINKLIBS += -l$(HB_GT_DEFAULT)
endif
endif
endif
# HB_SCREEN_LIB: empty, or one of ncurses, slang

8
harbour/config/w32/msvc.cf
View File

@@ -38,6 +38,14 @@ endif
ifeq ($(findstring rtl,$(LIBS)),rtl)
LINKPATHS += -LIBPATH:$(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH)
LINKLIBS += $(HB_GT_LIB)$(LIB_EXT)
ifneq ($(HB_GT_DEFAULT),)
ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB))
LINKPATHS += -LIBPATH:$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH)
LINKLIBS += $(HB_GT_DEFAULT)$(LIB_EXT)
endif
endif
endif
LDFLAGS = $(LINKPATHS)

8
harbour/config/w32/rsxnt.cf
View File

@@ -49,6 +49,14 @@ endif
ifeq ($(findstring rtl,$(LIBS)),rtl)
LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH)
LINKLIBS += -l$(HB_GT_LIB)
ifneq ($(HB_GT_DEFAULT),)
ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB))
LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH)
LINKLIBS += -l$(HB_GT_DEFAULT)
endif
endif
endif
# HB_SCREEN_LIB: empty, or one of ncurses, slang

5
harbour/config/w32/watcom.cf
View File

@@ -65,6 +65,11 @@ endif
ifeq ($(findstring rtl,$(LIBS)),rtl)
GTLIBS := $(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(HB_ARCH)/$(HB_GT_LIB)
ifneq ($(HB_GT_DEFAULT),)
ifneq ($(HB_GT_DEFAULT),$(HB_GT_LIB))
GTLIBS := $(TOP)$(ROOT)source/rtl/$(HB_GT_DEFAULT)/$(HB_ARCH)/$(HB_GT_DEFAULT)
endif
endif
GTLIBS := $(subst /,\,$(GTLIBS))
endif

32
harbour/source/compiler/complex.c
View File

@@ -766,24 +766,30 @@ int hb_complex( YYSTYPE *yylval_ptr, HB_COMP_DECL )
break;
case DECLARE:
if( pLex->iState == LOOKUP )
if( pLex->iState == LOOKUP &&
!HB_PP_TOKEN_ISEOC( pToken->pNext ) )
{
if( !HB_PP_TOKEN_ISEOC( pToken->pNext ) &&
( HB_PP_TOKEN_TYPE( pToken->pNext->type ) == HB_PP_TOKEN_MACROVAR ||
HB_PP_TOKEN_TYPE( pToken->pNext->type ) == HB_PP_TOKEN_MACROTEXT ||
( HB_PP_TOKEN_TYPE( pToken->pNext->type ) == HB_PP_TOKEN_KEYWORD &&
( HB_PP_TOKEN_ISEOC( pToken->pNext->pNext ) ||
HB_PP_TOKEN_TYPE( pToken->pNext->pNext->type ) == HB_PP_TOKEN_LEFT_SB ||
HB_PP_TOKEN_TYPE( pToken->pNext->pNext->type ) == HB_PP_TOKEN_COMMA ||
HB_PP_TOKEN_TYPE( pToken->pNext->pNext->type ) == HB_PP_TOKEN_SEND ||
( HB_PP_TOKEN_TYPE( pToken->pNext->pNext->type ) == HB_PP_TOKEN_KEYWORD &&
hb_stricmp( "AS", pToken->pNext->pNext->value ) == 0 ) ) ) ) )
if( HB_PP_TOKEN_TYPE( pToken->pNext->type ) == HB_PP_TOKEN_MACROVAR ||
HB_PP_TOKEN_TYPE( pToken->pNext->type ) == HB_PP_TOKEN_MACROTEXT )
{
pLex->iState = PRIVATE;
return PRIVATE;
}
pLex->iState = DECLARE;
return DECLARE;
else if( HB_PP_TOKEN_TYPE( pToken->pNext->type ) == HB_PP_TOKEN_KEYWORD )
{
if( HB_PP_TOKEN_ISEOC( pToken->pNext->pNext ) ||
HB_PP_TOKEN_TYPE( pToken->pNext->pNext->type ) == HB_PP_TOKEN_LEFT_SB ||
HB_PP_TOKEN_TYPE( pToken->pNext->pNext->type ) == HB_PP_TOKEN_COMMA ||
HB_PP_TOKEN_TYPE( pToken->pNext->pNext->type ) == HB_PP_TOKEN_ASSIGN ||
( HB_PP_TOKEN_TYPE( pToken->pNext->pNext->type ) == HB_PP_TOKEN_KEYWORD &&
hb_stricmp( "AS", pToken->pNext->pNext->value ) == 0 ) )
{
pLex->iState = PRIVATE;
return PRIVATE;
}
pLex->iState = DECLARE;
return DECLARE;
}
}
iType = IDENTIFIER;
break;

2
harbour/source/compiler/gencli.c
View File

@@ -58,7 +58,7 @@ typedef HB_GENC_FUNC_ * HB_GENC_FUNC_PTR;
void hb_compGenILCode( HB_COMP_DECL, PHB_FNAME pFileName ) /* generates the IL output */
{
char szFileName[ _POSIX_PATH_MAX ], * szVer;
char szFileName[ _POSIX_PATH_MAX + 1 ], * szVer;
PFUNCTION pFunc = HB_COMP_PARAM->functions.pFirst;
PCOMSYMBOL pSym = HB_COMP_PARAM->symbols.pFirst;
PINLINE pInline;

2
harbour/source/compiler/gencobj.c
View File

@@ -173,7 +173,7 @@ void hb_compGenCObj( HB_COMP_DECL, PHB_FNAME pFileName )
if( HB_COMP_PARAM->pOutPath )
{
PHB_FNAME pOut = hb_fsFNameSplit( ( char * ) szFileName );
char pszTemp[ _POSIX_PATH_MAX ] = "";
char pszTemp[ _POSIX_PATH_MAX + 1 ] = "";
if( HB_COMP_PARAM->pOutPath->szPath )
pOut->szPath = HB_COMP_PARAM->pOutPath->szPath;

2
harbour/source/compiler/genhrb.c
View File

@@ -34,7 +34,7 @@
void hb_compGenPortObj( HB_COMP_DECL, PHB_FNAME pFileName )
{
char szFileName[ _POSIX_PATH_MAX ];
char szFileName[ _POSIX_PATH_MAX + 1 ];
PFUNCTION pFunc /*= HB_COMP_PARAM->functions.pFirst*/;
PCOMSYMBOL pSym = HB_COMP_PARAM->symbols.pFirst;
ULONG lPCodePos;

2
harbour/source/compiler/genjava.c
View File

@@ -61,7 +61,7 @@ static int hb_fputs( char * szName, FILE * fOut, int nChar )
void hb_compGenJava( HB_COMP_DECL, PHB_FNAME pFileName )
{
char szFileName[ _POSIX_PATH_MAX ], * szVer;
char szFileName[ _POSIX_PATH_MAX + 1 ], * szVer;
PFUNCTION pFunc /*= HB_COMP_PARAM->functions.pFirst */;
PCOMSYMBOL pSym = HB_COMP_PARAM->symbols.pFirst;
ULONG lPCodePos;

2
harbour/source/compiler/genobj32.c
View File

@@ -64,7 +64,7 @@ static char * szPrefix = "_HB_FUN_";
void hb_compGenObj32( HB_COMP_DECL, PHB_FNAME pFileName )
{
char szFileName[ _POSIX_PATH_MAX ];
char szFileName[ _POSIX_PATH_MAX + 1 ];
FILE * hObjFile; /* file handle for OBJ output */
char * szVer;

4
harbour/source/compiler/harbour.c
View File

@@ -4800,8 +4800,8 @@ static int hb_compAutoOpen( HB_COMP_DECL, char * szPrg, BOOL * pbSkipGen, BOOL b
if( HB_COMP_PARAM->pFileName->szName )
{
char szFileName[ _POSIX_PATH_MAX ]; /* filename to parse */
char szPpoName[ _POSIX_PATH_MAX ];
char szFileName[ _POSIX_PATH_MAX + 1 ]; /* filename to parse */
char szPpoName[ _POSIX_PATH_MAX + 1 ];
/* Clear and reinitialize preprocessor state */
hb_pp_reset( HB_COMP_PARAM->pLex->pPP );

4
harbour/source/pp/ppcore.c
View File

@@ -4539,7 +4539,7 @@ void hb_pp_initDynDefines( PHB_PP_STATE pState )
/* __PLATFORM__* */
pSrc = szPlatform = hb_verPlatform();
pDst = strncpy( szDefine, "__PLATFORM__", sizeof( szDefine ) );
pDst = hb_strncpy( szDefine, "__PLATFORM__", sizeof( szDefine ) - 1 );
i = 12;
while( pSrc[ 0 ] > ' ' && i < ( int ) sizeof( szDefine ) - 1 )
{
@@ -4564,7 +4564,7 @@ void hb_pp_initDynDefines( PHB_PP_STATE pState )
hb_pp_addDefine( pState, szDefine, szResult );
#ifdef HB_OS_UNIX
strncpy( szDefine + 12, "UNIX", sizeof( szDefine ) );
hb_strncpy( szDefine + 12, "UNIX", sizeof( szDefine ) - 13 );
hb_pp_addDefine( pState, szDefine, szResult );
#endif

2
harbour/source/rdd/workarea.c
View File

@@ -1527,7 +1527,7 @@ ERRCODE hb_waError( AREAP pArea, PHB_ITEM pError )
if( pArea && pArea->lprfsHost->sysName )
SELF_SYSNAME( pArea, ( BYTE * ) szRddName );
else
strncpy( szRddName, "???DRIVER", HARBOUR_MAX_RDD_DRIVERNAME_LENGTH );
hb_strncpy( szRddName, "???DRIVER", HARBOUR_MAX_RDD_DRIVERNAME_LENGTH );
hb_errPutSeverity( pError, ES_ERROR );
hb_errPutSubSystem( pError, szRddName );
hb_xfree( szRddName );

2
harbour/source/rtl/gtcgi/gtcgi.c
View File

@@ -176,7 +176,7 @@ static char * hb_gt_cgi_Version( int iType )
if( iType == 0 )
return HB_GT_DRVNAME( HB_GT_NAME );
return "Harbour Terminal: Standard stream console";
return "Harbour Terminal: Raw stream console";
}
static void hb_gt_cgi_Scroll( int iTop, int iLeft, int iBottom, int iRight,

2
harbour/source/rtl/hbffind.c
View File

@@ -741,7 +741,7 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind )
{
/* Do the conversions common for all platforms */
ffind->szName[ _POSIX_PATH_MAX ] = '\0';
ffind->szName[ _POSIX_PATH_MAX + 1 ] = '\0';
ffind->attr = hb_fsAttrFromRaw( raw_attr );