Support symbolic links and package imports in gen_snapshot.

runtime/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/extensions.h"
 #include "bin/directory.h"
 #include "bin/file.h"
 #include "include/dart_api.h"
@@ skipping 19 matching lines @@
 
 static bool IsWindowsHost() {
 #if defined(TARGET_OS_WINDOWS)
   return true;
 #else  // defined(TARGET_OS_WINDOWS)
   return false;
 #endif  // defined(TARGET_OS_WINDOWS)
 }
 
 
-static const char* MapLibraryUrl(CommandLineOptions* url_mapping,
-                                 const char* url_string) {
+const char* DartUtils::MapLibraryUrl(CommandLineOptions* url_mapping,
+                                     const char* url_string) {
   ASSERT(url_mapping != NULL);
   // We need to check if the passed in url is found in the url_mapping array,
   // in that case use the mapped entry.
   int len = strlen(url_string);
   for (int idx = 0; idx < url_mapping->count(); idx++) {
     const char* url_name = url_mapping->GetArgument(idx);
     if (!strncmp(url_string, url_name, len) && (url_name[len] == ',')) {
       const char* url_mapped_name = url_name + len + 1;
       if (strlen(url_mapped_name) != 0) {
         return url_mapped_name;  // Found a mapping for this URL.
@@ skipping 174 matching lines @@
     free(text_buffer);
     return Dart_Error("Unable to fully read contents");
   }
   delete file;
   Dart_Handle str = Dart_NewStringFromUTF8(text_buffer, len);
   free(text_buffer);
   return str;
 }
 
 
-static Dart_Handle ResolveScriptUri(Dart_Handle script_uri,
-                                    Dart_Handle builtin_lib) {
+Dart_Handle DartUtils::ResolveScriptUri(Dart_Handle script_uri,
+                                        Dart_Handle builtin_lib) {
   const int kNumArgs = 3;
   Dart_Handle dart_args[kNumArgs];
-  dart_args[0] = DartUtils::NewString(DartUtils::original_working_directory);
+  dart_args[0] = NewString(original_working_directory);
   dart_args[1] = script_uri;
   dart_args[2] = (IsWindowsHost() ? Dart_True() : Dart_False());
   return Dart_Invoke(builtin_lib,
-                     DartUtils::NewString("_resolveScriptUri"),
+                     NewString("_resolveScriptUri"),
                      kNumArgs,
                      dart_args);
 }
 
 
-static Dart_Handle FilePathFromUri(Dart_Handle script_uri,
-                                   Dart_Handle builtin_lib) {
+Dart_Handle DartUtils::FilePathFromUri(Dart_Handle script_uri,
+                                       Dart_Handle builtin_lib) {
   const int kNumArgs = 2;
   Dart_Handle dart_args[kNumArgs];
   dart_args[0] = script_uri;
   dart_args[1] = (IsWindowsHost() ? Dart_True() : Dart_False());
-  Dart_Handle script_path = Dart_Invoke(
-      builtin_lib,
-      DartUtils::NewString("_filePathFromUri"),
-      kNumArgs,
-      dart_args);
-  return script_path;
+  return Dart_Invoke(builtin_lib,
+                     NewString("_filePathFromUri"),
+                     kNumArgs,
+                     dart_args);
 }
 
 
+Dart_Handle DartUtils::ResolveUri(Dart_Handle library_url,
+                                  Dart_Handle url,
+                                  Dart_Handle builtin_lib) {
+  const int kNumArgs = 2;
+  Dart_Handle dart_args[kNumArgs];
+  dart_args[0] = library_url;
+  dart_args[1] = url;
+  return Dart_Invoke(
+      builtin_lib, NewString("_resolveUri"), kNumArgs, dart_args);
+}
+
+
 Dart_Handle DartUtils::LibraryTagHandler(Dart_LibraryTag tag,
                                          Dart_Handle library,
                                          Dart_Handle url) {
   if (!Dart_IsLibrary(library)) {
     return Dart_Error("not a library");
   }
   if (!Dart_IsString(url)) {
     return Dart_Error("url is not a string");
   }
   const char* url_string = NULL;
   Dart_Handle result = Dart_StringToCString(url, &url_string);
   if (Dart_IsError(result)) {
     return result;
   }
   bool is_dart_scheme_url = DartUtils::IsDartSchemeURL(url_string);
   bool is_dart_extension_url = DartUtils::IsDartExtensionSchemeURL(url_string);
   if (tag == kCanonicalizeUrl) {
     // If this is a Dart Scheme URL then it is not modified as it will be
     // handled by the VM internally.
     if (is_dart_scheme_url) {
       return url;
     }
     // Resolve the url within the context of the library's URL.
     Dart_Handle builtin_lib =
         Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
     Dart_Handle library_url = Dart_LibraryUrl(library);
     if (Dart_IsError(library_url)) {
       return library_url;
     }
-    const int kNumArgs = 2;
-    Dart_Handle dart_args[kNumArgs];
-    dart_args[0] = library_url;
-    dart_args[1] = url;
-    return Dart_Invoke(
-        builtin_lib, NewString("_resolveUri"), kNumArgs, dart_args);
+    return ResolveUri(library_url, url, builtin_lib);
   }
   if (is_dart_scheme_url) {
     ASSERT(tag == kImportTag);
     // Handle imports of other built-in libraries present in the SDK.
     Builtin::BuiltinLibraryId id;
     if (DartUtils::IsDartCryptoLibURL(url_string)) {
       id = Builtin::kCryptoLibrary;
     } else if (DartUtils::IsDartIOLibURL(url_string)) {
       id = Builtin::kIOLibrary;
     } else if (DartUtils::IsDartJsonLibURL(url_string)) {
@@ skipping 26 matching lines @@
                                  library,
                                  url,
                                  tag,
                                  url_string);
   return result;
 }
 
 
 static Dart_Handle ReadSource(Dart_Handle script_uri,
                               Dart_Handle builtin_lib) {
-  Dart_Handle script_path = FilePathFromUri(script_uri, builtin_lib);
+  Dart_Handle script_path = DartUtils::FilePathFromUri(script_uri, builtin_lib);
   if (Dart_IsError(script_path)) {
     return script_path;
   }
   const char* script_path_cstr;
   Dart_StringToCString(script_path, &script_path_cstr);
   Dart_Handle source = DartUtils::ReadStringFromFile(script_path_cstr);
   return source;
 }
 
 
@@ skipping 335 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;
 }