This is the mail archive of the libc-alpha@sources.redhat.com mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

A patch for elf/dl-deps.c


We should preserve the real error message.


H.J.
----
2001-04-09  H.J. Lu  <hjl@gnu.org>

	* elf/dl-deps.c (_dl_map_object_deps): Preserve the real error
	message.

--- elf/dl-deps.c.error	Tue Feb 27 22:22:09 2001
+++ elf/dl-deps.c	Mon Apr  9 12:10:31 2001
@@ -145,6 +145,7 @@ _dl_map_object_deps (struct link_map *ma
   const char *name;
   int errno_saved;
   int errno_reason;
+  const char *errstring = NULL;
 
   auto inline void preload (struct link_map *map);
 
@@ -236,7 +237,6 @@ _dl_map_object_deps (struct link_map *ma
 		/* Allocate new entry.  */
 		struct list *newp;
 		const char *objname;
-		const char *errstring;
 
 		/* Recognize DSTs.  */
 		name = expand_dst (l, strtab + d->d_un.d_val, 0);
@@ -281,7 +281,6 @@ _dl_map_object_deps (struct link_map *ma
 	    else if (d->d_tag == DT_AUXILIARY || d->d_tag == DT_FILTER)
 	      {
 		const char *objname;
-		const char *errstring;
 		struct list *newp;
 
 		/* Recognize DSTs.  */
@@ -581,5 +580,6 @@ out:
 
   if (errno_reason)
     _dl_signal_error (errno_reason == -1 ? 0 : errno_reason,
-		      name ?: "", N_("cannot load shared object file"));
+		      name ?: "",
+		      errstring ?: N_("cannot load shared object file"));
 }


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]