fgetws implementation.

[kopensolaris-gnu/glibc.git] / elf / dl-init.c

diff --git a/elf/dl-init.c b/elf/dl-init.c
index 30d0016..64aa1ce 100644 (file)
--- a/elf/dl-init.c
+++ b/elf/dl-init.c
@@ -1,5 +1,5 @@
 /* Return the next shared object initializer function not yet run.
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -18,14 +18,15 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <stddef.h>
-#include <link.h>
+#include <elf/ldsodefs.h>
 
 
 /* Run initializers for MAP and its dependencies, in inverse dependency
    order (that is, leaf nodes first).  */
 
 ElfW(Addr)
-_dl_init_next (struct link_map *map)
+internal_function
+_dl_init_next (struct r_scope_elem *searchlist)
 {
   unsigned int i;
 
@@ -33,10 +34,10 @@ _dl_init_next (struct link_map *map)
      dependency order, so processing that list from back to front gets us
      breadth-first leaf-to-root order.  */
 
-  i = map->l_nsearchlist;
+  i = searchlist->r_nlist;
   while (i-- > 0)
     {
-      struct link_map *l = map->l_searchlist[i];
+      struct link_map *l = searchlist->r_list[i];
 
       if (l->l_init_called)
        /* This object is all done.  */
@@ -52,11 +53,18 @@ _dl_init_next (struct link_map *map)
          continue;
        }
 
-      if (l->l_info[DT_INIT] &&
-         !(l->l_name[0] == '\0' && l->l_type == lt_executable))
+      if (l->l_info[DT_INIT]
+         && (l->l_name[0] != '\0' || l->l_type != lt_executable))
        {
          /* Run this object's initializer.  */
          l->l_init_running = 1;
+
+         /* Print a debug message if wanted.  */
+         if (_dl_debug_impcalls)
+           _dl_debug_message (1, "\ncalling init: ",
+                               l->l_name[0] ? l->l_name : _dl_argv[0],
+                               "\n\n", NULL);
+
          return l->l_addr + l->l_info[DT_INIT]->d_un.d_ptr;
        }