diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 99796fd73e..67393d6916 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,27 @@ The license applies to all entries newer than 2009-04-28. */ +2011-02-03 22:43 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * include/harbour.hbx + * src/rtl/hbfilehi.prg + * Renames in new path/fn handling functions. + * HB_FNAMEDIRGET() -> HB_FNAMEDIR() + * HB_FNAMENAMEGET() -> HB_FNAMENAME() + * HB_FNAMENAMEEXTGET() -> HB_FNAMENAMEEXT() + * HB_FNAMEEXTGET() -> HB_FNAMEEXT() + * HB_FNAMEEXTDEF() -> HB_FNAMEEXTSETDEF() + + ; Patch from Tamas: + + * src/rtl/hbcom.c + + adds minix serial device names to hbcom + + * utils/hbmk2/hbmk2.prg + ! Fixed RTE regression in previous recent minix patch. + + * config/dos/djgpp.mk + ! Applied previous C++ gcc flag patch also to djgpp. + 2011-02-03 18:16 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * src/rtl/hbsocket.c * contrib/xhb/xhb.hbp diff --git a/harbour/config/dos/djgpp.mk b/harbour/config/dos/djgpp.mk index 4365e7edd9..ab0f6d9372 100644 --- a/harbour/config/dos/djgpp.mk +++ b/harbour/config/dos/djgpp.mk @@ -22,7 +22,10 @@ CFLAGS += -I. -I$(HB_HOST_INC) ifneq ($(HB_BUILD_WARN),no) CFLAGS += -W -Wall else - CFLAGS += -Wimplicit-int -Wimplicit-function-declaration -Wmissing-braces -Wreturn-type -Wformat + CFLAGS += -Wmissing-braces -Wreturn-type -Wformat + ifneq ($(HB_BUILD_MODE),cpp) + CFLAGS += -Wimplicit-int -Wimplicit-function-declaration + endif endif ifneq ($(HB_BUILD_OPTIM),no) diff --git a/harbour/include/harbour.hbx b/harbour/include/harbour.hbx index ba49cd9d4c..b66b79f0f1 100644 --- a/harbour/include/harbour.hbx +++ b/harbour/include/harbour.hbx @@ -420,14 +420,14 @@ DYNAMIC HB_FLINK DYNAMIC HB_FLINKREAD DYNAMIC HB_FLINKSYM DYNAMIC HB_FLOCK -DYNAMIC HB_FNAMEDIRGET +DYNAMIC HB_FNAMEDIR DYNAMIC HB_FNAMEEXISTS -DYNAMIC HB_FNAMEEXTDEF -DYNAMIC HB_FNAMEEXTGET +DYNAMIC HB_FNAMEEXT DYNAMIC HB_FNAMEEXTSET +DYNAMIC HB_FNAMEEXTSETDEF DYNAMIC HB_FNAMEMERGE -DYNAMIC HB_FNAMENAMEEXTGET -DYNAMIC HB_FNAMENAMEGET +DYNAMIC HB_FNAMENAME +DYNAMIC HB_FNAMENAMEEXT DYNAMIC HB_FNAMESPLIT DYNAMIC HB_FORNEXT DYNAMIC HB_FSETATTR diff --git a/harbour/src/rtl/hbcom.c b/harbour/src/rtl/hbcom.c index 54e1d0a9d7..e6612f1864 100644 --- a/harbour/src/rtl/hbcom.c +++ b/harbour/src/rtl/hbcom.c @@ -192,6 +192,8 @@ static const char * hb_comGetName( PHB_COM pCom, char * buffer, int size ) hb_snprintf( buffer, size, "/dev/ttyf%02d", pCom->port ); # elif defined( HB_OS_DARWIN ) hb_snprintf( buffer, size, "/dev/cuaa%d", pCom->port - 1 ); +# elif defined( HB_OS_MINIX ) + hb_snprintf( buffer, size, "/dev/tty%02d", pCom->port - 1 ); # else /* defined( HB_OS_LINUX ) || defined( HB_OS_CYGWIN ) || ... */ hb_snprintf( buffer, size, "/dev/ttyS%d", pCom->port - 1 ); # endif diff --git a/harbour/src/rtl/hbfilehi.prg b/harbour/src/rtl/hbfilehi.prg index 8e4d4f663f..216218ac2d 100644 --- a/harbour/src/rtl/hbfilehi.prg +++ b/harbour/src/rtl/hbfilehi.prg @@ -339,39 +339,28 @@ FUNCTION hb_DirUnbuild( cDir ) RETURN .T. -FUNCTION hb_FNameDirGet( cFileName ) +FUNCTION hb_FNameDir( cFileName ) LOCAL cDir hb_FNameSplit( cFileName, @cDir ) RETURN cDir -FUNCTION hb_FNameNameGet( cFileName ) +FUNCTION hb_FNameName( cFileName ) LOCAL cName hb_FNameSplit( cFileName,, @cName ) RETURN cName -FUNCTION hb_FNameNameExtGet( cFileName ) +FUNCTION hb_FNameNameExt( cFileName ) LOCAL cName, cExt hb_FNameSplit( cFileName,, @cName, @cExt ) RETURN hb_FNameMerge( NIL, cName, cExt ) -FUNCTION hb_FNameExtDef( cFileName, cDefExt ) - LOCAL cDir, cName, cExt - - hb_FNameSplit( cFileName, @cDir, @cName, @cExt ) - - IF Empty( cExt ) - cExt := cDefExt - ENDIF - - RETURN hb_FNameMerge( cDir, cName, cExt ) - -FUNCTION hb_FNameExtGet( cFileName ) +FUNCTION hb_FNameExt( cFileName ) LOCAL cExt hb_FNameSplit( cFileName,,, @cExt ) @@ -384,3 +373,14 @@ FUNCTION hb_FNameExtSet( cFileName, cExt ) hb_FNameSplit( cFileName, @cDir, @cName ) RETURN hb_FNameMerge( cDir, cName, cExt ) + +FUNCTION hb_FNameExtSetDef( cFileName, cDefExt ) + LOCAL cDir, cName, cExt + + hb_FNameSplit( cFileName, @cDir, @cName, @cExt ) + + IF Empty( cExt ) + cExt := cDefExt + ENDIF + + RETURN hb_FNameMerge( cDir, cName, cExt ) diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index e09528ede2..c4ad81d1fb 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -3211,7 +3211,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) CASE _WARN_YES ; AAdd( hbmk[ _HBMK_aOPTC ], "-W -Wall" ) ; EXIT CASE _WARN_LOW AAdd( hbmk[ _HBMK_aOPTC ], "-Wmissing-braces -Wreturn-type -Wformat" ) - IF ! hbmk[ _HBMK_lCPP ] + IF hbmk[ _HBMK_lCPP ] != NIL .AND. ! hbmk[ _HBMK_lCPP ] AAdd( hbmk[ _HBMK_aOPTC ], "-Wimplicit-int -Wimplicit-function-declaration" ) ENDIF EXIT @@ -3474,7 +3474,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) CASE _WARN_YES ; AAdd( hbmk[ _HBMK_aOPTC ], "-W -Wall" ) ; EXIT CASE _WARN_LOW AAdd( hbmk[ _HBMK_aOPTC ], "-Wmissing-braces -Wreturn-type -Wformat" ) - IF ! hbmk[ _HBMK_lCPP ] + IF hbmk[ _HBMK_lCPP ] != NIL .AND. ! hbmk[ _HBMK_lCPP ] AAdd( hbmk[ _HBMK_aOPTC ], "-Wimplicit-int -Wimplicit-function-declaration" ) ENDIF EXIT @@ -3615,7 +3615,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) CASE _WARN_YES ; AAdd( hbmk[ _HBMK_aOPTC ], "-W -Wall" ) ; EXIT CASE _WARN_LOW AAdd( hbmk[ _HBMK_aOPTC ], "-Wmissing-braces -Wreturn-type -Wformat" ) - IF ! hbmk[ _HBMK_lCPP ] + IF hbmk[ _HBMK_lCPP ] != NIL .AND. ! hbmk[ _HBMK_lCPP ] AAdd( hbmk[ _HBMK_aOPTC ], "-Wimplicit-int -Wimplicit-function-declaration" ) ENDIF EXIT @@ -3728,7 +3728,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) CASE _WARN_YES ; AAdd( hbmk[ _HBMK_aOPTC ], "-W -Wall" ) ; EXIT CASE _WARN_LOW AAdd( hbmk[ _HBMK_aOPTC ], "-Wmissing-braces -Wreturn-type -Wformat" ) - IF ! hbmk[ _HBMK_lCPP ] + IF hbmk[ _HBMK_lCPP ] != NIL .AND. ! hbmk[ _HBMK_lCPP ] AAdd( hbmk[ _HBMK_aOPTC ], "-Wimplicit-int -Wimplicit-function-declaration" ) ENDIF EXIT