From dc77bc69a0028a8c00d323367b28b2efe4e85bd7 Mon Sep 17 00:00:00 2001
From: Kimmo Varis <kimmov@gmail.com>
Date: Mon, 19 Jul 2010 14:27:05 +0300
Subject: [PATCH] Move path simplifying code to Path class.

---
 lib/errorlogger.cpp | 27 +--------------------------
 lib/path.cpp        | 32 ++++++++++++++++++++++++++++++++
 lib/path.h          |  8 ++++++++
 3 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/lib/errorlogger.cpp b/lib/errorlogger.cpp
index 2b1fd8190..6d8d590de 100644
--- a/lib/errorlogger.cpp
+++ b/lib/errorlogger.cpp
@@ -219,32 +219,7 @@ std::string ErrorLogger::callStackToString(const std::list<ErrorLogger::ErrorMes
 std::string ErrorLogger::ErrorMessage::FileLocation::getfile(bool convert) const
 {
     std::string f(_file);
-
-    // replace "/ab/../" with "/"..
-    std::string::size_type pos = 0;
-    while ((pos = f.find("..", pos + 1)) != std::string::npos)
-    {
-        // position must be at least 4..
-        if (pos < 4)
-            continue;
-
-        // Previous char must be a separator..
-        if (f[pos-1] != '/')
-            continue;
-
-        // Next char must be a separator..
-        if (f[pos+2] != '/')
-            continue;
-
-        // Locate previous separator..
-        std::string::size_type sep = f.find_last_of("/", pos - 2);
-        if (sep == std::string::npos)
-            continue;
-
-        // Delete substring..
-        f.erase(sep, pos + 2 - sep);
-        pos = sep;
-    }
+    f = Path::simplifyPath(f);
 
     if (convert)
         f = Path::toNativeSeparators(f);
diff --git a/lib/path.cpp b/lib/path.cpp
index c60627ead..13344be4e 100644
--- a/lib/path.cpp
+++ b/lib/path.cpp
@@ -41,3 +41,35 @@ std::string Path::fromNativeSeparators(const std::string &path)
     std::replace(modified.begin(), modified.end(), nonnative, newsepar);
     return modified;
 }
+
+std::string Path::simplifyPath(const std::string &path)
+{
+    std::string f(path);
+    // replace "/ab/../" with "/"..
+    std::string::size_type pos = 0;
+    while ((pos = f.find("..", pos + 1)) != std::string::npos)
+    {
+        // position must be at least 4..
+        if (pos < 4)
+            continue;
+
+        // Previous char must be a separator..
+        if (f[pos-1] != '/')
+            continue;
+
+        // Next char must be a separator..
+        if (f[pos+2] != '/')
+            continue;
+
+        // Locate previous separator..
+        std::string::size_type sep = f.find_last_of("/", pos - 2);
+        if (sep == std::string::npos)
+            continue;
+
+        // Delete substring..
+        f.erase(sep, pos + 2 - sep);
+        pos = sep;
+    }
+
+    return f;
+}
\ No newline at end of file
diff --git a/lib/path.h b/lib/path.h
index f38213112..21781f8b1 100644
--- a/lib/path.h
+++ b/lib/path.h
@@ -47,6 +47,14 @@ public:
       * @return converted path.
       */
     static std::string fromNativeSeparators(const std::string &path);
+
+    /**
+      * Simplify given path.
+      * This method simplifies the path removing reduntant parts.
+      * @param path Path string to simplify.
+      * @return simplified path.
+      */
+    static std::string simplifyPath(const std::string &path);
 };
 
 /// @}