2010-02-20 15:55 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/philes.c
* include/hbextern.ch
+ Added HB_CURDRIVE(). Similar to Xbase++ CURDRIVE(), but
always provided by Harbour core.
* utils/hbmk2/hbmk2.prg
- Deleted mapping from hb_CurDrive() to CurDrive().
* examples/httpsrv/uhttpd.prg
* examples/httpsrv/modules/tableservletdb.prg
* examples/gtwvw/tests/wvwtest9.prg
* Changed to use hb_CurDrive() which is always available in
Harbour core, instead of Xbase++ specific CurDrive().
This commit is contained in:
@@ -157,7 +157,7 @@ RETURN Self
|
||||
METHOD Open() CLASS TableManager
|
||||
LOCAL cDBF := ::cTable
|
||||
|
||||
//hb_ToOutDebug( "CurPath = %s", CurDrive() + hb_osDriveSeparator() + HB_OSPathSeparator() + CurDir() )
|
||||
//hb_ToOutDebug( "CurPath = %s", hb_CurDrive() + hb_osDriveSeparator() + HB_OSPathSeparator() + CurDir() )
|
||||
|
||||
//hb_ToOutDebug( "before: cDBF = %s, Used() = %s\n", cDBF, Used() )
|
||||
|
||||
|
||||
@@ -1551,21 +1551,21 @@ STATIC FUNCTION CGIExec( cProc, /*@*/ cOutPut )
|
||||
// No hIn, hErr == hOut
|
||||
|
||||
// save current directory
|
||||
cCurPath := CurDrive() + hb_osDriveSeparator() + HB_OSPathSeparator() + CurDir()
|
||||
cCurPath := hb_CurDrive() + hb_osDriveSeparator() + HB_OSPathSeparator() + CurDir()
|
||||
|
||||
//hb_toOutDebug( "cCurPath: %s\n\r", cCurPath )
|
||||
|
||||
// Change dir to document root
|
||||
DirChange( s_cDocumentRoot )
|
||||
|
||||
//hb_toOutDebug( "New Path: %s\n\r", CurDrive() + hb_osDriveSeparator() + HB_OSPathSeparator() + CurDir() )
|
||||
//hb_toOutDebug( "New Path: %s\n\r", hb_CurDrive() + hb_osDriveSeparator() + HB_OSPathSeparator() + CurDir() )
|
||||
|
||||
hProc := hb_processOpen( cProc, @hIn, @hOut, @hOut, .T. ) // .T. = Detached Process (Hide Window)
|
||||
|
||||
// return to original folder
|
||||
DirChange( cCurPath )
|
||||
|
||||
//hb_toOutDebug( "New 2 Path: %s\n\r", CurDrive() + hb_osDriveSeparator() + HB_OSPathSeparator() + CurDir() )
|
||||
//hb_toOutDebug( "New 2 Path: %s\n\r", hb_CurDrive() + hb_osDriveSeparator() + HB_OSPathSeparator() + CurDir() )
|
||||
|
||||
IF hProc > -1
|
||||
//hb_toOutDebug( "Process handler: %s\n\r", hProc )
|
||||
@@ -2807,7 +2807,7 @@ STATIC FUNCTION Handler_HrbScript( cFileName )
|
||||
IF !EMPTY( pHRB := HB_HRBLOAD( cHRBBody ) )
|
||||
|
||||
// save current directory
|
||||
cCurPath := CurDrive() + hb_osDriveSeparator() + HB_OSPathSeparator() + CurDir()
|
||||
cCurPath := hb_CurDrive() + hb_osDriveSeparator() + HB_OSPathSeparator() + CurDir()
|
||||
// Change dir to document root
|
||||
DirChange( s_cDocumentRoot )
|
||||
|
||||
|
||||
Reference in New Issue
Block a user