X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ffs%2Fpath.cpp;h=f12e27492709423f0875ecb046b0f6b2724dfd03;hp=90c4d70e2a91b55789eb5e2b5a8dc4ecb5bf1598;hb=601e088dc38005e4346766a09129a80e81c637f3;hpb=8552e6a4e4fbc454e08c582d1dbcd55ab58a3c37 diff --git a/source/fs/path.cpp b/source/fs/path.cpp index 90c4d70..f12e274 100644 --- a/source/fs/path.cpp +++ b/source/fs/path.cpp @@ -7,8 +7,10 @@ using namespace std; namespace { +#ifdef WIN32 inline bool is_windows_drive(const std::string &p) { return (p.size()==2 && ((p[0]>='A' && p[0]<='Z') || (p[0]>='a' && p[0]<='z')) && p[1]==':'); } +#endif } @@ -63,9 +65,7 @@ bool Path::is_absolute() const if(is_windows_drive((*this)[0])) return true; #endif - if(path[0]==DIRSEP) - return true; - return false; + return path[0]==DIRSEP; } Path Path::subpath(unsigned start, unsigned count) const @@ -183,12 +183,30 @@ string Path::operator[](int n) const throw invalid_argument("Path::operator[]"); } -bool Path::operator==(const Path &p) const +bool Path::operator==(const Path &other) const +{ +#ifdef WIN32 + return strcasecmp(path, other.path)==0; +#else + return path==other.path; +#endif +} + +bool Path::operator<(const Path &other) const +{ +#ifdef WIN32 + return strcasecmp(path, other.path)<0; +#else + return path(const Path &other) const { #ifdef WIN32 - return !strcasecmp(path, p.path); + return strcasecmp(path, other.path)>0; #else - return path==p.path; + return path>other.path; #endif } @@ -210,7 +228,7 @@ Path::Iterator::Iterator(const Path &p): start(0) { if(path.path.empty()) - start=end = string::npos; + start = end = string::npos; else if(path.path[0]==DIRSEP) end = 1; #ifdef WIN32