From 1c87526a47edc45baab732a9d7e3857d8a8ceb27 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 10 Feb 2009 09:34:44 +0000 Subject: [PATCH] 2009-02-10 10:34 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * source/rtl/filesys.c ! Fixes for *NIX compilation to latest change. Please test. --- harbour/ChangeLog | 5 +++++ harbour/source/rtl/filesys.c | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7af85a63a1..afdaa9133a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,11 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-10 10:34 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * source/rtl/filesys.c + ! Fixes for *NIX compilation to latest change. + Please test. + 2009-02-10 03:52 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * contrib/hbssl/Makefile + Added new detection dir. diff --git a/harbour/source/rtl/filesys.c b/harbour/source/rtl/filesys.c index 53bf034b61..c7e0e5240e 100644 --- a/harbour/source/rtl/filesys.c +++ b/harbour/source/rtl/filesys.c @@ -3227,6 +3227,7 @@ void hb_fsBaseDirBuff( BYTE * pbyBuffer ) char byCurDir[ _POSIX_PATH_MAX + 1 ]; char byBinDir[ _POSIX_PATH_MAX + 1 ]; + int nBinDirOffset = 0; PHB_FNAME pFName = hb_fsFNameSplit( hb_cmdargARGV()[ 0 ] ); @@ -3239,18 +3240,18 @@ void hb_fsBaseDirBuff( BYTE * pbyBuffer ) /* Skip 'current dir' if present, and replace with cwd. */ if( byBinDir[ 0 ] == '.' && byBinDir[ 1 ] == HB_OS_PATH_DELIM_CHR ) { - byBinDir += 2; + nBinDirOffset += 2; hb_fsCurDirBuff( 0, ( BYTE * ) byCurDir, sizeof( byCurDir ) ); - hb_strncpy( byBuffer, HB_OS_PATH_DELIM_CHR_STRING, sizeof( byBuffer ) - 1 ); + hb_strncpy( byBuffer, HB_OS_PATH_DELIM_CHR_STRING, _POSIX_PATH_MAX ); if( byCurDir[ 0 ] != '\0' ) { hb_strncat( byBuffer, byCurDir, sizeof( byBuffer ) - 1 ); - hb_strncat( byBuffer, HB_OS_PATH_DELIM_CHR_STRING, sizeof( byBuffer ) - 1 ); + hb_strncat( byBuffer, HB_OS_PATH_DELIM_CHR_STRING, _POSIX_PATH_MAX ); } } - hb_strncat( byBuffer, byBinDir, sizeof( byBuffer ) - 1 ); + hb_strncat( pbyBuffer, byBinDir + nBinDirOffset, _POSIX_PATH_MAX ); } #else {