X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ffs%2Fpath.cpp;h=0e86600453be225bcb647ff699f3cb0b5f20649b;hp=0fe95d65df943a9f0b4b1b4bf006035a4e7dccee;hb=HEAD;hpb=eca23d70c9e2c0519125f2fd92c212d3c94f7736

diff --git a/source/fs/path.cpp b/source/fs/path.cpp
index 0fe95d6..1181b92 100644
--- a/source/fs/path.cpp
+++ b/source/fs/path.cpp
@@ -7,8 +7,8 @@ using namespace std;
 
 namespace {
 
-#ifdef WIN32
-inline bool is_windows_drive(const std::string &p)
+#ifdef _WIN32
+inline bool is_windows_drive(const string &p)
 { return (p.size()==2 && ((p[0]>='A' && p[0]<='Z') || (p[0]>='a' && p[0]<='z')) && p[1]==':'); }
 #endif
 
@@ -17,20 +17,7 @@ inline bool is_windows_drive(const std::string &p)
 namespace Msp {
 namespace FS {
 
-Path::Path()
-{ }
-
 Path::Path(const string &p)
-{
-	init(p);
-}
-
-Path::Path(const char *p)
-{
-	init(p);
-}
-
-void Path::init(const string &p)
 {
 	if(p.empty())
 		return;
@@ -58,8 +45,8 @@ unsigned Path::size() const
 
 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;
@@ -68,7 +55,7 @@ bool Path::is_absolute() const
 Path Path::subpath(unsigned start, unsigned count) const
 {
 	Path result;
-	Iterator i = begin();
+	auto i = begin();
 	for(unsigned j=0; (j<start && i!=end()); ++j)
 		++i;
 	for(unsigned j=0; (j<count && i!=end()); ++j)
@@ -92,8 +79,8 @@ Path &Path::operator/=(const Path &p)
 		*this = p;
 	else
 	{
-		for(Iterator i=p.begin(); i!=p.end(); ++i)
-			add_component(*i);
+		for(const string &c: p)
+			add_component(c);
 	}
 	return *this;
 }
@@ -103,7 +90,7 @@ void Path::add_component(const string &comp)
 	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)))
 		{
@@ -118,7 +105,7 @@ void Path::add_component(const string &comp)
 			separators.push_back(0);
 		}
 	}
-#ifdef WIN32
+#ifdef _WIN32
 	else if(is_windows_drive(comp))
 	{
 		path = comp;
@@ -132,7 +119,7 @@ void Path::add_component(const string &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
@@ -146,11 +133,21 @@ void Path::add_component(const string &comp)
 				path += DIRSEP;
 				path += comp;
 			}
-			else if(separators.empty())
+			else if(start==0)
+			{
+				/* Removing the last component of a relative path results in the
+				current directory */
 				path = ".";
+			}
+			else if(start==1)
+			{
+				/* Removing the last component of an absolute path results in the
+				root directory */
+				path.erase(start, string::npos);
+			}
 			else
 			{
-				// Otherwise, erase the last component
+				// Otherwise, erase the last component and its separator
 				path.erase(separators.back(), string::npos);
 				separators.pop_back();
 			}
@@ -173,13 +170,13 @@ string Path::operator[](int n) const
 {
 	if(n>=0)
 	{
-		for(Iterator i=begin(); i!=end(); ++i, --n)
+		for(auto i=begin(); i!=end(); ++i, --n)
 			if(!n)
 				return *i;
 	}
 	else
 	{
-		for(Iterator i=end(); i!=begin();)
+		for(auto i=end(); i!=begin();)
 		{
 			--i;
 			if(!++n)
@@ -192,7 +189,7 @@ string Path::operator[](int n) const
 
 bool Path::operator==(const Path &other) const
 {
-#ifdef WIN32
+#ifdef _WIN32
 	return strcasecmp(path, other.path)==0;
 #else
 	return path==other.path;
@@ -201,7 +198,7 @@ bool Path::operator==(const Path &other) const
 
 bool Path::operator<(const Path &other) const
 {
-#ifdef WIN32
+#ifdef _WIN32
 	return strcasecmp(path, other.path)<0;
 #else
 	return path<other.path;
@@ -210,7 +207,7 @@ bool Path::operator<(const Path &other) const
 
 bool Path::operator>(const Path &other) const
 {
-#ifdef WIN32
+#ifdef _WIN32
 	return strcasecmp(path, other.path)>0;
 #else
 	return path>other.path;
@@ -264,10 +261,7 @@ void Path::Iterator::update()
 
 	string::size_type start = 0;
 	if(iter!=path->separators.begin())
-	{
-		PositionArray::const_iterator prev = iter;
-		start = *--prev+1;
-	}
+		start = *prev(iter)+1;
 
 	string::size_type slash = string::npos;
 	if(iter!=path->separators.end())