FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed the findFileFile routine which had been broken by a fix of a dlopen

Browse Source 
problem - './' was added to all files which which directly found without
requiring a search path rather than just locally found files, this broke
file loads which had wern't local but had a valid path.  I have moved the
'./' work around to inside fileDSO and made it only apply to Linux as I
presume this is all it was needed for. Don?
This commit is contained in:
Robert Osfield 2001-11-09 15:01:42 +00:00
parent 52bc6c2f13
commit e35f5ec286
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/osgDB/FileUtils.cpp
View File

@ -54,15 +54,19 @@ static char *s_filePath = ":";
#elif __sgi
char *PathDelimitor = ":";
static const char *s_default_file_path = ".:";
static const char *s_default_dso_path = "/usr/lib32/osgPlugins/";
static const char *s_default_dso_path = "/usr/lib32/osgPlugins/:";
static char *s_filePath = ".:";
#else
char *PathDelimitor = ":";
static const char *s_default_file_path = ".:";
static const char *s_default_dso_path = "/usr/lib/osgPlugins/";
static const char *s_default_dso_path = "/usr/lib/osgPlugins/:";
static char *s_filePath = ".:";
#endif
#if defined (WIN32)
#define F_OK 4
#endif
static bool s_filePathInitialized = false;
void osgDB::initFilePath( void )
@ -108,27 +112,22 @@ const char* osgDB::getFilePath()
return s_filePath;
}
char *osgDB::findFileInPath( const char *_file, const char * filePath )
{
#ifdef macintosh
return (char *)_file;
#else
#if defined (WIN32)
#define F_OK 4
#endif
char pathbuff[1024];
char *tptr, *tmppath;
char *path = 0L;
notify(DEBUG_INFO) << "FindFileInPath() : trying ./" << _file << " ...\n";
notify(DEBUG_INFO) << "FindFileInPath() : trying " << _file << " ...\n";
if( access( _file, F_OK ) == 0 )
{
sprintf( pathbuff,"./%s", _file );
return (char *)strdup(pathbuff);
return strdup(_file);
}
tptr = strdup( filePath );
@ -148,9 +147,6 @@ char *osgDB::findFileInPath( const char *_file, const char * filePath )
if (path) notify( DEBUG_INFO ) << "FindFileInPath() : returning " << path << endl;
else notify( DEBUG_INFO ) << "FindFileInPath() : returning NULL" << endl;
#ifdef WIN32
#undef F_OK
#endif
return path;
#endif
@ -198,6 +194,23 @@ Under Windows
char *osgDB::findDSO( const char *name )
{
#ifndef macintosh
#ifdef __linux
if( access( name, F_OK ) == 0 )
{
if (name[0]!='/')
{
char pathbuff[1024];
sprintf( pathbuff,"./%s", name );
return (char *)strdup(pathbuff);
}
else
{
return (char *)strdup(_name);
}
}
#endif
char path[1024];
char *ptr;