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

Changed hardwired char[1024] arrays to char[FILEUTILS_MAX_PATH_LENGTH] and

Browse Source 
defined the value to be 2048, this should avoid problems with path lengths
which have been overflowing the 1024 limit (Sasa report this bug). The
real solution is to use std::string throught FileUtils, but this will have
to wait for another day.
This commit is contained in:
Robert Osfield 2002-01-16 12:03:29 +00:00
parent ad6a1665cc
commit d69c38f0ed
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/osgDB/FileUtils.cpp
View File

@ -41,6 +41,8 @@ inline static char* strdup(const char *src)
#endif #endif
#endif #endif
#define FILEUTILS_MAX_PATH_LENGTH 2048
#if defined(WIN32) &&!defined(__CYGWIN__) #if defined(WIN32) &&!defined(__CYGWIN__)
char *PathDelimitor = ";"; char *PathDelimitor = ";";
static const char *s_default_file_path = ".;"; static const char *s_default_file_path = ".;";
@ -91,7 +93,7 @@ void osgDB::initFilePath( void )
void osgDB::setFilePath( const char *_path ) void osgDB::setFilePath( const char *_path )
{ {
char buff[1024]; char buff[FILEUTILS_MAX_PATH_LENGTH];
notify(DEBUG_INFO) << "In osgDB::setFilePath("<<_path<<")"<<std::endl; notify(DEBUG_INFO) << "In osgDB::setFilePath("<<_path<<")"<<std::endl;
@ -124,7 +126,7 @@ char *osgDB::findFileInPath( const char *_file, const char * filePath )
char pathbuff[1024]; char pathbuff[FILEUTILS_MAX_PATH_LENGTH];
char *tptr, *tmppath; char *tptr, *tmppath;
char *path = 0L; char *path = 0L;
@ -204,7 +206,7 @@ char *osgDB::findDSO( const char *name )
{ {
if (name[0]!='/') if (name[0]!='/')
{ {
char pathbuff[1024]; char pathbuff[FILEUTILS_MAX_PATH_LENGTH];
sprintf( pathbuff,"./%s", name ); sprintf( pathbuff,"./%s", name );
return (char *)strdup(pathbuff); return (char *)strdup(pathbuff);
} }
@ -215,7 +217,7 @@ char *osgDB::findDSO( const char *name )
} }
#endif #endif
char path[1024]; char path[FILEUTILS_MAX_PATH_LENGTH];
char *ptr; char *ptr;
strcpy( path, "./" ); strcpy( path, "./" );