use util's CanonicalizePath in parsers as well

2 files changed, 17 insertions, 14 deletions

diff --git a/src/parsers.cc b/src/parsers.cc
index 2fb2c9a..b9c1190 100644
--- a/src/parsers.cc
+++ b/src/parsers.cc
@@ -21,6 +21,7 @@
 
 #include "graph.h"
 #include "ninja.h"
+#include "util.h"
 
 string Token::AsString() const {
   switch (type_) {
@@ -382,19 +383,6 @@ bool ManifestParser::ParseLet(string* name, string* value, bool expand,
   return true;
 }
 
-static string CanonicalizePath(const string& path) {
-  string out;
-  for (size_t i = 0; i < path.size(); ++i) {
-    char in = path[i];
-    if (in == '/' &&
-        (!out.empty() && *out.rbegin() == '/')) {
-      continue;
-    }
-    out.push_back(in);
-  }
-  return out;
-}
-
 bool ManifestParser::ParseEdge(string* err) {
   vector<string> ins, outs;
 
@@ -494,7 +482,10 @@ bool ManifestParser::ParseEdge(string* err) {
       string eval_err;
       if (!eval.Parse(*i, &eval_err))
         return tokenizer_.Error(eval_err, err);
-      *i = CanonicalizePath(eval.Evaluate(env));
+      string path = eval.Evaluate(env);
+      if (!CanonicalizePath(&path, err))
+        return false;
+      *i = path;
     }
   }
 
diff --git a/src/parsers_test.cc b/src/parsers_test.cc
index 8a1efc5..73c1984 100644
--- a/src/parsers_test.cc
+++ b/src/parsers_test.cc
@@ -162,6 +162,18 @@ TEST_F(ParserTest, PathVariables) {
   EXPECT_TRUE(state.LookupNode("out/exe"));
 }
 
+TEST_F(ParserTest, CanonicalizePaths) {
+  ASSERT_NO_FATAL_FAILURE(AssertParse(
+"rule cat\n"
+"  command = cat $in > $out\n"
+"build ./out.o: cat ./bar/baz/../foo.cc\n"));
+
+  EXPECT_FALSE(state.LookupNode("./out.o"));
+  EXPECT_TRUE(state.LookupNode("out.o"));
+  EXPECT_FALSE(state.LookupNode("./bar/baz/../foo.cc"));
+  EXPECT_TRUE(state.LookupNode("bar/foo.cc"));
+}
+
 TEST_F(ParserTest, Errors) {
   {
     ManifestParser parser(NULL, NULL);