Fix native extension lookup

runtime/bin/loader.cc

 // Copyright (c) 2016, 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/loader.h"
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
 #include "bin/extensions.h"
+#include "bin/file.h"
 #include "bin/lockers.h"
 #include "bin/utils.h"
 
 namespace dart {
 namespace bin {
 
 // Development flag.
 static bool trace_loader = false;
 // Keep in sync with loader.dart.
 static const intptr_t _Dart_kImportExtension = 9;
@@ skipping 233 matching lines @@
     Dart_Handle res = Dart_LibraryHandleError(library, error);
     if (Dart_IsNull(res)) {
       // Error was handled by library.
       return true;
     }
   }
   return false;
 }
 
 
-static bool IsWindowsHost() {
-#if defined(TARGET_OS_WINDOWS)
-  return true;
-#else  // defined(TARGET_OS_WINDOWS)
-  return false;
-#endif  // defined(TARGET_OS_WINDOWS)
+static bool PathContainsSeparator(const char* path) {
+  return (strchr(path, '/') != NULL) ||
+         ((strncmp(File::PathSeparator(), "/", 1) != 0) &&
+          (strstr(path, File::PathSeparator()) != NULL));
 }
 
 
 bool Loader::ProcessResultLocked(Loader* loader, Loader::IOResult* result) {
   // We have to copy everything we care about out of |result| because after
   // dropping the lock below |result| may no longer valid.
   Dart_Handle uri =
       Dart_NewStringFromCString(reinterpret_cast<char*>(result->uri));
   Dart_Handle resolved_uri =
       Dart_NewStringFromCString(reinterpret_cast<char*>(result->resolved_uri));
@@ skipping 13 matching lines @@
     // the error. If the load requests stems from a deferred library load,
     // an IO error is not fatal.
     if (LibraryHandleError(library, error)) {
       return true;
     }
     // Fall through
     loader->error_ = Dart_NewUnhandledExceptionError(error);
     return false;
   }
 
-
   if (result->tag == _Dart_kImportExtension) {
     ASSERT(library_uri != Dart_Null());
     Dart_Handle library = Dart_LookupLibrary(library_uri);
     ASSERT(!Dart_IsError(library));
     const char* lib_uri = reinterpret_cast<const char*>(result->payload);
     if (strncmp(lib_uri, "http://", 7) == 0 ||
         strncmp(lib_uri, "https://", 8) == 0) {
       loader->error_ =
         Dart_NewApiError("Cannot load native extensions over http: or https:");
         return false;
     }
     const char* extension_uri = reinterpret_cast<const char*>(result->uri);
     const char* lib_path = NULL;
     if (strncmp(lib_uri, "file://", 7) == 0) {
       lib_path = DartUtils::RemoveScheme(lib_uri);
     } else {
       lib_path = lib_uri;
     }
     const char* extension_path = DartUtils::RemoveScheme(extension_uri);
-    if (strchr(extension_path, '/') != NULL ||
-        (IsWindowsHost() && strchr(extension_path, '\\') != NULL)) {
+    if (!File::IsAbsolutePath(extension_path) &&
+        PathContainsSeparator(extension_path)) {
       loader->error_ = DartUtils::NewError(
-          "Relative paths for dart extensions are not supported: '%s'",
+          "Native extension path must be absolute, or simply the file name: %s",
           extension_path);
       return false;
     }
     Dart_Handle result = Extensions::LoadExtension(lib_path,
                                                    extension_path,
                                                    library);
     if (Dart_IsError(result)) {
       loader->error_ = result;
       return false;
     }
@@ skipping 421 matching lines @@
   MutexLocker ml(loader_infos_lock_);
   Loader* loader = LoaderForLocked(dest_port_id);
   if (loader == NULL) {
     return;
   }
   loader->QueueMessage(message);
 }
 
 }  // namespace bin
 }  // namespace dart