string basename(const Path &p)
{
- return p[-1];
+ return p.empty() ? string() : p[-1];
}
Path dirname(const Path &p)
{
+ if(p.empty())
+ return p;
if(p.size()==1)
{
if(p.is_absolute())
{
bool found = true;
Path result;
- for(Path::Iterator i=path.begin(); i!=path.end(); ++i)
+ for(const string &c: path)
{
- if(!found || *i=="/")
- result /= *i;
+ if(!found || (result.empty() && (c=="/" || c==".")))
+ result /= c;
else
{
- list<string> files;
+ vector<string> files;
if(result.size())
files = list_files(result);
else
files = list_files(".");
found = false;
- for(list<string>::iterator j=files.begin(); (j!=files.end() && !found); ++j)
- if(!strcasecmp(*j,*i))
+ for(const string &f: files)
+ if(!strcasecmp(f, c))
{
- result /= *j;
+ result /= f;
found = true;
}
if(!found)
- result /= *i;
+ result /= c;
}
}
if(path.is_absolute()!=base.is_absolute())
throw invalid_argument("FS::relative");
- Path::Iterator i = path.begin();
- Path::Iterator j = base.begin();
+ auto i = path.begin();
+ auto j = base.begin();
for(; (i!=path.end() && j!=base.end() && *i==*j); ++i, ++j) ;
Path result;
Path common_ancestor(const Path &path1, const Path &path2)
{
- Path::Iterator i = path1.begin();
- Path::Iterator j = path2.begin();
+ auto i = path1.begin();
+ auto j = path2.begin();
Path result;
for(; (i!=path1.end() && j!=path2.end() && *i==*j); ++i, ++j)
result /= *i;
if(path.is_absolute()!=parent.is_absolute())
throw invalid_argument("FS::descendant_depth");
- Path::Iterator i = path.begin();
- Path::Iterator j = parent.begin();
+ auto i = path.begin();
+ auto j = parent.begin();
for(; (i!=path.end() && j!=parent.end() && *i==*j); ++i, ++j) ;
if(j!=parent.end())