Change handling of dart-ext: URIs for native extensions.

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 457 matching lines @@
   }
   Dart_Handle library_url = Dart_LibraryUrl(library);
   const char* library_url_string = NULL;
   result = Dart_StringToCString(library_url, &library_url_string);
   if (Dart_IsError(result)) {
     return result;
   }
 
   bool is_dart_scheme_url = DartUtils::IsDartSchemeURL(url_string);
   bool is_io_library = DartUtils::IsDartIOLibURL(library_url_string);
-  bool is_dart_extension_url = DartUtils::IsDartExtensionSchemeURL(url_string);
 
   // Handle URI canonicalization requests.
   if (tag == Dart_kCanonicalizeUrl) {
     // If this is a Dart Scheme URL or 'part' of a io library
     // then it is not modified as it will be handled internally.
     if (is_dart_scheme_url || is_io_library) {
       return url;
     }
     // Resolve the url within the context of the library's URL.
     Dart_Handle builtin_lib =
@@ skipping 32 matching lines @@
   }
 
   // Handle 'import' or 'part' requests for all other URIs.
   // Get the file path out of the url.
   Dart_Handle builtin_lib =
       Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
   Dart_Handle file_path = FilePathFromUri(url, builtin_lib);
   if (Dart_IsError(file_path)) {
     return file_path;
   }
-  Dart_StringToCString(file_path, &url_string);
-  if (is_dart_extension_url) {
+  const char* final_path = NULL;
+  Dart_StringToCString(file_path, &final_path);
+  if (DartUtils::IsDartExtensionSchemeURL(url_string)) {
     if (tag != Dart_kImportTag) {
       return NewError("Dart extensions must use import: '%s'", url_string);
     }
-    return Extensions::LoadExtension(url_string, library);
+    return Extensions::LoadExtension(final_path, library);
   }
   result = DartUtils::LoadSource(NULL,
                                  library,
                                  url,
                                  tag,
-                                 url_string);
+                                 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++) {
     if (text_buffer[i] != magic_number[i]) {
@@ skipping 529 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