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

Improved the handling of different combinations of slashes and dirNames.

Browse Source
This commit is contained in:
Robert Osfield 2011-04-29 16:50:45 +00:00
parent b4353c1a8e
commit b78ad29429
1 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/osgPlugins/osga/OSGA_Archive.cpp
View File

@ -527,6 +527,16 @@ bool OSGA_Archive::getFileNames(FileNameList& fileNameList) const
osgDB::DirectoryContents OSGA_Archive::getDirectoryContents(const std::string& dirName) const
{
osgDB::DirectoryContents files;
if (dirName.empty() || dirName==".")
{
getFileNames(files);
return files;
}
bool dirNameHasTrailingSlash = false;
char d = dirName[dirName.size()-1];
if (d=='\\' || d=='/') dirNameHasTrailingSlash = true;
for(FileNamePositionMap::const_iterator itr=_indexMap.begin();
itr!=_indexMap.end();
++itr)
@ -548,21 +558,30 @@ osgDB::DirectoryContents OSGA_Archive::getDirectoryContents(const std::string& d
if (i==dirName.size())
{
// directory name matched, but need to make sure a trailing filename exists
// and to skip over any immediate slashes
char f = filename[i];
// check for slash
if (f=='\\' || f=='/')
bool directoryMatched = false;
if (!dirNameHasTrailingSlash)
{
// found slash, now need to skip over it.
++i;
if (i<filename.size())
// no trailing slash on dirName so we won't have matched
// the required slash on filename to make sure the next character is slash.
char f = filename[i];
// check for slash
if (f=='\\' || f=='/')
{
// still have charaters left after slash which respresent the filename
files.push_back(filename.substr(i));
// found slash, now need to skip over it.
++i;
directoryMatched = true;
}
}
else
{
directoryMatched = true;
}
if (directoryMatched)
{
files.push_back(filename.substr(i));
}
}
}
}