Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 #include "bin/extensions.h" | 5 #include "bin/extensions.h" |
| 6 #include <dlfcn.h> | 6 #include <dlfcn.h> |
| 7 | 7 |
| 8 void* Extensions::LoadExtensionLibrary(const char* library_name) { | 8 void* Extensions::LoadExtensionLibrary(const char* library_path, |
| 9 const char* strings[4] = { "./lib", library_name, ".so", NULL }; | 9 const char* extension_name) { |
| 10 char* library_path = Concatenate(strings); | 10 const char* strings[5] = { library_path, "/lib", |
|
Mads Ager (google)
2012/03/15 08:44:09
Does this work if library_path is the empty string
Bill Hesse
2012/03/15 13:08:54
The library_path should always be an absolute file
| |
| 11 void* lib_handle = dlopen(library_path, RTLD_LAZY); | 11 extension_name, ".so", NULL }; |
| 12 free(library_path); | 12 char* library_file = Concatenate(strings); |
| 13 void* lib_handle = dlopen(library_file, RTLD_LAZY); | |
| 14 free(library_file); | |
| 13 return lib_handle; | 15 return lib_handle; |
| 14 } | 16 } |
| 15 | 17 |
| 16 void* Extensions::ResolveSymbol(void* lib_handle, const char* symbol) { | 18 void* Extensions::ResolveSymbol(void* lib_handle, const char* symbol) { |
| 17 void* result = dlsym(lib_handle, symbol); | 19 void* result = dlsym(lib_handle, symbol); |
| 18 if (dlerror() != NULL) return NULL; | 20 if (dlerror() != NULL) return NULL; |
| 19 return result; | 21 return result; |
| 20 } | 22 } |
| OLD | NEW |