Changes in uspace/lib/c/generic/rtld/symbol.c [9d58539:17341d4] in mainline

File:

• uspace/lib/c/generic/rtld/symbol.c (modified) (7 diffs)

uspace/lib/c/generic/rtld/symbol.c

@@ -39 +39 @@
 
 #include <elf/elf.h>
+#include <rtld/module.h>
 #include <rtld/rtld.h>
 #include <rtld/rtld_debug.h>
@@ -111 +112 @@
  * @param name          Name of the symbol to search for.
  * @param start         Module in which to start the search..
+ * @param flags         @c ssf_none or @c ssf_noroot to not look for the symbol
+ *                      in @a start
  * @param mod           (output) Will be filled with a pointer to the module 
  *                      that contains the symbol.
  */
-elf_symbol_t *symbol_bfs_find(const char *name, module_t *start, module_t **mod)
+elf_symbol_t *symbol_bfs_find(const char *name, module_t *start,
+    symbol_search_flags_t flags, module_t **mod)
 {
         module_t *m, *dm;
@@ -129 +133 @@
 
         /* Mark all vertices (modules) as unvisited */  
-        modules_untag();
+        modules_untag(start->rtld);
 
         /* Insert root (the program) into the queue and tag it */
@@ -145 +149 @@
                 list_remove(&m->queue_link);
 
-                s = def_find_in_module(name, m);
-                if (s != NULL) {
-                        /* Symbol found */
-                        sym = s;
-                        *mod = m;
-                        break;
+                /* If ssf_noroot is specified, do not look in start module */
+                if (m != start || (flags & ssf_noroot) == 0) { 
+                        s = def_find_in_module(name, m);
+                        if (s != NULL) {
+                                /* Symbol found */
+                                sym = s;
+                                *mod = m;
+                                break;
+                        }
                 }
 
@@ -179 +186 @@
 
 
-/** Find the definition of a symbol..
+/** Find the definition of a symbol.
  *
  * By definition in System V ABI, if module origin has the flag DT_SYMBOLIC,
@@ -188 +195 @@
  * @param name          Name of the symbol to search for.
  * @param origin        Module in which the dependency originates.
+ * @param flags         @c ssf_none or @c ssf_noroot to not look for the symbol
+ *                      in the executable program.
  * @param mod           (output) Will be filled with a pointer to the module 
  *                      that contains the symbol.
  */
-elf_symbol_t *symbol_def_find(const char *name, module_t *origin, module_t **mod)
+elf_symbol_t *symbol_def_find(const char *name, module_t *origin,
+    symbol_search_flags_t flags, module_t **mod)
 {
         elf_symbol_t *s;
@@ -210 +220 @@
         /* Not DT_SYMBOLIC or no match. Now try other locations. */
 
-        if (runtime_env->program) {
+        if (origin->rtld->program) {
                 /* Program is dynamic -- start with program as root. */
-                return symbol_bfs_find(name, runtime_env->program, mod);
+                return symbol_bfs_find(name, origin->rtld->program, flags, mod);
         } else {
                 /* Program is static -- start with @a origin as root. */
-                return symbol_bfs_find(name, origin, mod);
+                return symbol_bfs_find(name, origin, ssf_none, mod);
         }
 }