From 0fbccf778ce3fe9831b3a0208ce9858cf1c6e61a Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 29 Aug 2003 22:05:06 +0000 Subject: [PATCH] From Alberto Farre, added support for both / and \ slashes in path utility functions. --- src/osgDB/FileNameUtils.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/osgDB/FileNameUtils.cpp b/src/osgDB/FileNameUtils.cpp index 7e35c454d..b9019ea32 100644 --- a/src/osgDB/FileNameUtils.cpp +++ b/src/osgDB/FileNameUtils.cpp @@ -24,29 +24,29 @@ using namespace std; std::string osgDB::getFilePath(const std::string& fileName) { - // try unix directory slash first. - std::string::size_type slash = fileName.find_last_of('/'); - if (slash==std::string::npos) + std::string::size_type slash1 = fileName.find_last_of('/'); + std::string::size_type slash2 = fileName.find_last_of('\\'); + if (slash1==std::string::npos) { - // then try windows directory slash. - slash = fileName.find_last_of('\\'); - if (slash==std::string::npos) return std::string(); + if (slash2==std::string::npos) return std::string(); + return std::string(fileName,0,slash2); } - return std::string(fileName,0,slash); + if (slash2==std::string::npos) return std::string(fileName,0,slash1); + return std::string(fileName, 0, slash1>slash2 ? slash1 : slash2); } std::string osgDB::getSimpleFileName(const std::string& fileName) { - // try unix directory slash first. - std::string::size_type slash = fileName.find_last_of('/'); - if (slash==std::string::npos) + std::string::size_type slash1 = fileName.find_last_of('/'); + std::string::size_type slash2 = fileName.find_last_of('\\'); + if (slash1==std::string::npos) { - // then try windows directory slash. - slash = fileName.find_last_of('\\'); - if (slash==std::string::npos) return fileName; + if (slash2==std::string::npos) return fileName; + return std::string(fileName.begin()+slash2+1,fileName.end()); } - return std::string(fileName.begin()+slash+1,fileName.end()); + if (slash2==std::string::npos) return std::string(fileName.begin()+slash1+1,fileName.end()); + return std::string(fileName.begin()+(slash1>slash2?slash1:slash2)+1,fileName.end()); }