Fix an issue with normalizing paths of the form /foo/..

The separator indicating the root directory was being incorrectly
removed, resulting in a path denoting the current directory.

diff --git a/source/fs/path.cpp b/source/fs/path.cpp
index 0e86600453be225bcb647ff699f3cb0b5f20649b..1181b923c1054f894c5f0e188119e067c6508566 100644 (file)
--- a/source/fs/path.cpp
+++ b/source/fs/path.cpp
@@ -133,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();
                        }

diff --git a/tests/path.cpp b/tests/path.cpp
index fbb5ff54588685527080faa9991ed94b14e4b8fb..d52630a29d4bd72dfe3f1af86d1484834a4f1d24 100644 (file)
--- a/tests/path.cpp
+++ b/tests/path.cpp
@@ -52,6 +52,8 @@ void PathTests::normalization()
        EXPECT_EQUAL(path.str(), "./foo");
        path = "foo/..";
        EXPECT_EQUAL(path.str(), ".");
+       path = "/foo/..";
+       EXPECT_EQUAL(path.str(), "/");
        path = "//foo";
        EXPECT_EQUAL(path.str(), "/foo");
        path = "/..";