7799f9234e
* include/hbapifs.h
* source/rtl/spfiles.c
+ Added hb_spFileExists(). Same as hb_spFile(), but uses
the more efficient (especially on networks) hb_fsFileExists()
call to check for file exitance.
[ not very elegant solution, as I've just copied the
whole function, and changed the file existance call, maybe
a worker function + passing the check function pointer
could help, but the hb_fsFile() and hb_fsFileExists() workings
differ slightly. ]
* source/rdd/dbfntx/dbfntx1.c
* source/rdd/dbfnsx/dbfnsx1.c
* source/rdd/dbfcdx/dbfcdx1.c
* source/rdd/dbf1.c
% Using hb_spFileExists() instead of hb_spFile().
This API also works for dirs where use doesn't have file listing
rights, which may create a slight incompatibility by finding
files which weren't found by former method (and by Clipper).
C:\WINDOWS\TEMP\*.* were such when logged in as non-admin user,
but this dir is only used as a default TEMP dir for DOS programs.
Please speak up if you find this issue (or something else) to
be problem.
* source/rtl/file.c
* File naming standardized.
* doc/whatsnew.txt
* Minor updates.
229 lines
6.8 KiB
C
229 lines
6.8 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* A search path shim for the FileSys API (C level)
|
|
*
|
|
* Copyright 2001 David G. Holm <dholm@jsd-llc.com>
|
|
* www - http://www.harbour-project.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this software; see the file COPYING. If not, write to
|
|
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
|
|
*
|
|
* As a special exception, the Harbour Project gives permission for
|
|
* additional uses of the text contained in its release of Harbour.
|
|
*
|
|
* The exception is that, if you link the Harbour libraries with other
|
|
* files to produce an executable, this does not by itself cause the
|
|
* resulting executable to be covered by the GNU General Public License.
|
|
* Your use of that executable is in no way restricted on account of
|
|
* linking the Harbour library code into it.
|
|
*
|
|
* This exception does not however invalidate any other reasons why
|
|
* the executable file might be covered by the GNU General Public License.
|
|
*
|
|
* This exception applies only to the code released by the Harbour
|
|
* Project under the name Harbour. If you copy code from other
|
|
* Harbour Project or Free Software Foundation releases into a copy of
|
|
* Harbour, as the General Public License permits, the exception does
|
|
* not apply to the code that you add in this way. To avoid misleading
|
|
* anyone as to the status of such modified files, you must delete
|
|
* this exception notice from them.
|
|
*
|
|
* If you write modifications of your own for Harbour, it is your choice
|
|
* whether to permit this exception to apply to your modifications.
|
|
* If you do not wish that, delete this exception notice.
|
|
*
|
|
*/
|
|
|
|
#include "hbapifs.h"
|
|
#include "hbset.h"
|
|
|
|
BOOL hb_spFile( BYTE * pFilename, BYTE * pRetPath )
|
|
{
|
|
BYTE *Path;
|
|
BOOL bIsFile = FALSE;
|
|
PHB_FNAME pFilepath;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_spFile(%s, %p)", (char*) pFilename, pRetPath));
|
|
|
|
if( pRetPath )
|
|
Path = pRetPath;
|
|
else
|
|
Path = ( BYTE * ) hb_xgrab( _POSIX_PATH_MAX + 1 );
|
|
|
|
pFilepath = hb_fsFNameSplit( ( char * ) pFilename );
|
|
|
|
if( pFilepath->szPath )
|
|
{
|
|
hb_fsFNameMerge( ( char * ) Path, pFilepath );
|
|
bIsFile = hb_fsFile( Path );
|
|
}
|
|
else
|
|
{
|
|
char * szDefault = hb_setGetDefault();
|
|
if( szDefault )
|
|
{
|
|
pFilepath->szPath = szDefault;
|
|
hb_fsFNameMerge( ( char * ) Path, pFilepath );
|
|
bIsFile = hb_fsFile( Path );
|
|
}
|
|
|
|
if( !bIsFile && hb_setGetPath() )
|
|
{
|
|
HB_PATHNAMES * NextPath = hb_setGetFirstSetPath();
|
|
|
|
while( bIsFile == FALSE && NextPath )
|
|
{
|
|
pFilepath->szPath = NextPath->szPath;
|
|
hb_fsFNameMerge( ( char * ) Path, pFilepath );
|
|
bIsFile = hb_fsFile( Path );
|
|
NextPath = NextPath->pNext;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* This code is intentional. To eliminate race condition,
|
|
* in pending hb_spCreate()/hb_spOpen() call when we have to know
|
|
* real path and file name we have to set its deterministic value
|
|
* here. If it's not necessary the caller may drop this value.
|
|
*/
|
|
if( ! bIsFile )
|
|
{
|
|
pFilepath->szPath = szDefault ? szDefault : ( char * ) ".";
|
|
hb_fsFNameMerge( ( char * ) Path, pFilepath );
|
|
}
|
|
}
|
|
|
|
hb_xfree( pFilepath );
|
|
|
|
if( pRetPath == NULL )
|
|
hb_xfree( Path );
|
|
|
|
return bIsFile;
|
|
}
|
|
|
|
BOOL hb_spFileExists( BYTE * pFilename, BYTE * pRetPath )
|
|
{
|
|
BYTE *Path;
|
|
BOOL bIsFile = FALSE;
|
|
PHB_FNAME pFilepath;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_spFile(%s, %p)", (char*) pFilename, pRetPath));
|
|
|
|
if( pRetPath )
|
|
Path = pRetPath;
|
|
else
|
|
Path = ( BYTE * ) hb_xgrab( _POSIX_PATH_MAX + 1 );
|
|
|
|
pFilepath = hb_fsFNameSplit( ( char * ) pFilename );
|
|
|
|
if( pFilepath->szPath )
|
|
{
|
|
hb_fsFNameMerge( ( char * ) Path, pFilepath );
|
|
bIsFile = hb_fsFileExists( ( const char * ) Path );
|
|
}
|
|
else
|
|
{
|
|
char * szDefault = hb_setGetDefault();
|
|
if( szDefault )
|
|
{
|
|
pFilepath->szPath = szDefault;
|
|
hb_fsFNameMerge( ( char * ) Path, pFilepath );
|
|
bIsFile = hb_fsFileExists( ( const char * ) Path );
|
|
}
|
|
|
|
if( !bIsFile && hb_setGetPath() )
|
|
{
|
|
HB_PATHNAMES * NextPath = hb_setGetFirstSetPath();
|
|
|
|
while( bIsFile == FALSE && NextPath )
|
|
{
|
|
pFilepath->szPath = NextPath->szPath;
|
|
hb_fsFNameMerge( ( char * ) Path, pFilepath );
|
|
bIsFile = hb_fsFileExists( ( const char * ) Path );
|
|
NextPath = NextPath->pNext;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* This code is intentional. To eliminate race condition,
|
|
* in pending hb_spCreate()/hb_spOpen() call when we have to know
|
|
* real path and file name we have to set its deterministic value
|
|
* here. If it's not necessary the caller may drop this value.
|
|
*/
|
|
if( ! bIsFile )
|
|
{
|
|
pFilepath->szPath = szDefault ? szDefault : ( char * ) ".";
|
|
hb_fsFNameMerge( ( char * ) Path, pFilepath );
|
|
}
|
|
}
|
|
|
|
hb_xfree( pFilepath );
|
|
|
|
if( pRetPath == NULL )
|
|
hb_xfree( Path );
|
|
|
|
return bIsFile;
|
|
}
|
|
|
|
HB_FHANDLE hb_spOpen( BYTE * pFilename, USHORT uiFlags )
|
|
{
|
|
BYTE path[ _POSIX_PATH_MAX + 1 ];
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_spOpen(%p, %hu)", pFilename, uiFlags));
|
|
|
|
if( hb_spFile( pFilename, path ) )
|
|
return hb_fsOpen( path, uiFlags );
|
|
else
|
|
return hb_fsOpen( pFilename, uiFlags );
|
|
}
|
|
|
|
HB_FHANDLE hb_spCreate( BYTE * pFilename, ULONG ulAttr )
|
|
{
|
|
BYTE path[ _POSIX_PATH_MAX + 1 ];
|
|
PHB_FNAME pFilepath;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_spCreate(%p, %lu)", pFilename, ulAttr));
|
|
|
|
pFilepath = hb_fsFNameSplit( ( char * ) pFilename );
|
|
if( ! pFilepath->szPath )
|
|
pFilepath->szPath = hb_setGetDefault();
|
|
|
|
hb_fsFNameMerge( ( char * ) path, pFilepath );
|
|
hb_xfree( pFilepath );
|
|
|
|
return hb_fsCreate( path, ulAttr );
|
|
}
|
|
|
|
HB_FHANDLE hb_spCreateEx( BYTE * pFilename, ULONG ulAttr, USHORT uiFlags )
|
|
{
|
|
BYTE path[ _POSIX_PATH_MAX + 1 ];
|
|
PHB_FNAME pFilepath;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_spCreateEx(%p, %lu, %hu)", pFilename, ulAttr, uiFlags));
|
|
|
|
pFilepath = hb_fsFNameSplit( ( char * ) pFilename );
|
|
if( ! pFilepath->szPath )
|
|
pFilepath->szPath = hb_setGetDefault();
|
|
|
|
hb_fsFNameMerge( ( char * ) path, pFilepath );
|
|
hb_xfree( pFilepath );
|
|
|
|
return hb_fsCreateEx( path, ulAttr, uiFlags );
|
|
}
|