X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fpath.cpp;h=d8a2c71e830f08052d9b45573546ba241a4c4df9;hp=35641f852096c59d30f67b8c9b4f78b59cf0ef27;hb=d3c9b9abb9e3c69aeecbca1044b43e7ec83f3b8c;hpb=f91f1df3e0b00b3a270e571d4b2c8251da4d1226 diff --git a/source/path.cpp b/source/path.cpp index 35641f8..d8a2c71 100644 --- a/source/path.cpp +++ b/source/path.cpp @@ -5,28 +5,46 @@ Copyright © 2006-2008 Mikko Rasa, Mikkosoft Productions Distributed under the LGPL */ +#include #include #include "path.h" #include "utils.h" using namespace std; +namespace { + +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]==':'); } + +} + namespace Msp { namespace FS { -/** -Returns the number of components in the path. -*/ +Path::Path() +{ } + +Path::Path(const string &p) +{ + init(p); +} + +Path::Path(const char *p) +{ + init(p); +} + unsigned Path::size() const { if(path.empty()) return 0; - if(path.size()==1 && path[0]==DIRCHAR) + if(path.size()==1 && path[0]==DIRSEP) return 1; unsigned count=1; for(string::const_iterator i=path.begin(); i!=path.end(); ++i) - if(*i==DIRCHAR) ++count; + if(*i==DIRSEP) ++count; return count; } @@ -36,14 +54,11 @@ bool Path::is_absolute() const if(is_windows_drive((*this)[0])) return true; #endif - if(path[0]==DIRCHAR) + if(path[0]==DIRSEP) return true; return false; } -/** -Extracts the given component range from the path. -*/ Path Path::subpath(unsigned start, unsigned count) const { Path result; @@ -58,6 +73,13 @@ Path Path::subpath(unsigned start, unsigned count) const return result; } +Path Path::operator/(const Path &p) const +{ + Path a=*this; + a/=p; + return a; +} + /** Attaches another path to the end of this one. An absolute path replaces the existing data. ".." elements annihilate the last component and "." elements @@ -75,27 +97,25 @@ Path &Path::operator/=(const Path &p) return *this; } -/** -Returns the path component at the specified index. Negative indices count from -the end of the path. -*/ string Path::operator[](int n) const { if(n>=0) { for(Iterator i=begin(); i!=end(); ++i, --n) - if(!n) return *i; + if(!n) + return *i; } else { - for(Iterator i=--end();; --i) + for(Iterator i=end(); i!=begin();) { - if(!++n) return *i; - if(i==begin()) break; + --i; + if(!++n) + return *i; } } - return ""; + throw InvalidParameterValue("Path component index out of range"); } bool Path::operator==(const Path &p) const @@ -107,14 +127,26 @@ bool Path::operator==(const Path &p) const #endif } +Path::Iterator Path::begin() const +{ + return Iterator(*this); +} + +Path::Iterator Path::end() const +{ + Iterator i(*this); + i.start=i.end=std::string::npos; + return i; +} + void Path::init(const string &p) { - unsigned start=0; + string::size_type start=0; if(p[0]=='/' || p[0]=='\\') - add_component(string(1, DIRCHAR)); + add_component(string(1, DIRSEP)); while(1) { - unsigned slash=p.find_first_of("/\\", start); + string::size_type slash=p.find_first_of("/\\", start); if(slash>start) add_component(p.substr(start, slash-start)); if(slash==string::npos) @@ -124,17 +156,18 @@ void Path::init(const string &p) } /** -Adds a single component to the path, emulating the cd command. +Adds a single component to the path, emulating the cd command. Fails horribly +if comp contains a separator character. */ void Path::add_component(const string &comp) { if(comp.empty()) ; - else if(comp.size()==1 && comp[0]==DIRCHAR) + else if(comp.size()==1 && comp[0]==DIRSEP) { // Replace the path with the root directory #ifdef WIN32 - unsigned slash=path.find(DIRCHAR); + unsigned slash=path.find(DIRSEP); if(is_windows_drive(path.substr(0, slash))) path=path.substr(0, 2); else @@ -147,10 +180,10 @@ void Path::add_component(const string &comp) #endif else if(comp=="..") { - if(path.empty()) + if(path.empty() || path==".") path=comp; // .. in root directory is a no-op - else if(path.size()==1 && path[0]==DIRCHAR) + else if(path.size()==1 && path[0]==DIRSEP) ; #ifdef WIN32 else if(is_windows_drive(path)) @@ -158,71 +191,87 @@ void Path::add_component(const string &comp) #endif else { - unsigned slash=path.rfind(DIRCHAR); - unsigned start=(slash==string::npos)?0:slash+1; + string::size_type slash=path.rfind(DIRSEP); + string::size_type start=(slash==string::npos ? 0 : slash+1); if(!path.compare(start, string::npos, "..")) { // If the last component already is a .., add another - path+=DIRCHAR; + path+=DIRSEP; path+=comp; } + else if(slash==string::npos) + path="."; else + { + if(slash==0) + slash=1; // Otherwise, erase the last component path.erase(slash, string::npos); + } } } else if(comp!="." || path.empty()) { - if(path==".") - path=""; - if(path.size()>1 || (path.size()==1 && path[0]!=DIRCHAR)) - path+=DIRCHAR; + if(comp!="." && path.empty()) + path="."; + if(path.size()>1 || (path.size()==1 && path[0]!=DIRSEP)) + path+=DIRSEP; path+=comp; } } + Path::Iterator::Iterator(const Path &p): path(p), start(0) { if(path.path.empty()) start=end=string::npos; - else if(path.path[0]==DIRCHAR) + else if(path.path[0]==DIRSEP) end=1; #ifdef WIN32 - else if(path.path.size()>2 && path.path[2]==DIRCHAR && is_windows_drive(path.path.substr(0, 2))) + else if(path.path.size()>2 && path.path[2]==DIRSEP && is_windows_drive(path.path.substr(0, 2))) end=2; #endif else - end=path.path.find(DIRCHAR); + end=path.path.find(DIRSEP); } Path::Iterator &Path::Iterator::operator++() { start=end; - if(start>=path.path.size()) return *this; - if(path.path[start]==DIRCHAR) ++start; - end=path.path.find(DIRCHAR, start); + if(start>=path.path.size()) + return *this; + if(path.path[start]==DIRSEP) + ++start; + end=path.path.find(DIRSEP, start); return *this; } Path::Iterator &Path::Iterator::operator--() { + if(start==0) + return *this; + end=start; - if(end==0) return *this; - if(end>1 && end1 && end=path.path.size()) return ""; - if(start==end) return ""; + if(start>=path.path.size()) + return string(); + if(start==end) + return string(); return path.path.substr(start, end-start); }