Reland r45669:

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 <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ skipping 178 matching lines @@
 
  private:
   Dart_Isolate snapshotted_isolate_;
 
   DISALLOW_COPY_AND_ASSIGN(UriResolverIsolateScope);
 };
 
 Dart_Isolate UriResolverIsolateScope::isolate = NULL;
 
 
-static Dart_Handle ResolveScriptUri(const char* script_uri) {
+static Dart_Handle ResolveUriInWorkingDirectory(const char* script_uri) {
   bool failed = false;
   char* result_string = NULL;
 
   {
     UriResolverIsolateScope scope;
 
-    // Run DartUtils::ResolveScriptUri in context of uri resolver isolate.
+    // Run DartUtils::ResolveUriInWorkingDirectory in context of uri resolver
+    // isolate.
     Dart_Handle builtin_lib =
         Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
     CHECK_RESULT(builtin_lib);
 
-    Dart_Handle result = DartUtils::ResolveScriptUri(
+    Dart_Handle result = DartUtils::ResolveUriInWorkingDirectory(
         DartUtils::NewString(script_uri), builtin_lib);
     if (Dart_IsError(result)) {
       failed = true;
       result_string = strdup(Dart_GetError(result));
     } else {
       result_string = strdup(DartUtils::GetStringValue(result));
     }
   }
 
   Dart_Handle result = failed ? Dart_NewApiError(result_string) :
@@ skipping 81 matching lines @@
     return Dart_NewApiError("not a library");
   }
   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(
       url_mapping, library_url_string);
   if (mapped_library_url_string != NULL) {
-    library_url = ResolveScriptUri(mapped_library_url_string);
+    library_url = ResolveUriInWorkingDirectory(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_mapping,
                                                            url_string);
 
@@ skipping 25 matching lines @@
       return Dart_LoadSource(library, url,
           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 = ResolveScriptUri(mapped_url_string);
+    resolved_url = ResolveUriInWorkingDirectory(mapped_url_string);
     if (Dart_IsError(resolved_url)) {
       return resolved_url;
     }
   }
 
   // Get the file path out of the url.
   Dart_Handle file_path = FilePathFromUri(
       DartUtils::GetStringValue(resolved_url));
   if (Dart_IsError(file_path)) {
     return file_path;
   }
   const char* raw_path = DartUtils::GetStringValue(file_path);
   Dart_Handle source = DartUtils::ReadStringFromFile(raw_path);
   if (Dart_IsError(source)) {
     return source;
   }
   if (tag == Dart_kImportTag) {
     return Dart_LoadLibrary(url, source, 0, 0);
   } else {
     ASSERT(tag == Dart_kSourceTag);
     return Dart_LoadSource(library, url, source, 0, 0);
   }
 }
 
 
 static Dart_Handle LoadSnapshotCreationScript(const char* script_name) {
-  Dart_Handle resolved_script_uri = ResolveScriptUri(script_name);
+  Dart_Handle resolved_script_uri = ResolveUriInWorkingDirectory(script_name);
   if (Dart_IsError(resolved_script_uri)) {
     return resolved_script_uri;
   }
   Dart_Handle script_path = FilePathFromUri(
       DartUtils::GetStringValue(resolved_script_uri));
   if (Dart_IsError(script_path)) {
     return script_path;
   }
   Dart_Handle source = DartUtils::ReadStringFromFile(
       DartUtils::GetStringValue(script_path));
@@ skipping 223 matching lines @@
   }
   return 0;
 }
 
 }  // namespace bin
 }  // namespace dart
 
 int main(int argc, char** argv) {
   return dart::bin::main(argc, argv);
 }