fgetws implementation.

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

diff --git a/elf/dl-version.c b/elf/dl-version.c
index 413b3bc..8d59fe2 100644 (file)
--- a/elf/dl-version.c
+++ b/elf/dl-version.c
@@ -1,5 +1,5 @@
 /* Handle symbol and library versioning.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -28,7 +28,9 @@
 #include <assert.h>
 
 
-#define VERSTAG(tag)   (DT_NUM + DT_PROCNUM + DT_VERSIONTAGIDX (tag))
+#ifndef VERSYMIDX
+# define VERSYMIDX(tag)        (DT_NUM + DT_PROCNUM + DT_VERSIONTAGIDX (tag))
+#endif
 
 
 #define make_string(string, rest...) \
@@ -61,9 +63,9 @@ find_needed (const char *name, struct link_map *map)
 
   /* The required object is not in the global scope, look to see if it is
      a dependency of the current object.  */
-  for (n = 0; n < map->l_nsearchlist; n++)
-    if (_dl_name_match_p (name, map->l_searchlist[n]))
-      return map->l_searchlist[n];
+  for (n = 0; n < map->l_searchlist.r_nlist; n++)
+    if (_dl_name_match_p (name, map->l_searchlist.r_list[n]))
+      return map->l_searchlist.r_list[n];
 
   /* Should never happen.  */
   return NULL;
@@ -75,8 +77,7 @@ internal_function
 match_symbol (const char *name, ElfW(Word) hash, const char *string,
              struct link_map *map, int verbose, int weak)
 {
-  const char *strtab = (const char *) (map->l_addr
-                                      + map->l_info[DT_STRTAB]->d_un.d_ptr);
+  const char *strtab = (const void *) map->l_info[DT_STRTAB]->d_un.d_ptr;
   ElfW(Addr) def_offset;
   ElfW(Verdef) *def;
 
@@ -86,19 +87,20 @@ match_symbol (const char *name, ElfW(Word) hash, const char *string,
                       map->l_name[0] ? map->l_name : _dl_argv[0],
                       " required by file ", name, "\n", NULL);
 
-  if (map->l_info[VERSTAG (DT_VERDEF)] == NULL)
+  if (map->l_info[VERSYMIDX (DT_VERDEF)] == NULL)
     {
       /* The file has no symbol versioning.  I.e., the dependent
         object was linked against another version of this file.  We
         only print a message if verbose output is requested.  */
       if (verbose)
-       _dl_signal_error (0, map->l_name, make_string ("\
+       _dl_signal_cerror (0, map->l_name,
+                          make_string ("\
 no version information available (required by ",
-                                                      name, ")"));
+                                       name, ")"));
       return 0;
     }
 
-  def_offset = map->l_info[VERSTAG (DT_VERDEF)]->d_un.d_ptr;
+  def_offset = map->l_info[VERSYMIDX (DT_VERDEF)]->d_un.d_ptr;
   assert (def_offset != 0);
 
   def = (ElfW(Verdef) *) ((char *) map->l_addr + def_offset);
@@ -142,16 +144,16 @@ no version information available (required by ",
   if (weak)
     {
       if (verbose)
-       _dl_signal_error (0, map->l_name,
-                         make_string ("weak version `", string,
-                                      "' not found (required by ", name,
-                                      ")"));
+       _dl_signal_cerror (0, map->l_name,
+                          make_string ("weak version `", string,
+                                       "' not found (required by ", name,
+                                       ")"));
       return 0;
     }
 
-  _dl_signal_error (0, map->l_name,
-                   make_string ("version `", string,
-                                "' not found (required by ", name, ")"));
+  _dl_signal_cerror (0, map->l_name,
+                    make_string ("version `", string,
+                                 "' not found (required by ", name, ")"));
   return 1;
 }
 
@@ -173,10 +175,10 @@ _dl_check_map_versions (struct link_map *map, int verbose)
   /* If we don't have a string table, we must be ok.  */
   if (map->l_info[DT_STRTAB] == NULL)
     return 0;
-  strtab = (const char *) (map->l_addr + map->l_info[DT_STRTAB]->d_un.d_ptr);
+  strtab = (const void *) map->l_info[DT_STRTAB]->d_un.d_ptr;
 
-  dyn = map->l_info[VERSTAG (DT_VERNEED)];
-  def = map->l_info[VERSTAG (DT_VERDEF)];
+  dyn = map->l_info[VERSYMIDX (DT_VERNEED)];
+  def = map->l_info[VERSYMIDX (DT_VERDEF)];
 
   if (dyn != NULL)
     {
@@ -282,8 +284,8 @@ _dl_check_map_versions (struct link_map *map, int verbose)
          map->l_nversions = ndx_high + 1;
 
          /* Compute the pointer to the version symbols.  */
-         map->l_versyms = ((void *) map->l_addr
-                           + map->l_info[VERSTAG (DT_VERSYM)]->d_un.d_ptr);
+         map->l_versyms =
+           (void *) map->l_info[VERSYMIDX (DT_VERSYM)]->d_un.d_ptr;
 
          if (dyn != NULL)
            {