Update.

1999-02-06  Ulrich Drepper  <drepper@cygnus.com>

	* Versions.def: Add versions for ld.so.
	* csu/Versions: Remove __libc_stack_end here.
	* elf/Versions: Split libc definitions in libc and ld.so definitions.
	* elf/Makefile (ld-map): Change to ld.so.map.
	* scripts/versions.awk: Recognize dot in library names.

	* ctype/ctype.h: Remove definitions of __tolower and __toupper.
	Don't use __tolower and __toupper in inline functions.
	Add optimizing macros for tolower and toupper.
	* ctype/ctype-extn.c (_tolower): Don't use __tolower.
	(_toupper): Don't use __toupper.
	* ctype/ctype.c (tolower): Don't use __tolower.
	(toupper): Don't use toupper.

	* nscd/cache.c (prune_cache): Correct printing of debugging messages.

	* resolv/Versions (libresolv): Export __ns_name_unpack and
	__ns_name_ntop.
	* resolv/res_comp.c: Rename ns_name_unpack to __ns_name_unpack and
	make it global.  Change all users.  Similar for ns_name_ntop.
	* resolv/nss_dns/dns-host.c: Don't use dn_expand when extracting in
	user-provided buffer.  Use __ns_name_unpack and __ns_name_ntop
	directly to detect too small buffer.
	* stdio-common/Makefile (tests): Add scanf12.
	* stdio-common/scanf12.c: New file.
	* stdio-common/scanf12.input: New file.
	* stdio-common/vfscanf.c (__vfscanf): Handle +/- at beginning of
	floating-point correctly if the number is invalid.
	* stdio-common/vfscanf.c: Don't use non-reentrant multibyte conversion
	* stdio-common/printf_fphex.c: Likewise.
	* stdio-common/vfprintf.c: Likewise.
See ChangeLog.9 for earlier changes.

3 files changed, 41 insertions, 10 deletions

diff --git a/nscd/cache.c b/nscd/cache.c
index 4ab83db..dbc89fb 100644
--- a/nscd/cache.c
+++ b/nscd/cache.c
@@ -225,10 +225,23 @@ prune_cache (struct database *table, time_t now)
 	  struct hashentry *old = head;
 
 	  if (debug_level > 0)
-	    dbg_log ("remove %s entry \"%s\"",
-		     serv2str[old->type],
-		     old->last
-		     ? old->key : old->data == (void *) -1 ? old->key : "???");
+	    {
+	      char buf[INET6_ADDRSTRLEN];
+	      const char *str;
+
+	      if ((old->type == GETHOSTBYADDR || old->type == GETHOSTBYADDRv6)
+		  && (old->last || old->data == (void *) -1))
+		{
+		  inet_ntop (old->type == GETHOSTBYADDR ? AF_INET : AF_INET6,
+			     old->key, buf, sizeof (buf));
+		  str = buf;
+		}
+	      else
+		str = old->last ? old->key : (old->data == (void *) -1
+					      ? old->key : "???");
+
+	      dbg_log ("remove %s entry \"%s\"", serv2str[old->type], str);
+	    }
 
 	  /* Free the data structures.  */
 	  if (old->data == (void *) -1)
diff --git a/nscd/connections.c b/nscd/connections.c
index 591e300..ca139fb 100644
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -1,5 +1,5 @@
 /* Inner loops of cache daemon.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -24,6 +24,7 @@
 #include <pthread.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <arpa/inet.h>
 #include <sys/param.h>
 #include <sys/poll.h>
 #include <sys/socket.h>
@@ -214,7 +215,19 @@ cannot handle old request version %d; current version is %d"),
       struct database *db = &dbs[serv2db[req->type]];
 
       if (debug_level > 0)
-	dbg_log ("\t%s (%s)", serv2str[req->type], key);
+	{
+	  if (req->type == GETHOSTBYADDR || req->type == GETHOSTBYADDRv6)
+	    {
+	      char buf[INET6_ADDRSTRLEN];
+
+	      dbg_log ("\t%s (%s)", serv2str[req->type],
+		       inet_ntop (req->type == GETHOSTBYADDR
+				  ? AF_INET : AF_INET6,
+				  key, buf, sizeof (buf)));
+	    }
+	  else
+	    dbg_log ("\t%s (%s)", serv2str[req->type], key);
+	}
 
       /* Is this service enabled?  */
       if (!db->enabled)
diff --git a/nscd/hstcache.c b/nscd/hstcache.c
index 4e3af9c..1545975 100644
--- a/nscd/hstcache.c
+++ b/nscd/hstcache.c
@@ -1,5 +1,5 @@
 /* Cache handling for host lookup.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -324,7 +324,7 @@ addhstbyaddr (struct database *db, int fd, request_header *req, void *key)
 
   if (debug_level > 0)
     {
-      char buf[64];
+      char buf[INET_ADDRSTRLEN];
       dbg_log (_("Haven't found \"%s\" in hosts cache!"),
 	       inet_ntop (AF_INET, key, buf, sizeof (buf)));
     }
@@ -356,7 +356,12 @@ addhstbynamev6 (struct database *db, int fd, request_header *req, void *key)
   struct hostent *hst;
 
   if (debug_level > 0)
-    dbg_log (_("Haven't found \"%s\" in hosts cache!"), key);
+    {
+      char buf[INET6_ADDRSTRLEN];
+
+      dbg_log (_("Haven't found \"%s\" in hosts cache!"),
+	       inet_ntop (AF_INET6, key, buf, sizeof (buf)));
+    }
 
   while (gethostbyname2_r (key, AF_INET6, &resultbuf, buffer, buflen, &hst,
 			   &h_errno) != 0
@@ -386,7 +391,7 @@ addhstbyaddrv6 (struct database *db, int fd, request_header *req, void *key)
 
   if (debug_level > 0)
     {
-      char buf[64];
+      char buf[INET6_ADDRSTRLEN];
       dbg_log (_("Haven't found \"%s\" in hosts cache!"),
 	       inet_ntop (AF_INET6, key, buf, sizeof (buf)));
     }