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

2012-10-03 11:15 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* harbour/include/hbapifs.h
  * harbour/src/rtl/filesys.c
    + added two new C functions:
         HB_BOOL hb_fsGetCWD( char * pszBuffer, HB_SIZE nSize );
         HB_BOOL hb_fsSetCWD( const char * pszDirName );
    * synced some parameters names with declarations in header

  * harbour/src/rtl/hbfilehi.prg
  * harbour/src/rtl/philes.c
    * rewritten HB_CWD() function in C
    ! fixed to HB_CWD() work with UNC path in MS-Windows and other
      systems using drive letters
    + added support for setting new working directory (and drive)
      by HB_CWD( <cNewWD> )
This commit is contained in:
Przemyslaw Czerpak
2012-10-03 09:16:06 +00:00
parent 870ab5dd8d
commit 2f2cd60a56
5 changed files with 222 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
harbour/ChangeLog
View File

@@ -16,6 +16,22 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-10-03 11:15 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* harbour/include/hbapifs.h
* harbour/src/rtl/filesys.c
+ added two new C functions:
HB_BOOL hb_fsGetCWD( char * pszBuffer, HB_SIZE nSize );
HB_BOOL hb_fsSetCWD( const char * pszDirName );
* synced some parameters names with declarations in header
* harbour/src/rtl/hbfilehi.prg
* harbour/src/rtl/philes.c
* rewritten HB_CWD() function in C
! fixed to HB_CWD() work with UNC path in MS-Windows and other
systems using drive letters
+ added support for setting new working directory (and drive)
by HB_CWD( <cNewWD> )
2012-10-02 23:02 UTC+0200 Firstname Lastname (me domain.net)
* tests/inkeytst.prg
* tests/mousetst.prg

2
harbour/include/hbapifs.h
View File

