diff options
Diffstat (limited to 'load.c')
| -rw-r--r-- | load.c | 21 |
1 files changed, 12 insertions, 9 deletions
@@ -32,11 +32,13 @@ this program. If not, see <http://www.gnu.org/licenses/>. */ static load_func_t load_object (const gmk_floc *flocp, int noerror, - const char *ldname, const char *symname) + const char *ldname, const char *symname, void **dlp) { static void *global_dl = NULL; load_func_t symp; + *dlp = NULL; + if (! global_dl) { global_dl = dlopen (NULL, RTLD_NOW|RTLD_GLOBAL); @@ -46,7 +48,6 @@ load_object (const gmk_floc *flocp, int noerror, symp = (load_func_t) dlsym (global_dl, symname); if (! symp) { - void *dlp = NULL; /* If the path has no "/", try the current directory first. */ if (! strchr (ldname, '/') @@ -54,14 +55,14 @@ load_object (const gmk_floc *flocp, int noerror, && ! strchr (ldname, '\\') #endif ) - dlp = dlopen (concat (2, "./", ldname), RTLD_LAZY|RTLD_GLOBAL); + *dlp = dlopen (concat (2, "./", ldname), RTLD_LAZY|RTLD_GLOBAL); /* If we haven't opened it yet, try the default search path. */ - if (! dlp) - dlp = dlopen (ldname, RTLD_LAZY|RTLD_GLOBAL); + if (! *dlp) + *dlp = dlopen (ldname, RTLD_LAZY|RTLD_GLOBAL); /* Still no? Then fail. */ - if (! dlp) + if (! *dlp) { if (noerror) DB (DB_BASIC, ("%s", dlerror())); @@ -70,7 +71,7 @@ load_object (const gmk_floc *flocp, int noerror, return NULL; } - symp = dlsym (dlp, symname); + symp = dlsym (*dlp, symname); if (! symp) fatal (flocp, _("Failed to load symbol %s from %s: %s"), symname, ldname, dlerror()); @@ -80,7 +81,7 @@ load_object (const gmk_floc *flocp, int noerror, } int -load_file (const gmk_floc *flocp, const char **ldname, int noerror) +load_file (const gmk_floc *flocp, const char **ldname, int noerror, void **dlp) { int nmlen = strlen (*ldname); char *new = alloca (nmlen + CSTRLEN (SYMBOL_EXTENSION) + 1); @@ -90,6 +91,8 @@ load_file (const gmk_floc *flocp, const char **ldname, int noerror) int r; load_func_t symp; + *dlp = NULL; + /* Break the input into an object file name and a symbol name. If no symbol name was provided, compute one from the object file name. */ fp = strchr (*ldname, '('); @@ -165,7 +168,7 @@ load_file (const gmk_floc *flocp, const char **ldname, int noerror) DB (DB_VERBOSE, (_("Loading symbol %s from %s\n"), symname, *ldname)); /* Load it! */ - symp = load_object(flocp, noerror, *ldname, symname); + symp = load_object(flocp, noerror, *ldname, symname, dlp); if (! symp) return 0; |