Move CanonicalizePath into util.h so it can be shared by the other modules.

Also add util_test.cc and move the CanonicalizePathTest into there.

Signed-off-by: Thiago Farina <tfarina@chromium.org>

1 files changed, 1 insertions, 53 deletions

diff --git a/src/graph.cc b/src/graph.cc
index 35ae088..a4317ba 100644
--- a/src/graph.cc
+++ b/src/graph.cc
@@ -19,59 +19,7 @@
 #include "build_log.h"
 #include "ninja.h"
 #include "parsers.h"
-
-// Canonicalize a path like "foo/../bar.h" into just "bar.h".
-bool CanonicalizePath(string* path, string* err) {
-  // Try to fast-path out the common case.
-  if (path->find("/.") == string::npos &&
-      path->find("./") == string::npos) {
-    return true;
-  }
-
-  string inpath = *path;
-  vector<const char*> parts;
-  for (string::size_type start = 0; start < inpath.size(); ++start) {
-    string::size_type end = inpath.find('/', start);
-    if (end == string::npos)
-      end = inpath.size();
-    else
-      inpath[end] = 0;
-    parts.push_back(inpath.data() + start);
-    start = end;
-  }
-
-  vector<const char*>::iterator i = parts.begin();
-  while (i != parts.end()) {
-    const char* part = *i;
-    if (part[0] == '.') {
-      if (part[1] == 0) {
-        // "."; strip.
-        parts.erase(i);
-        continue;
-      } else if (part[1] == '.' && part[2] == 0) {
-        // ".."; go up one.
-        if (i == parts.begin()) {
-          *err = "can't canonicalize path '" + *path + "' that reaches "
-            "above its directory";
-          return false;
-        }
-        --i;
-        parts.erase(i, i + 2);
-        continue;
-      }
-    }
-    ++i;
-  }
-  path->clear();
-
-  for (i = parts.begin(); i != parts.end(); ++i) {
-    if (!path->empty())
-      path->push_back('/');
-    path->append(*i);
-  }
-
-  return true;
-}
+#include "util.h"
 
 bool FileStat::Stat(DiskInterface* disk_interface) {
   mtime_ = disk_interface->Stat(path_);