Changes in uspace/lib/c/generic/dlfcn.c [153c7a29:c6f1eb05] in mainline

File:

• uspace/lib/c/generic/dlfcn.c (modified) (3 diffs)

uspace/lib/c/generic/dlfcn.c

@@ -42 +42 @@
 
 #include <rtld/module.h>
-#include <rtld/rtld.h>
 #include <rtld/symbol.h>
 
@@ -49 +48 @@
         module_t *m;
 
-        m = module_find(runtime_env, path);
+        if (runtime_env == NULL) {
+                printf("Dynamic linker not set up -- initializing.\n");
+                rtld_init_static();
+        }
+
+        printf("dlopen(\"%s\", %d)\n", path, flag);
+
+        printf("module_find('%s')\n", path);
+        m = module_find(path);
         if (m == NULL) {
-                m = module_load(runtime_env, path, mlf_local);
-                module_load_deps(m, mlf_local);
+                printf("NULL. module_load('%s')\n", path);
+                m = module_load(path);
+                printf("module_load_deps(m)\n");
+                module_load_deps(m);
                 /* Now relocate. */
+                printf("module_process_relocs(m)\n");
                 module_process_relocs(m);
+        } else {
+                printf("not NULL\n");
         }
 
@@ -68 +80 @@
         module_t *sm;
 
+        printf("dlsym(0x%lx, \"%s\")\n", (long)mod, sym_name);
         sd = symbol_bfs_find(sym_name, (module_t *) mod, &sm);
         if (sd != NULL) {
-                return symbol_get_addr(sd, sm, __tcb_get());
+                return symbol_get_addr(sd, sm);
         }