Changeset 5035ba05 in mainline for uspace/lib/c/generic/rtld/module.c

Timestamp:

2016-05-02T19:49:51Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

32573ff, 9a08e6b

Parents:

634e020

Message:

Default symbol search vs. dlsym's BFS search.

File:

• uspace/lib/c/generic/rtld/module.c (modified) (6 diffs)

uspace/lib/c/generic/rtld/module.c

@@ -117 +117 @@
                 }
         }
-        
+
         return NULL; /* Not found */
 }
@@ -127 +127 @@
  * Currently this trivially tries to load '/<name>'.
  */
-module_t *module_load(rtld_t *rtld, const char *name)
+module_t *module_load(rtld_t *rtld, const char *name, mlflags_t flags)
 {
         elf_finfo_t info;
@@ -133 +133 @@
         module_t *m;
         int rc;
-        
-        m = malloc(sizeof(module_t));
+
+        m = calloc(1, sizeof(module_t));
         if (!m) {
                 printf("malloc failed\n");
@@ -141 +141 @@
 
         m->rtld = rtld;
+        if ((flags & mlf_local) != 0)
+                m->local = true;
 
         if (str_size(name) > NAME_BUF_SIZE - 2) {
@@ -185 +187 @@
 /** Load all modules on which m (transitively) depends.
  */
-void module_load_deps(module_t *m)
+void module_load_deps(module_t *m, mlflags_t flags)
 {
         elf_dyn_t *dp;
@@ -230 +232 @@
                         dm = module_find(m->rtld, dep_name);
                         if (!dm) {
-                                dm = module_load(m->rtld, dep_name);
-                                module_load_deps(dm);
+                                dm = module_load(m->rtld, dep_name, flags);
+                                module_load_deps(dm, flags);
                         }