Make Path behave more consistently by always starting relative paths with a dot

[libs/core.git] / source / path.cpp

diff --git a/source/path.cpp b/source/path.cpp
index c0b91d6c82f8321df9c31acd1e045bd026a08304..5424cb1c79e31936a7628cef52a85f1eb74306d0 100644 (file)
--- a/source/path.cpp
+++ b/source/path.cpp
@@ -5,6 +5,7 @@ Copyright © 2006-2008  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <msp/core/except.h>
 #include <msp/strings/utils.h>
 #include "path.h"
 #include "utils.h"
@@ -106,16 +107,15 @@ string Path::operator[](int n) const
        }
        else
        {
-               for(Iterator i=--end();; --i)
+               for(Iterator i=end(); i!=begin();)
                {
+                       --i;
                        if(!++n)
                                return *i;
-                       if(i==begin())
-                               break;
                }
        }
 
-       return string();
+       throw InvalidParameterValue("Path component index out of range");
 }
 
 bool Path::operator==(const Path &p) const
@@ -180,7 +180,7 @@ void Path::add_component(const string &comp)
 #endif
        else if(comp=="..")
        {
-               if(path.empty())
+               if(path.empty() || path==".")
                        path=comp;
                // .. in root directory is a no-op
                else if(path.size()==1 && path[0]==DIRSEP)
@@ -199,15 +199,21 @@ void Path::add_component(const string &comp)
                                path+=DIRSEP;
                                path+=comp;
                        }
+                       else if(slash==string::npos)
+                               path=".";
                        else
+                       {
+                               if(slash==0)
+                                       slash=1;
                                // Otherwise, erase the last component
                                path.erase(slash, string::npos);
+                       }
                }
        }
        else if(comp!="." || path.empty())
        {
-               if(path==".")
-                       path="";
+               if(comp!="." && path.empty())
+                       path=".";
                if(path.size()>1 || (path.size()==1 && path[0]!=DIRSEP))
                        path+=DIRSEP;
                path+=comp;