* config/win/poccce.cf
* config/win/pocc.cf
* Warning level taken down to -w2.
* contrib/hbsqlit3/Makefile
- Disabled for pocc, as it chokes on the new version of
sqlite3.h.
* INSTALL
* Minor update.
* include/hbapifs.h
* include/hbdbsort.h
* include/hbsetup.h
* contrib/hbct/files.c
* contrib/hbct/disk.c
* contrib/hbmzip/hbmzip.c
* contrib/rddads/ads1.c
* contrib/hbbmcdx/bmdbfcdx.c
* contrib/examples/pp/pp.c
* contrib/examples/pp/hbppcore.c
* source/pp/ppcore.c
* source/pp/hbpp.c
* source/vm/runner.c
* source/vm/estack.c
* source/vm/hvm.c
* source/vm/cmdarg.c
* source/vm/fm.c
* source/vm/proc.c
* source/vm/extrap.c
* source/vm/memvars.c
* source/vm/set.c
* source/main/harbour.c
* source/common/hbfsapi.c
* source/common/hbwince.c
* source/rtl/spfiles.c
* source/rtl/defpath.c
* source/rtl/philes.c
* source/rtl/fnsplit.c
* source/rtl/fstemp.c
* source/rtl/gtchrmap.c
* source/rtl/errorint.c
* source/rtl/filebuf.c
* source/rtl/hbffind.c
* source/rtl/filesys.c
* source/rtl/file.c
* source/rdd/dbfntx/dbfntx1.c
* source/rdd/sdf1.c
* source/rdd/dbfnsx/dbfnsx1.c
* source/rdd/dbfcdx/dbfcdx1.c
* source/rdd/delim1.c
* source/rdd/dbf1.c
* source/rdd/hsx/hsx.c
* source/rdd/dbffpt/dbffpt1.c
* source/rdd/hbsix/sxsem.c
* source/rdd/hbsix/sxfname.c
* source/compiler/hbmain.c
* source/compiler/genc.c
* source/compiler/harbour.yyc
* source/compiler/harbour.y
* source/compiler/compi18n.c
* source/compiler/genhrb.c
* source/compiler/gencobj.c
* source/compiler/genobj32.c
* _POSIX_PATH_MAX + 1 -> HB_PATH_MAX
* _POSIX_PATH_MAX -> HB_PATH_MAX - 1
Please update your .c code to use new constant.
Harbour initialization of the value is now HB_LEGACY_LEVEL2
and will be removed in next version.
; Please review me.
229 lines
6.7 KiB
C
229 lines
6.7 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( HB_PATH_MAX );
|
|
|
|
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( HB_PATH_MAX );
|
|
|
|
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[ HB_PATH_MAX ];
|
|
|
|
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[ HB_PATH_MAX ];
|
|
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[ HB_PATH_MAX ];
|
|
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 );
|
|
}
|