original

tools/gn/source_dir.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "tools/gn/source_dir.h"
 
 #include "base/logging.h"
 #include "tools/gn/filesystem_utils.h"
 #include "tools/gn/source_file.h"
 
@@ skipping 26 matching lines @@
 }
 
 SourceDir::~SourceDir() {
 }
 
 SourceFile SourceDir::ResolveRelativeFile(
     const base::StringPiece& p,
     const base::StringPiece& source_root) const {
   SourceFile ret;
 
+  DCHECK(source_root.empty() || !source_root.ends_with("/"));
+
   // It's an error to resolve an empty string or one that is a directory
   // (indicated by a trailing slash) because this is the function that expects
   // to return a file.
   if (p.empty() || (p.size() > 0 && p[p.size() - 1] == '/'))
     return SourceFile();
   if (p.size() >= 2 && p[0] == '/' && p[1] == '/') {
     // Source-relative.
     ret.value_.assign(p.data(), p.size());
     NormalizePath(&ret.value_);
     return ret;
   } else if (IsPathAbsolute(p)) {
     if (source_root.empty() ||
         !MakeAbsolutePathRelativeIfPossible(source_root, p, &ret.value_)) {
 #if defined(OS_WIN)
       // On Windows we'll accept "C:\foo" as an absolute path, which we want
       // to convert to "/C:..." here.
       if (p[0] != '/')
         ret.value_ = "/";
 #endif
       ret.value_.append(p.data(), p.size());
     }
     NormalizePath(&ret.value_);
     return ret;
   }
 
+  if (!source_root.empty()) {
+    std::string absolute =
+        FilePathToUTF8(Resolve(UTF8ToFilePath(source_root)).AppendASCII(
+            p.as_string()).value());
+    NormalizePath(&absolute);
+    if (!MakeAbsolutePathRelativeIfPossible(source_root, absolute,
+                                            &ret.value_))
+      ret.value_ = absolute;
+    return ret;
+  }
+
+  // With no source_root_, there's nothing we can do about
+  // e.g. p=../../../path/to/file and value_=//source and we'll
+  // errornously return //file.
   ret.value_.reserve(value_.size() + p.size());
   ret.value_.assign(value_);
   ret.value_.append(p.data(), p.size());
 
   NormalizePath(&ret.value_);
   return ret;
 }
 
 SourceDir SourceDir::ResolveRelativeDir(
     const base::StringPiece& p,
     const base::StringPiece& source_root) const {
   SourceDir ret;
 
+  DCHECK(source_root.empty() || !source_root.ends_with("/"));
+
   if (p.empty())
     return ret;
   if (p.size() >= 2 && p[0] == '/' && p[1] == '/') {
     // Source-relative.
     ret.value_.assign(p.data(), p.size());
     if (!EndsWithSlash(ret.value_))
       ret.value_.push_back('/');
     NormalizePath(&ret.value_);
     return ret;
   } else if (IsPathAbsolute(p)) {
     if (source_root.empty() ||
         !MakeAbsolutePathRelativeIfPossible(source_root, p, &ret.value_)) {
 #if defined(OS_WIN)
       if (p[0] != '/')  // See the file case for why we do this check.
         ret.value_ = "/";
 #endif
       ret.value_.append(p.data(), p.size());
     }
     NormalizePath(&ret.value_);
     if (!EndsWithSlash(ret.value_))
       ret.value_.push_back('/');
     return ret;
   }
 
+  if (!source_root.empty()) {
+    std::string absolute =
+        FilePathToUTF8(Resolve(UTF8ToFilePath(source_root)).AppendASCII(
+            p.as_string()).value());
+    NormalizePath(&absolute);
+    if (!MakeAbsolutePathRelativeIfPossible(source_root, absolute, &ret.value_))
+      ret.value_ = absolute;
+    if (!EndsWithSlash(ret.value_))
+      ret.value_.push_back('/');
+    return ret;
+  }
+
   ret.value_.reserve(value_.size() + p.size());
   ret.value_.assign(value_);
   ret.value_.append(p.data(), p.size());
 
   NormalizePath(&ret.value_);
   if (!EndsWithSlash(ret.value_))
     ret.value_.push_back('/');
   AssertValueSourceDirString(ret.value_);
 
   return ret;
@@ skipping 17 matching lines @@
   // String the double-leading slash for source-relative paths.
   converted.assign(&value_[2], value_.size() - 2);
   return source_root.Append(UTF8ToFilePath(converted))
       .NormalizePathSeparatorsTo('/');
 }
 
 void SourceDir::SwapValue(std::string* v) {
   value_.swap(*v);
   AssertValueSourceDirString(value_);
 }