Eliminate unused url mapping parameter in dartutils

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 "include/dart_api.h"
 #include "include/dart_native_api.h"
 
 #include "platform/assert.h"
@@ skipping 156 matching lines @@
 bool DartUtils::IsDartIOLibURL(const char* url_name) {
   return (strcmp(url_name, kIOLibURL) == 0);
 }
 
 
 bool DartUtils::IsDartBuiltinLibURL(const char* url_name) {
   return (strcmp(url_name, kBuiltinLibURL) == 0);
 }
 
 
-Dart_Handle DartUtils::CanonicalizeURL(CommandLineOptions* url_mapping,
-                                       Dart_Handle library,
-                                       const char* url_str) {
-  // Get the url of the including library.
-  Dart_Handle library_url = Dart_LibraryUrl(library);
-  if (Dart_IsError(library_url)) {
-    return Dart_NewApiError("accessing library url failed");
-  }
-  if (!Dart_IsString(library_url)) {
-    return Dart_NewApiError("library url is not a string");
-  }
-  const char* library_url_str = NULL;
-  Dart_Handle result = Dart_StringToCString(library_url, &library_url_str);
-  if (Dart_IsError(result)) {
-    return Dart_NewApiError("accessing library url characters failed");
-  }
-  if (url_mapping != NULL) {
-    const char* mapped_library_url_str = MapLibraryUrl(url_mapping,
-                                                       library_url_str);
-    if (mapped_library_url_str != NULL) {
-      library_url_str = mapped_library_url_str;
-    }
-  }
-  // Calculate the canonical path.
-  const char* canon_url_str = GetCanonicalPath(library_url_str, url_str);
-  Dart_Handle canon_url = NewString(canon_url_str);
-  free(const_cast<char*>(canon_url_str));
-
-  return canon_url;
-}
-
-
 void* DartUtils::OpenFile(const char* name, bool write) {
   File* file = File::Open(name, write ? File::kWriteTruncate : File::kRead);
   return reinterpret_cast<void*>(file);
 }
 
 
 void DartUtils::ReadFile(const uint8_t** data,
                          intptr_t* len,
                          void* stream) {
   ASSERT(data != NULL);
@@ skipping 342 matching lines @@
                                      library);
   } else {
     // Handle 'import' or 'part' requests for all other URIs.
     // Get the file path out of the url.
     Dart_Handle file_path = DartUtils::FilePathFromUri(url, builtin_lib);
     if (Dart_IsError(file_path)) {
       return file_path;
     }
     const char* final_path = NULL;
     Dart_StringToCString(file_path, &final_path);
-    result = DartUtils::LoadSource(NULL,
-                                   library,
-                                   url,
-                                   tag,
-                                   final_path);
+    result = DartUtils::LoadSource(library, url, tag, final_path);
     return result;
   }
 }
 
 
 const uint8_t* DartUtils::SniffForMagicNumber(const uint8_t* text_buffer,
                                               intptr_t* buffer_len,
                                               bool* is_snapshot) {
   intptr_t len = sizeof(magic_number);
   for (intptr_t i = 0; i < len; i++) {
@@ skipping 77 matching lines @@
       returnValue = NewError("%s is not a valid UTF-8 script", script_uri);
     } else {
       returnValue = Dart_LoadScript(resolved_script_uri, source, 0, 0);
     }
   }
   free(const_cast<uint8_t *>(buffer));
   return returnValue;
 }
 
 
-Dart_Handle DartUtils::LoadSource(CommandLineOptions* url_mapping,
-                                  Dart_Handle library,
+Dart_Handle DartUtils::LoadSource(Dart_Handle library,
                                   Dart_Handle url,
                                   Dart_LibraryTag tag,
                                   const char* url_string) {
   bool is_http_scheme_url = DartUtils::IsHttpSchemeURL(url_string);
-  if (url_mapping != NULL && IsDartSchemeURL(url_string)) {
-    const char* mapped_url_string = MapLibraryUrl(url_mapping, url_string);
-    if (mapped_url_string == NULL) {
-      return NewError("Do not know how to load %s", url_string);
-    }
-    // We have a URL mapping specified, just read the file that the
-    // URL mapping specifies and load it.
-    url_string = mapped_url_string;
-  }
   Dart_Handle source;
   if (is_http_scheme_url) {
     // Read the file over http.
     source = DartUtils::ReadStringFromHttp(url_string);
   } else {
     // Read the file.
     source = DartUtils::ReadStringFromFile(url_string);
   }
   if (Dart_IsError(source)) {
     return source;  // source contains the error string.
@@ skipping 86 matching lines @@
       return Dart_Invoke(builtin_lib,
                          NewString("_setPackageRoot"),
                          kNumArgs,
                          dart_args);
     }
   }
   return result;
 }
 
 
-const char* DartUtils::GetCanonicalPath(const char* reference_dir,
-                                        const char* filename) {
-  if (File::IsAbsolutePath(filename)) {
-    return strdup(filename);
-  }
-
-  char* canonical_path = File::GetCanonicalPath(reference_dir);
-  if  (canonical_path == NULL) {
-    canonical_path = strdup(reference_dir);
-    ASSERT(canonical_path != NULL);
-  }
-  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",
-                          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",
-           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_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) {
   // Post a message with the integer value.
   int32_t min = 0xc0000000;  // -1073741824
   int32_t max = 0x3fffffff;  // 1073741823
@@ skipping 278 matching lines @@
       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;
 }
 
 }  // namespace bin
 }  // namespace dart