Mon Dec 18 13:40:37 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>cvs/libc-951219

	* stdio/fread.c: Don't increment __offset when it's -1.

	* elf/rtld.c (dl_main): Prepend tab to "statically linked".  Exit
	0 in that case.

	* misc/err.c (vwarnx, vwarn): Fix major brainos.

	* sysdeps/mach/hurd/dl-sysdep.c (mmap): Fix setting of
	inheritance.

1 files changed, 12 insertions, 16 deletions

diff --git a/elf/rtld.c b/elf/rtld.c
index f91ffc77ef..070febc59f 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -301,22 +301,18 @@ of this helper program; chances are you did not intend to run this program.\n",
 	     after relocation.  */
 
 	  if (! _dl_loaded->l_info[DT_NEEDED])
-	    {
-	      _dl_sysdep_message (_dl_loaded->l_name, ": statically linked\n",
-				  NULL);
-	      _exit (1);
-	    }
-
-	  for (l = _dl_loaded->l_next; l; l = l->l_next)
-	    {
-	      char buf[20], *bp;
-	      buf[sizeof buf - 1] = '\0';
-	      bp = _itoa (l->l_addr, &buf[sizeof buf - 1], 16, 0);
-	      while (&buf[sizeof buf - 1] - bp < sizeof l->l_addr * 2)
-		*--bp = '0';
-	      _dl_sysdep_message ("\t", l->l_libname, " => ", l->l_name,
-				  " (0x", bp, ")\n", NULL);
-	    }
+	    _dl_sysdep_message ("\t", "statically linked\n", NULL);
+	  else
+	    for (l = _dl_loaded->l_next; l; l = l->l_next)
+	      {
+		char buf[20], *bp;
+		buf[sizeof buf - 1] = '\0';
+		bp = _itoa (l->l_addr, &buf[sizeof buf - 1], 16, 0);
+		while (&buf[sizeof buf - 1] - bp < sizeof l->l_addr * 2)
+		  *--bp = '0';
+		_dl_sysdep_message ("\t", l->l_libname, " => ", l->l_name,
+				    " (0x", bp, ")\n", NULL);
+	      }
 
 	  _exit (0);
 	}