Refactor native extension shared library lookup.

runtime/bin/extensions.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/extensions.h"
 
 #include <stdio.h>
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/globals.h"
 #include "bin/dartutils.h"
 #include "bin/file.h"
 
 
 namespace dart {
 namespace bin {
 
-Dart_Handle Extensions::LoadExtension(const char* extension_path,
+Dart_Handle Extensions::LoadExtension(const char* extension_directory,
+                                      const char* extension_file,
+                                      const char* extension_name,
                                       Dart_Handle parent_library) {

[Søren Gjesse, 2014/03/04 13:09:02]

extension_directory can be a http/https URI :-)

[Bill Hesse, 2014/03/04 14:36:31]

Added back the check for http, added https.
Done.

-  if (strncmp(extension_path, "http://", 7) == 0) {
-    return Dart_NewApiError("Cannot load native extensions over http:");
-  }
-
-  char* library_path = strdup(extension_path);
-
-  if (library_path == NULL) {
-    return Dart_NewApiError("Out of memory in LoadExtension");
-  }
-
-  // Extract the directory and the extension name from the path.
-  char* last_path_separator = strrchr(library_path, '/');
-  if (last_path_separator == NULL) {
-    last_path_separator = strrchr(library_path, '\\');
-  }
-  if (last_path_separator == NULL) {
-    free(library_path);
-    return Dart_NewApiError("Cannot find extension library directory");
-  }
-  char* extension_name = last_path_separator + 1;
-
-  *last_path_separator = '\0';  // Terminate library_path at last separator.
-
-  void* library_handle = LoadExtensionLibrary(library_path, extension_name);
+  const char* library_strings[] = { extension_directory, extension_file, NULL };
+  char* library_file = Concatenate(library_strings);
+  void* library_handle = LoadExtensionLibrary(library_file);
+  free(library_file);
   if (library_handle == NULL) {
-    free(library_path);
     return Dart_NewApiError("Cannot find extension library");
   }
 
   const char* strings[] = { extension_name, "_Init", NULL };
   char* init_function_name = Concatenate(strings);
   typedef Dart_Handle (*InitFunctionType)(Dart_Handle import_map);
   InitFunctionType fn = reinterpret_cast<InitFunctionType>(
       ResolveSymbol(library_handle, init_function_name));
   free(init_function_name);
-  free(library_path);
 
   if (fn == NULL) {
     return Dart_NewApiError("Cannot find initialization function in extension");
   }
   return (*fn)(parent_library);
 }
 
 
 // Concatenates a NULL terminated array of strings.
 // The returned string must be freed.
 char* Extensions::Concatenate(const char** strings) {
   int size = 1;  // null termination.
   for (int i = 0; strings[i] != NULL; i++) {
     size += strlen(strings[i]);
   }
   char* result = reinterpret_cast<char*>(malloc(size));
   int index = 0;
   for (int i = 0; strings[i] != NULL; i++) {
     index += snprintf(result + index, size - index, "%s", strings[i]);
   }
   ASSERT(index == size - 1);
   ASSERT(result[size - 1] == '\0');
   return result;
 }
 
 }  // namespace bin
 }  // namespace dart