X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fpath.cpp;h=4f3a0b1547c3ea94018feac0c4bbd3bbbbfe77eb;hp=1ff318101aea18a74b7d397b015fc5dfb58736b4;hb=174debf33b2001b3244c007825d0a5539566bd8c;hpb=9a8993b390544fb3e6b23ed562e2a2d4a62e4a7c

diff --git a/source/path.cpp b/source/path.cpp
index 1ff3181..4f3a0b1 100644
--- a/source/path.cpp
+++ b/source/path.cpp
@@ -1,17 +1,17 @@
-#include <msp/strutils.h>
+/*
+This file is part of libmsppath
+Copyright © 2006  Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+#include <msp/strings/utils.h>
 #include "path.h"
+#include "utils.h"
 
 using namespace std;
-#include <iostream>
 
 namespace Msp {
 namespace Path {
 
-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]==':');
-}
-
 /**
 Returns the number of components in the path.
 */
@@ -34,6 +34,9 @@ bool Path::is_absolute() const
 	return false;
 }
 
+/**
+Extracts the given component range from the path.
+*/
 Path Path::subpath(unsigned start, unsigned count) const
 {
 	Path result;
@@ -60,26 +63,7 @@ Path &Path::operator/=(const Path &p)
 	else
 	{
 		for(iterator i=p.begin(); i!=p.end(); ++i)
-		{
-			if(*i=="..")
-			{
-				unsigned slash=path.rfind(DIRCHAR);
-#ifdef WIN32
-				if(is_windows_drive(path.substr(0,slash))) ++slash;
-#endif
-				if(slash==0) ++slash;
-				if(slash==string::npos)
-					path="";
-				else
-					path.erase(slash);
-			}
-			else if(*i!=".")
-			{
-				if(path.size()>1 || (path.size()==1 && path[0]!=DIRCHAR))
-					path+=DIRCHAR;
-				path+=*i;
-			}
-		}
+			add_component(*i);
 	}
 	return *this;
 }
@@ -116,20 +100,17 @@ bool Path::operator==(const Path &p) const
 #endif
 }
 
-void Path::init(const std::string &p)
+void Path::init(const string &p)
 {
 	unsigned start=0;
-	bool absolute=false;
-	if(p[0]==DIRCHAR)
-		absolute=true;
+	if(p[0]=='/' || p[0]=='\\')
+		add_component(string(1, DIRCHAR));
 	while(1)
 	{
 		unsigned slash=p.find_first_of("/\\",start);
 		if(slash>start)
 		{
-			if(path.size() || absolute)
-				path+=DIRCHAR;
-			path+=p.substr(start,slash-start);
+			add_component(p.substr(start, slash-start));
 		}
 		if(slash==string::npos)
 			break;
@@ -137,14 +118,74 @@ void Path::init(const std::string &p)
 	}
 }
 
+/**
+Adds a single component to the path, emulating the cd command.
+*/
+void Path::add_component(const string &comp)
+{
+	if(comp.empty())
+		;
+	else if(comp.size()==1 && comp[0]==DIRCHAR)
+	{
+		// Replace the path with the root directory
+#ifdef WIN32
+		unsigned slash=path.find(DIRCHAR);
+		if(is_windows_drive(path.substr(0, slash)))
+			path=path.substr(0,2);
+		else
+#endif
+		path=comp;
+	}
+#ifdef WIN32
+	else if(is_windows_drive(comp))
+		path=comp;
+#endif
+	else if(comp=="..")
+	{
+		if(path.empty())
+			path=comp;
+		// .. in root directory is a no-op
+		else if(path.size()==1 && path[0]==DIRCHAR)
+			;
+#ifdef WIN32
+		else if(is_windows_drive(path))
+			;
+#endif
+		else
+		{
+			unsigned slash=path.rfind(DIRCHAR);
+			unsigned 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+=comp;
+			}
+			else
+				// 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;
+		path+=comp;
+	}
+}
+
 Path::iterator::iterator(const Path &p):
 	path(p),
 	start(0)
 {
-	if(path.path[0]==DIRCHAR)
+	if(path.path.empty())
+		start=end=string::npos;
+	else if(path.path[0]==DIRCHAR)
 		end=1;
 #ifdef WIN32
-	else if(path.path[2]==DIRCHAR && is_windows_drive(path.path.substr(0,2)))
+	else if(path.path.size()>2 && path.path[2]==DIRCHAR && is_windows_drive(path.path.substr(0,2)))
 		end=2;
 #endif
 	else