@@ -169,6 +169,8 @@ extern HB_EXPORT HB_BOOL hb_fsGetFileTime ( const char * pszFileName, long *
extern HB_EXPORT HB_BOOL hb_fsSetFileTime ( const char * pszFileName, long lJulian, long lMillisec );
extern HB_EXPORT HB_BOOL hb_fsGetAttr ( const char * pszFileName, HB_FATTR * pulAttr );
extern HB_EXPORT HB_BOOL hb_fsSetAttr ( const char * pszFileName, HB_FATTR ulAttr );
extern HB_EXPORT HB_BOOL hb_fsGetCWD ( char * pszBuffer, HB_SIZE nSize );
extern HB_EXPORT HB_BOOL hb_fsSetCWD ( const char * pszDirName );
extern HB_EXPORT void hb_fsSetError ( HB_ERRCODE uiError ); /* set the file system DOS error number */
extern HB_EXPORT void hb_fsSetIOError ( HB_BOOL fResult, HB_USHORT uiOperation ); /* set the file system error number after IO operation */
extern HB_EXPORT HB_BOOL hb_fsTruncAt ( HB_FHANDLE hFileHandle, HB_FOFFSET nOffset ); /* truncate file to given size */

221
harbour/src/rtl/filesys.c
View File

@@ -3042,22 +3042,22 @@ HB_BOOL hb_fsRename( const char * pOldName, const char * pNewName )
return fResult;
}
HB_BOOL hb_fsMkDir( const char * pDirname )
HB_BOOL hb_fsMkDir( const char * pszDirName )
{
HB_BOOL fResult;
HB_TRACE(HB_TR_DEBUG, ("hb_fsMkDir(%s)", pDirname));
HB_TRACE(HB_TR_DEBUG, ("hb_fsMkDir(%s)", pszDirName));
#if defined( HB_OS_WIN )
{
LPCTSTR lpDirname;
LPCTSTR lpDirName;
LPTSTR lpFree;
lpDirname = HB_FSNAMECONV( pDirname, &lpFree );
lpDirName = HB_FSNAMECONV( pszDirName, &lpFree );
hb_vmUnlock();
fResult = CreateDirectory( lpDirname, NULL ) != 0;
fResult = CreateDirectory( lpDirName, NULL ) != 0;
hb_fsSetIOError( fResult, 0 );
hb_vmLock();
@@ -3069,16 +3069,16 @@ HB_BOOL hb_fsMkDir( const char * pDirname )
{
char * pszFree;
pDirname = hb_fsNameConv( pDirname, &pszFree );
pszDirName = hb_fsNameConv( pszDirName, &pszFree );
hb_vmUnlock();
# if ! defined( HB_OS_UNIX ) && \
( defined( __WATCOMC__ ) || defined( __BORLANDC__ ) || \
defined( __IBMCPP__ ) || defined( __MINGW32__ ) )
fResult = ( mkdir( pDirname ) == 0 );
fResult = ( mkdir( pszDirName ) == 0 );
# else
fResult = ( mkdir( pDirname, S_IRWXU | S_IRWXG | S_IRWXO ) == 0 );
fResult = ( mkdir( pszDirName, S_IRWXU | S_IRWXG | S_IRWXO ) == 0 );
# endif
hb_fsSetIOError( fResult, 0 );
@@ -3092,24 +3092,24 @@ HB_BOOL hb_fsMkDir( const char * pDirname )
return fResult;
}
HB_BOOL hb_fsChDir( const char * pDirname )
HB_BOOL hb_fsChDir( const char * pszDirName )
{
HB_BOOL fResult;
HB_TRACE(HB_TR_DEBUG, ("hb_fsChDir(%s)", pDirname));
HB_TRACE(HB_TR_DEBUG, ("hb_fsChDir(%s)", pszDirName));
#if defined( HB_OS_WIN )
{
LPCTSTR lpDirname;
LPCTSTR lpDirName;
LPTSTR lpFree;
UINT uiErrMode;
lpDirname = HB_FSNAMECONV( pDirname, &lpFree );
lpDirName = HB_FSNAMECONV( pszDirName, &lpFree );
hb_vmUnlock();
uiErrMode = SetErrorMode( SEM_FAILCRITICALERRORS );
fResult = SetCurrentDirectory( lpDirname ) != FALSE;
fResult = SetCurrentDirectory( lpDirName ) != FALSE;
SetErrorMode( uiErrMode );
hb_fsSetIOError( fResult, 0 );
@@ -3122,10 +3122,11 @@ HB_BOOL hb_fsChDir( const char * pDirname )
{
char * pszFree;
pDirname = hb_fsNameConv( pDirname, &pszFree );
pszDirName = hb_fsNameConv( pszDirName, &pszFree );
hb_vmUnlock();
fResult = ( chdir( pDirname ) == 0 );
fResult = ( chdir( pszDirName ) == 0 );
hb_fsSetIOError( fResult, 0 );
hb_vmLock();
@@ -3138,22 +3139,22 @@ HB_BOOL hb_fsChDir( const char * pDirname )
return fResult;
}
HB_BOOL hb_fsRmDir( const char * pDirname )
HB_BOOL hb_fsRmDir( const char * pszDirName )
{
HB_BOOL fResult;
HB_TRACE(HB_TR_DEBUG, ("hb_fsRmDir(%s)", pDirname));
HB_TRACE(HB_TR_DEBUG, ("hb_fsRmDir(%s)", pszDirName));
#if defined( HB_OS_WIN )
{
LPCTSTR lpDirname;
LPCTSTR lpDirName;
LPTSTR lpFree;
lpDirname = HB_FSNAMECONV( pDirname, &lpFree );
lpDirName = HB_FSNAMECONV( pszDirName, &lpFree );
hb_vmUnlock();
fResult = RemoveDirectory( lpDirname ) != 0;
fResult = RemoveDirectory( lpDirName ) != 0;
hb_fsSetIOError( fResult, 0 );
hb_vmLock();
@@ -3165,11 +3166,11 @@ HB_BOOL hb_fsRmDir( const char * pDirname )
{
char * pszFree;
pDirname = hb_fsNameConv( pDirname, &pszFree );
pszDirName = hb_fsNameConv( pszDirName, &pszFree );
hb_vmUnlock();
fResult = ( rmdir( pDirname ) == 0 );
fResult = ( rmdir( pszDirName ) == 0 );
hb_fsSetIOError( fResult, 0 );
hb_vmLock();
@@ -3204,8 +3205,6 @@ HB_ERRCODE hb_fsCurDirBuff( int iDrive, char * pszBuffer, HB_SIZE nSize )
{
int iCurDrv = iDrive;
HB_ERRCODE nResult;
char * pszStart;
HB_SIZE nLen;
HB_TRACE(HB_TR_DEBUG, ("hb_fsCurDirBuff(%d)", iDrive));
@@ -3241,10 +3240,10 @@ HB_ERRCODE hb_fsCurDirBuff( int iDrive, char * pszBuffer, HB_SIZE nSize )
if( iDrive >= 0 )
{
ULONG nLen = ( ULONG ) nSize;
ULONG ulLen = ( ULONG ) nSize;
hb_fsSetIOError( DosQueryCurrentDir( iDrive, ( PBYTE ) pszBuffer,
&nLen ) == NO_ERROR, 0 );
&ulLen ) == NO_ERROR, 0 );
}
else
hb_fsSetError( ( HB_ERRCODE ) FS_ERROR );
@@ -3276,18 +3275,26 @@ HB_ERRCODE hb_fsCurDirBuff( int iDrive, char * pszBuffer, HB_SIZE nSize )
if( nResult == 0 && pszBuffer[ 0 ] )
{
char * pszStart;
HB_SIZE nLen;
/* Strip the leading drive spec, and leading backslash if there's one. */
/* NOTE: A trailing underscore is not returned on this platform,
so we don't need to strip it. [vszakats] */
#if defined( __DJGPP__ ) || defined( HB_OS_OS2 )
/* convert '/' to '\' */
while( ( pszStart = strchr( pszBuffer, '/' ) ) != NULL )
*pszStart = '\\';
#endif
pszStart = pszBuffer;
nLen = 0;
while( pszBuffer[ nLen ] != 0 )
{
if( pszBuffer[ nLen ] == '/' )
pszBuffer[ nLen ] = '\\';
++nLen;
}
#else
nLen = strlen( pszBuffer );
#endif
pszStart = pszBuffer;
#if defined( HB_OS_HAS_DRIVE_LETTER )
if( pszStart[ 1 ] == HB_OS_DRIVE_DELIM_CHR )
@@ -3331,6 +3338,158 @@ HB_ERRCODE hb_fsCurDirBuff( int iDrive, char * pszBuffer, HB_SIZE nSize )
return nResult;
}
HB_BOOL hb_fsGetCWD( char * pszBuffer, HB_SIZE nSize )
{
HB_BOOL fResult;
HB_TRACE(HB_TR_DEBUG, ("hb_fsGetCWD(%p,%" HB_PFS "u)", pszBuffer, nSize));
pszBuffer[ 0 ] = '\0';
hb_vmUnlock();
#if defined( HB_OS_WIN )
{
DWORD dwSize = ( DWORD ) nSize;
LPTSTR lpBuffer = ( LPTSTR ) hb_xgrab( dwSize * sizeof( TCHAR ) );
lpBuffer[ 0 ] = TEXT( '\0' );
fResult = GetCurrentDirectory( dwSize, lpBuffer ) != 0;
hb_fsSetIOError( fResult, 0 );
lpBuffer[ dwSize - 1 ] = TEXT( '\0' );
HB_OSSTRDUP2( lpBuffer, pszBuffer, nSize - 1 );
hb_xfree( lpBuffer );
}
#elif defined( HB_OS_OS2 )
{
ULONG ulLen = ( ULONG ) nSize - 3, ulDrive, ulLogical;
DosQueryCurrentDisk( &ulDrive, &ulLogical );
pszBuffer[ 0 ] = ( char ) ( ulDrive + ( 'A' - 1 ) );
pszBuffer[ 1 ] = HB_OS_DRIVE_DELIM_CHR;
pszBuffer[ 2 ] = HB_OS_PATH_DELIM_CHR;
fResult = DosQueryCurrentDir( 0, ( PBYTE ) pszBuffer + 3, &ulLen ) == NO_ERROR;
hb_fsSetIOError( fResult, 0 );
}
#else
fResult = getcwd( pszBuffer, nSize ) != NULL;
hb_fsSetIOError( fResult, 0 );
#endif
hb_vmLock();
pszBuffer[ nSize - 1 ] = '\0';
if( fResult && pszBuffer[ 0 ] )
{
HB_SIZE nLen;
#if defined( __DJGPP__ ) || defined( HB_OS_OS2 )
/* convert '/' to '\' */
nLen = 0;
while( pszBuffer[ nLen ] != 0 )
{
if( pszBuffer[ nLen ] == '/' )
pszBuffer[ nLen ] = '\\';
++nLen;
}
#else
nLen = strlen( pszBuffer );
#endif
/* add the trailing (back)slash if there's no one */
if( nLen + 1 < nSize &&
strchr( HB_OS_PATH_DELIM_CHR_LIST, ( HB_UCHAR ) pszBuffer[ nLen - 1 ] ) == 0 )
{
pszBuffer[ nLen++ ] = HB_OS_PATH_DELIM_CHR;
pszBuffer[ nLen ] = '\0';
}
#if !defined( HB_OS_WIN )
/* Convert from OS codepage */
{
char * pszFree = NULL;
const char * pszResult;
nLen = nSize;
pszResult = hb_osDecodeCP( pszBuffer, &pszFree, &nLen );
if( pszResult != pszBuffer )
hb_strncpy( pszBuffer, pszResult, nSize - 1 );
if( pszFree )
hb_xfree( pszFree );
}
#endif
}
return fResult;
}
HB_BOOL hb_fsSetCWD( const char * pszDirName )
{
HB_BOOL fResult;
HB_TRACE(HB_TR_DEBUG, ("hb_fsSetCWD(%s)", pszDirName));
#if defined( HB_OS_WIN )
{
LPCTSTR lpDirName;
LPTSTR lpFree;
UINT uiErrMode;
lpDirName = HB_FSNAMECONV( pszDirName, &lpFree );
hb_vmUnlock();
uiErrMode = SetErrorMode( SEM_FAILCRITICALERRORS );
fResult = SetCurrentDirectory( lpDirName ) != FALSE;
hb_fsSetIOError( fResult, 0 );
SetErrorMode( uiErrMode );
hb_vmLock();
if( lpFree )
hb_xfree( lpFree );
}
#else
{
char * pszFree;
pszDirName = hb_fsNameConv( pszDirName, &pszFree );
hb_vmUnlock();
fResult = ( chdir( pszDirName ) == 0 );
hb_fsSetIOError( fResult, 0 );
#if defined( HB_OS_HAS_DRIVE_LETTER ) && !defined( __DJGPP__ )
if( fResult && pszDirName[ 0 ] != 0 &&
pszDirName[ 1 ] == HB_OS_DRIVE_DELIM_CHR )
{
int iDrive = pszDirName[ 0 ];
if( iDrive >= 'A' && iDrive <= 'Z' )
iDrive -= 'A';
else if( iDrive >= 'a' && iDrive <= 'z' )
iDrive -= 'a';
else
iDrive = 0;
if( iDrive )
HB_FS_SETDRIVE( iDrive );
}
#endif
hb_vmLock();
if( pszFree )
hb_xfree( pszFree );
}
#endif
return fResult;
}
/* NOTE: 0=A:, 1=B:, 2=C:, 3=D:, ... */
HB_ERRCODE hb_fsChDrv( int iDrive )

7
harbour/src/rtl/hbfilehi.prg
View File

@@ -50,13 +50,6 @@
*
*/
/* QUESTION: How to return success/failure when dir is passed? */
FUNCTION hb_cwd( cNewDir )
IF HB_ISSTRING( cNewDir )
/* TODO */
ENDIF
RETURN hb_DirSepAdd( hb_CurDrive() + hb_osDriveSeparator() + hb_ps() + CurDir() )
#define _ISDRIVESPEC( cDir ) ( ! Empty( hb_osDriveSeparator() ) .AND. Right( cDir, Len( hb_osDriveSeparator() ) ) == hb_osDriveSeparator() )
/* NOTE: Can hurt if there are symlinks on the way. */

14
harbour/src/rtl/philes.c
View File

@@ -320,6 +320,20 @@ HB_FUNC( HB_CURDRIVE )
#endif
}
HB_FUNC( HB_CWD )
{
char szBuffer[ HB_PATH_MAX ];
const char * szNewWD = hb_parc( 1 );
if( szNewWD )
hb_fsSetCWD( szNewWD );
if( hb_fsGetCWD( szBuffer, sizeof( szBuffer ) ) )
hb_retc( szBuffer );
else
hb_retc_null();
}
HB_FUNC( HB_PROGNAME )
{
char * pszBaseName = hb_cmdargProgName();