X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ffs%2Fpath.cpp;h=b8b7c223043786cf6bef748262f1e2d7cf495756;hp=784c6eb508cbd953629e0b3819ea82667e083566;hb=5eb788bd9a41895585d4bb366a683437ddf63ad5;hpb=19edaf3b45bc4c23459fc8ddd552dcfa33eecc71

diff --git a/source/fs/path.cpp b/source/fs/path.cpp
index 784c6eb..b8b7c22 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
 
 }
 
@@ -28,6 +30,22 @@ Path::Path(const char *p)
 	init(p);
 }
 
+void Path::init(const string &p)
+{
+	string::size_type start = 0;
+	if(p[0]=='/' || p[0]=='\\')
+		add_component(string(1, DIRSEP));
+	while(1)
+	{
+		string::size_type slash = p.find_first_of("/\\", start);
+		if(slash>start)
+			add_component(p.substr(start, slash-start));
+		if(slash==string::npos)
+			break;
+		start = slash+1;
+	}
+}
+
 unsigned Path::size() const
 {
 	if(path.empty())
@@ -47,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
@@ -85,64 +101,6 @@ Path &Path::operator/=(const Path &p)
 	return *this;
 }
 
-string Path::operator[](int n) const
-{
-	if(n>=0)
-	{
-		for(Iterator i=begin(); i!=end(); ++i, --n)
-			if(!n)
-				return *i;
-	}
-	else
-	{
-		for(Iterator i=end(); i!=begin();)
-		{
-			--i;
-			if(!++n)
-				return *i;
-		}
-	}
-
-	throw invalid_argument("Path::operator[]");
-}
-
-bool Path::operator==(const Path &p) const
-{
-#ifdef WIN32
-	return !strcasecmp(path, p.path);
-#else
-	return path==p.path;
-#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)
-{
-	string::size_type start = 0;
-	if(p[0]=='/' || p[0]=='\\')
-		add_component(string(1, DIRSEP));
-	while(1)
-	{
-		string::size_type slash = p.find_first_of("/\\", start);
-		if(slash>start)
-			add_component(p.substr(start, slash-start));
-		if(slash==string::npos)
-			break;
-		start = slash+1;
-	}
-}
-
 void Path::add_component(const string &comp)
 {
 	if(comp.empty())
@@ -204,31 +162,91 @@ void Path::add_component(const string &comp)
 	}
 }
 
+string Path::operator[](int n) const
+{
+	if(n>=0)
+	{
+		for(Iterator i=begin(); i!=end(); ++i, --n)
+			if(!n)
+				return *i;
+	}
+	else
+	{
+		for(Iterator i=end(); i!=begin();)
+		{
+			--i;
+			if(!++n)
+				return *i;
+		}
+	}
+
+	throw invalid_argument("Path::operator[]");
+}
+
+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<other.path;
+#endif
+}
+
+bool Path::operator>(const Path &other) const
+{
+#ifdef WIN32
+	return strcasecmp(path, other.path)>0;
+#else
+	return path>other.path;
+#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;
+}
+
 
 Path::Iterator::Iterator(const Path &p):
-	path(p),
+	path(&p),
 	start(0)
 {
-	if(path.path.empty())
-		start=end = string::npos;
-	else if(path.path[0]==DIRSEP)
+	if(path->path.empty())
+		start = end = string::npos;
+	else if(path->path[0]==DIRSEP)
 		end = 1;
 #ifdef WIN32
-	else if(path.path.size()>2 && path.path[2]==DIRSEP && 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(DIRSEP);
+		end = path->path.find(DIRSEP);
 }
 
 Path::Iterator &Path::Iterator::operator++()
 {
 	start = end;
-	if(start>=path.path.size())
+	if(start>=path->path.size())
 		return *this;
-	if(path.path[start]==DIRSEP)
+	if(path->path[start]==DIRSEP)
 		++start;
-	end = path.path.find(DIRSEP, start);
+	end = path->path.find(DIRSEP, start);
 	return *this;
 }
 
@@ -238,10 +256,10 @@ Path::Iterator &Path::Iterator::operator--()
 		return *this;
 
 	end = start;
-	if(end>1 && end<path.path.size() && path.path[end]!=DIRSEP)
+	if(end>1 && end<path->path.size() && path->path[end]!=DIRSEP)
 		--end;
 
-	start = path.path.rfind(DIRSEP, end-1);
+	start = path->path.rfind(DIRSEP, end-1);
 	if(start==string::npos)
 		start = 0;
 	else if(start<end-1)
@@ -252,11 +270,11 @@ Path::Iterator &Path::Iterator::operator--()
 
 string Path::Iterator::operator*() const
 {
-	if(start>=path.path.size())
+	if(start>=path->path.size())
 		return string();
 	if(start==end)
 		return string();
-	return path.path.substr(start, end-start);
+	return path->path.substr(start, end-start);
 }
 
 } // namespace FS