Canonicalize the reference_dir also when canonicalizing a path

bin/dartutils.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "bin/dartutils.h"
 
 #include "bin/file.h"
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/globals.h"
@@ skipping 214 matching lines @@
   return Dart_Error("wrong tag");
 }
 
 
 const char* DartUtils::GetCanonicalPath(const char* reference_dir,
                                         const char* filename) {
   if (File::IsAbsolutePath(filename)) {
     return strdup(filename);
   }
 
-  char* path = strdup(reference_dir);
-  if  (path == NULL) {
-    return NULL;
+  char* canonical_path = File::GetCanonicalPath(reference_dir);
+  if  (canonical_path == NULL) {
+    canonical_path = strdup(reference_dir);
+    ASSERT(canonical_path != NULL);
   }
-  char* path_sep = strrchr(path, File::PathSeparator()[0]);
+  ASSERT(File::PathSeparator() != NULL && strlen(File::PathSeparator()) == 1);
+  char* path_sep = strrchr(canonical_path, File::PathSeparator()[0]);
   if (path_sep == NULL) {
     // No separator found: Reference is a file in local directory.
+    free(canonical_path);
     return strdup(filename);
   }
   *path_sep = '\0';
   intptr_t len = snprintf(NULL, 0, "%s%s%s",
-                          path, File::PathSeparator(), filename);
+                          canonical_path, File::PathSeparator(), filename);
   char* absolute_filename = reinterpret_cast<char*>(malloc(len + 1));
   ASSERT(absolute_filename != NULL);
 
   snprintf(absolute_filename, len + 1, "%s%s%s",
-           path, File::PathSeparator(), filename);
-
-  free(path);
-  char* canonical_filename = File::GetCanonicalPath(absolute_filename);
-  if (canonical_filename == NULL) {
+           canonical_path, File::PathSeparator(), filename);
+  free(canonical_path);
+  canonical_path = File::GetCanonicalPath(absolute_filename);
+  if (canonical_path == NULL) {
     return absolute_filename;
   }
   free(absolute_filename);
-  return canonical_filename;
+  return canonical_path;
 }
 
 
 bool DartUtils::PostNull(Dart_Port port_id) {
   // Post a message with just the null object.
   return Dart_PostCObject(port_id, CObject::Null()->AsApiCObject());
 }
 
 
 bool DartUtils::PostInt32(Dart_Port port_id, int32_t value) {
@@ skipping 161 matching lines @@
 
 CObject* CObject::NewOSError(OSError* os_error) {
   CObject* error_message =
       new CObjectString(CObject::NewString(os_error->message()));
   CObjectArray* result = new CObjectArray(CObject::NewArray(3));
   result->SetAt(0, new CObjectInt32(CObject::NewInt32(kOSError)));
   result->SetAt(1, new CObjectInt32(CObject::NewInt32(os_error->code())));
   result->SetAt(2, error_message);
   return result;
 }