diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3bf50b4f07..6befca2472 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -7,6 +7,11 @@ For example: 2002-12-01 23:12 UTC+0100 Foo Bar */ + * tagged cvs with build38 and lifted cvs freeze + +2002-01-12 14:20 UTC+0300 Alexander Kresin + * source/rdd/dbfntx/dbfntx1.c + ! bug fixed, reported by Ramon F. Jaquez 2002-01-11 08:10 GMT-3 Luiz Rafael Culik * source/rdd/dbf1.c diff --git a/harbour/source/rtl/spfiles.c b/harbour/source/rtl/spfiles.c index a9c2e67f64..647c68a73c 100644 --- a/harbour/source/rtl/spfiles.c +++ b/harbour/source/rtl/spfiles.c @@ -118,42 +118,32 @@ FHANDLE hb_spOpen( BYTE * pFilename, USHORT uiFlags ) FHANDLE hb_spCreate( BYTE * pFilename, USHORT uiAttr ) { + BYTE path[ _POSIX_PATH_MAX + 1 ]; + PHB_FNAME pFilepath = hb_fsFNameSplit( (char*) pFilename ); + HB_TRACE(HB_TR_DEBUG, ("hb_spCreate(%p, %hu)", pFilename, uiAttr)); - if( ISCHAR( 1 ) ) - { - BYTE path[ _POSIX_PATH_MAX + 1 ]; - PHB_FNAME pFilepath = hb_fsFNameSplit( (char*) pFilename ); + if( ! pFilepath->szPath && hb_set.HB_SET_DEFAULT ) + pFilepath->szPath = hb_set.HB_SET_DEFAULT; - if( ! pFilepath->szPath && hb_set.HB_SET_DEFAULT ) - pFilepath->szPath = hb_set.HB_SET_DEFAULT; + hb_fsFNameMerge( (char*) path, pFilepath ); + hb_xfree( pFilepath ); - hb_fsFNameMerge( (char*) path, pFilepath ); - hb_xfree( pFilepath ); - - return hb_fsCreate( path, uiAttr ); - } - else - return FS_ERROR; + return hb_fsCreate( path, uiAttr ); } FHANDLE hb_spCreateEx( BYTE * pFilename, USHORT uiAttr, USHORT uiFlags ) { + BYTE path[ _POSIX_PATH_MAX + 1 ]; + PHB_FNAME pFilepath = hb_fsFNameSplit( (char*) pFilename ); + HB_TRACE(HB_TR_DEBUG, ("hb_spCreateEx(%p, %hu, %hu)", pFilename, uiAttr, uiFlags)); - if( ISCHAR( 1 ) ) - { - BYTE path[ _POSIX_PATH_MAX + 1 ]; - PHB_FNAME pFilepath = hb_fsFNameSplit( (char*) pFilename ); + if( ! pFilepath->szPath && hb_set.HB_SET_DEFAULT ) + pFilepath->szPath = hb_set.HB_SET_DEFAULT; - if( ! pFilepath->szPath && hb_set.HB_SET_DEFAULT ) - pFilepath->szPath = hb_set.HB_SET_DEFAULT; + hb_fsFNameMerge( (char*) path, pFilepath ); + hb_xfree( pFilepath ); - hb_fsFNameMerge( (char*) path, pFilepath ); - hb_xfree( pFilepath ); - - return hb_fsCreateEx( path, uiAttr, uiFlags ); - } - else - return FS_ERROR; + return hb_fsCreateEx( path, uiAttr, uiFlags ); }