namespace {
-#ifdef WIN32
+#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
{
string::size_type slash = p.find_first_of("/\\", start);
if(slash>start || start==0)
- add_component(p.substr(start, max(slash-start, 1U)));
+ add_component(p.substr(start, max<string::size_type>(slash-start, 1U)));
if(slash==string::npos)
break;
start = slash+1;
bool Path::is_absolute() const
{
-#ifdef WIN32
- if(is_windows_drive((*this)[0]))
+#ifdef _WIN32
+ if(!empty() && is_windows_drive((*this)[0]))
return true;
#endif
return path[0]==DIRSEP;
if(comp.size()==1 && (comp[0]=='/' || comp[0]=='\\'))
{
// Replace the path with the root directory
-#ifdef WIN32
+#ifdef _WIN32
string::size_type slash = (separators.empty() ? string::npos : separators.front());
if(is_windows_drive(path.substr(0, slash)))
{
separators.push_back(0);
}
}
-#ifdef WIN32
+#ifdef _WIN32
else if(is_windows_drive(comp))
{
path = comp;
// .. in root directory is a no-op
else if(path.size()==1 && path[0]==DIRSEP)
;
-#ifdef WIN32
+#ifdef _WIN32
else if(is_windows_drive(path))
;
#endif
bool Path::operator==(const Path &other) const
{
-#ifdef WIN32
+#ifdef _WIN32
return strcasecmp(path, other.path)==0;
#else
return path==other.path;
bool Path::operator<(const Path &other) const
{
-#ifdef WIN32
+#ifdef _WIN32
return strcasecmp(path, other.path)<0;
#else
return path<other.path;
bool Path::operator>(const Path &other) const
{
-#ifdef WIN32
+#ifdef _WIN32
return strcasecmp(path, other.path)>0;
#else
return path>other.path;
path(&p),
iter(e ? path->separators.end() : path->separators.begin()),
end(e || path->path.empty())
-{ }
+{
+ update();
+}
Path::Iterator &Path::Iterator::operator++()
{
if(path->path.size()==1 && path->separators.size()==1)
end = true;
}
+ update();
return *this;
}
}
else if(iter!=path->separators.begin())
--iter;
+ update();
return *this;
}
-string Path::Iterator::operator*() const
+void Path::Iterator::update()
{
if(end)
- throw logic_error("Path::Iterator::operator*");
+ {
+ current.clear();
+ return;
+ }
string::size_type start = 0;
if(iter!=path->separators.begin())
slash = *iter;
if(slash==0)
- return path->path.substr(start, 1);
- return path->path.substr(start, slash-start);
+ current = path->path.substr(start, 1);
+ else
+ current = path->path.substr(start, slash-start);
}
} // namespace FS