Fix canonicalization of relative paths, Dart_DefaultCanonicalizeUrl expects the base)url to end wit…

runtime/bin/gen_snapshot.cc

 // Copyright (c) 2013, 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.
 
 // Generate a snapshot file after loading all the scripts specified on the
 // command line.
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ skipping 437 matching lines @@
     free(result_string);
   }
   return result;
 }
 
 
 static Dart_Handle LoadSnapshotCreationScript(const char* script_name) {
   // First resolve the specified script uri with respect to the original
   // working directory.
   Dart_Handle resolved_uri = Dart_DefaultCanonicalizeUrl(
-      Dart_NewStringFromCString(DartUtils::original_working_directory),
+      DartUtils::GetCanonicalizableWorkingDirectory(),
       Dart_NewStringFromCString(script_name));
   if (Dart_IsError(resolved_uri)) {
     return resolved_uri;
   }
   // Now load the contents of the specified uri.
   const char* resolved_uri_string = DartUtils::GetStringValue(resolved_uri);
   Dart_Handle source =  LoadUrlContents(resolved_uri_string);
   if (Dart_IsError(source)) {
     return source;
   }
@@ skipping 24 matching lines @@
   }
   Dart_Handle library_url = Dart_LibraryUrl(library);
   if (Dart_IsError(library_url)) {
     return Dart_NewApiError("accessing library url failed");
   }
   const char* library_url_string = DartUtils::GetStringValue(library_url);
   const char* mapped_library_url_string = DartUtils::MapLibraryUrl(
       library_url_string);
   if (mapped_library_url_string != NULL) {
     library_url = Dart_DefaultCanonicalizeUrl(
-        Dart_NewStringFromCString(DartUtils::original_working_directory),
+        DartUtils::GetCanonicalizableWorkingDirectory(),
         Dart_NewStringFromCString(mapped_library_url_string));
     library_url_string = DartUtils::GetStringValue(library_url);
   }
 
   if (!Dart_IsString(url)) {
     return Dart_NewApiError("url is not a string");
   }
   const char* url_string = DartUtils::GetStringValue(url);
   const char* mapped_url_string = DartUtils::MapLibraryUrl(url_string);
 
@@ skipping 26 matching lines @@
           Builtin::PartSource(libraryBuiltinId, url_string), 0, 0);
     }
     ASSERT(tag == Dart_kImportTag);
     return DartUtils::NewError("Unable to import '%s' ", url_string);
   }
 
   Dart_Handle resolved_url = url;
   if (mapped_url_string != NULL) {
     // Mapped urls are relative to working directory.
     resolved_url = Dart_DefaultCanonicalizeUrl(
-        Dart_NewStringFromCString(DartUtils::original_working_directory),
+        DartUtils::GetCanonicalizableWorkingDirectory(),
         Dart_NewStringFromCString(mapped_url_string));
     if (Dart_IsError(resolved_url)) {
       return resolved_url;
     }
   }
   const char* resolved_uri_string = DartUtils::GetStringValue(resolved_url);
   Dart_Handle source =  LoadUrlContents(resolved_uri_string);
   if (Dart_IsError(source)) {
     return source;
   }
@@ skipping 769 matching lines @@
   EventHandler::Stop();
   return 0;
 }
 
 }  // namespace bin
 }  // namespace dart
 
 int main(int argc, char** argv) {
   return dart::bin::main(argc, argv);
 }