Update.cvs/libc-ud-970802

1997-08-02 21:27  Ulrich Drepper  <drepper@cygnus.com>

	* inet/Makefile (headers): Rename netinet/inbits.h to bits/in.h.
	* inet/netinet/in.h: Include bits/in.h instead of netinet/inbits.h.
	* sysdeps/generic/netinet/inbits.h: Move to...
	* sysdeps/generic/bits/in.h: ... here.
	* sysdeps/unix/sysv/linux/bits/inbits.h: Move to ...
	* sysdeps/unix/sysv/linux/bits/in.h: ... here.

	* nis/Makefile (headers): Add bits/nislib.h.
	* nis/rpcsvc/nislib.h: Moved to ....
	* nis/bits/nislib.h: ... here.

	* nis/nss_compat/compat-grp.c: Don't include <rpcsvc/nislib.h>.
	* nis/nss_compat/compat-pwd.c: Likewise.
	* nis/nss_compat/compat-spwd.c: Likewise.
	* nis/nss_nisplus/nisplus-alias.c: Likewise.
	* nis/nss_nisplus/nisplus-ethers.c: Likewise.
	* nis/nss_nisplus/nisplus-grp.c: Likewise.
	* nis/nss_nisplus/nisplus-hosts.c: Likewise.
	* nis/nss_nisplus/nisplus-netgrp.c: Likewise.
	* nis/nss_nisplus/nisplus-ntework.c: Likewise.
	* nis/nss_nisplus/nisplus-proto.c: Likewise.
	* nis/nss_nisplus/nisplus-publickey.c: Likewise.
	* nis/nss_nisplus/nisplus-pwd.c: Likewise.
	* nis/nss_nisplus/nisplus-rpc.c: Likewise.
	* nis/nss_nisplus/nisplus-service.c: Likewise.
	* nis/nss_nisplus/nisplus-spwd.c: Likewise.

	* nis/rpcsvc/nis.x: Include bits/nislib.h, not rpcsvc/nislib.h.
	* nis/rpcsvc/nis.h: Likewise.

	* inet/getnameinfo.c (nrl_domainname): Change return type to const
	char *.
	(getnameinfo): Change type of local variable c to const char *.

	* inet/inet_ntoa.c: Rewrite to use __libc_once for initialization.
	* stdlib/fmtmsg.c: Likewise.

	* intl/bindtextdom.c: Update from latest gettext.
	* intl/dcgettext.c: Likewise.
	* intl/finddomain.c: Likewise.
	* intl/l10nflist.c: Likewise.
	* intl/localealias.c: Likewise.
	* intl/textdomain.c: Likewise.

	* login/getutid_r.c: Remove parameter to setutent call.
	* login/getutline_r.c: Likewise.

	* posix/wordexp.c: Complete rewrite.  Not fully implemented yet,
	though.  Patch by Tim Waugh <tim@cyberelk.demon.co.uk>.

	* stdio-common/printf_fp.c: Remove relative include paths.
	* stdio-common/printf_fphex.c: Likewise.

	* sysdeps/generic/crypt.h: Cleanup.  Don't define non standard
	elements unless __USE_GNU.

	* sysdeps/generic/vlimit.c: Pretty print.
	* sysdeps/generic/vtimes.c: Likewise.

	* sysdeps/i386/elf/bsd-_setjmp.S: New file.  Empty dummy file.
	* sysdeps/i386/elf/bsd-setjmp.S: New file.  Empty dummy file.
	* sysdeps/i386/elf/setjmp.S: New file.  Define __setjmp and also
	weak definitions of setjmp and _setjmp.

	* sysdeps/i386/fpu/bits/mathinline.h: More patches by John Bowman.

	* sysdeps/stub/if_index.h: Set errno in all functions and add
	stub warnings.

	* sysdeps/stub/libc-lock.h: Add __libc_once.

1997-08-02 01:57  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/ptrace.c: Don't set errno in error
	case since the __syscall_ptrace call already did this.
	Reported by Philip Gladstone <philip@talon.raptor.com>.

1997-07-29  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* sysdeps/unix/sysv/linux/sys/fsuid.h: Change include
	<gnu/types.h> to <sys/types.h>.

1997-08-01 23:18  Ulrich Drepper  <drepper@cygnus.com>

	* csu/defs.awk: Fix regexp for end and align.
	Patch by Klaus Espenlaub <kespenla@hydra.informatik.uni-ulm.de>.

	* locale/programs/localedef.c (print_escaped): New function.
	(show_info): Use print_escaped if strings can control unprintable
	characters.
	Patch by Jochen Hein <jochen.hein@delphi.central.de>.

1997-08-01 18:45  Thorsten Kukuk  <kukuk@vt.uni-paderborn.de>

	* nis/nss_nisplus/nisplus-alias.c: Fix NULL pointer problems
	* nis/nss_nisplus/nisplus-grp.c: Likewise.

1997-07-31  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* elf/dl-profile.c (_dl_start_profile): Use _dl_sysdep_error
	instead of fprintf.

1997-07-31  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* manual/socket.texi (Host Address Functions): Fix arguments of
	@deftypefun.

1997-07-31  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* elf/dl-runtime.c: Avoid warning about profile_fixup being
	unused.

	* sysdeps/m68k/dl-machine.h: Add support for shared library
	profiling.

1997-07-31  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* md5-crypt/Makefile (extra-objs): Add onlymd5-crypt.o for
	dependencies.

1997-07-31  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* Make-dist (subdirs): Distribute both aout and elf.

1997-07-31 23:04  Mark Kettenis  <kettenis@phys.uva.nl>

	* login/utmp-private.h: Remove reset argument from backend
	setutent.
	* login/getutent_r.c (__setutent): Allways call the setutent
	function in the daemon backend.
	(setutent_unknown): Function removed.
	(getutent_unknown, pututline_unknown): Call __setutent instead of
	setutent_unknown.
	* login/utmp_file.c (setutent_file): Removed reset argument.  All
	callers changed.
	* login/utmp_daemon.c (setutent_daemon): Removed reset
	argument.  All callers changed.  Try to open connection even if a
	previous connection failed, but first check if the sockets exist
	in the filesystem.

	* login/utmp_daemon.c (pututline_daemon): Try to open connection
	before reporting failure.

	* login/programs/database.c (open_database): Create compatibility
	file if it does not already exist.  Supply mode argument in open
	calls to guarantee that created files have the proper protection.

	* login/programs/utmpd.c (main): Remove files created by a
	previous `bind' before creating sockets.
	Suggested by a sun <asum@zoology.washington.edu>.

1997-07-29  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* math/libm-test.c: Remove unneeded function check_int_exec.

	* BUGS: Correct typos.

	* gmon/gmon.c: Add alias for monstartup, declare _strerror_internal.

1997-07-30  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* manual/socket.texi (Host Address Functions): Reformat inet_ntop
	entry to confirm with expected behaviour of some scripts.

	* libc.map: Add functions/variables in global namespace,
	remove wildcards.

1997-07-29  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* resolv/libresolv.map: Add variables and routines used by named,
	nslookup and other bind utils.
	* libc.map: Likewise.

1997-07-31 00:35  Philip Blundell  <Philip.Blundell@pobox.com>

	* sysdeps/unix/sysv/linux/if_index.c: Rewrite to avoid using /proc
	filesystem.
	* inet/test_ifindex.c: New file.
	* inet/Makefile (tests): Add test_ifindex.

1997-08-01 04:25  Ulrich Drepper  <drepper@cygnus.com>

	* nis/nss_nisplus/nisplus-parser.c: Fix another bug in the parser.
	Patch by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>.

	* manual/errno.texi: Fix typo.
	Reported by Erik Talvola <etalvo@sapient.com>.

	(write_hist): Remove dependency on 32 bit int.

4 files changed, 128 insertions, 92 deletions

diff --git a/sysdeps/unix/sysv/linux/netinet/inbits.h b/sysdeps/unix/sysv/linux/bits/in.h
index 0dd94bef96..0dd94bef96 100644
--- a/sysdeps/unix/sysv/linux/netinet/inbits.h
+++ b/sysdeps/unix/sysv/linux/bits/in.h
diff --git a/sysdeps/unix/sysv/linux/if_index.c b/sysdeps/unix/sysv/linux/if_index.c
index fc3bd3324f..41bd0535c9 100644
--- a/sysdeps/unix/sysv/linux/if_index.c
+++ b/sysdeps/unix/sysv/linux/if_index.c
@@ -20,121 +20,158 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <net/if.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <bits/libc-lock.h>
 
-#define IF_INET6_FILENAME   "/proc/net/if_inet6"
-
-/* /proc/net/if_inet6 contains lines that look like this:
- *
- * fe8000000000000000000000836fc168 0b 00 20 80     sit7
- *
- *                               |   |  |  |  |      |
- *                     address --'   |  |  |  |      |
- *                     index --------'  |  |  |      |
- *                     prefix length ---'  |  |      |
- *                     scope --------------'  |      |
- *                     flags -----------------'      |
- *                     name -------------------------'
- *
- */
-
-static int get_one_interface(FILE *fd, char *interface, int iflen, unsigned int *index)
+/* Try to get a socket to talk to the kernel.  */
+static int
+opensock (void)
 {
-  char buffer[80];
-  static char seps[] = " \012";
-  char *c = buffer;
-  char *sp;
-  if (!fgets(buffer, 80, fd))
-    return 1;
-  if (strtok_r(buffer, seps, &sp) == NULL) return 1;
-  if (c = strtok_r(NULL, seps, &sp), c == NULL) return 1;
-  *index = strtoul(c, NULL, 16);
-  if (strtok_r(NULL, seps, &sp) == NULL) return 1;
-  if (strtok_r(NULL, seps, &sp) == NULL) return 1;
-  if (strtok_r(NULL, seps, &sp) == NULL) return 1;
-  if (c = strtok_r(NULL, seps, &sp), c == NULL) return 1;
-  strncpy(interface, c, iflen);
-  return 0;
-}
+  /* Cache the last AF that worked, to avoid many redundant calls to
+     socket().  */
+  static int sock_af = -1;
+  int fd = -1;
+  __libc_lock_define_initialized (static, lock);
 
-unsigned int if_nametoindex(const char *ifname)
-{
-  FILE *fd = fopen(IF_INET6_FILENAME, "r");
-  char this_ifname[IFNAMSIZ];
-  unsigned int this_index;
-  if (!fd) return 0;
-  while (get_one_interface(fd, this_ifname, IFNAMSIZ, &this_index) == 0) {
-    if (!strcmp(this_ifname, ifname)) {
-      fclose(fd);
-      return this_index;
+  if (sock_af != -1)
+    {
+      fd = socket (sock_af, SOCK_DGRAM, 0);
+      if (fd != -1)
+        return fd;
+    }
+
+  __libc_lock_lock (lock);
+
+  if (sock_af != -1)
+    fd = socket (sock_af, SOCK_DGRAM, 0);
+
+  if (fd == -1)
+    {
+      fd = socket (sock_af = AF_INET6, SOCK_DGRAM, 0);
+      if (fd < 0)
+	fd = socket (sock_af = AF_INET, SOCK_DGRAM, 0);
+      if (fd < 0)
+	fd = socket (sock_af = AF_IPX, SOCK_DGRAM, 0);
+      if (fd < 0)
+	fd = socket (sock_af = AF_AX25, SOCK_DGRAM, 0);
+      if (fd < 0)
+	fd = socket (sock_af = AF_APPLETALK, SOCK_DGRAM, 0);
     }
-  }
-  fclose(fd);
-  return 0;
+
+  __libc_lock_unlock (lock);
+  return fd;
 }
 
-char *if_indextoname(unsigned int ifindex, char *ifname)
+unsigned int
+if_nametoindex (const char *ifname)
 {
-  FILE *fd = fopen(IF_INET6_FILENAME, "r");
-  unsigned int this_index;
-  if (!fd) return NULL;
-  while (get_one_interface(fd, ifname, IFNAMSIZ, &this_index) == 0) {
-    if (this_index == ifindex) {
-      fclose(fd);
-      return ifname;
+  struct ifreq ifr;
+  int fd = opensock ();
+
+  if (fd < 0)
+    return 0;
+
+  strncpy (ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
+  if (ioctl (fd, SIOGIFINDEX, &ifr) < 0)
+    {
+      close (fd);
+      return 0;
     }
-  }
-  fclose(fd);
-  return NULL;
+  close (fd);
+  return ifr.ifr_ifindex;
 }
 
-void if_freenameindex(struct if_nameindex *ifn)
+void
+if_freenameindex (struct if_nameindex *ifn)
 {
   struct if_nameindex *ptr = ifn;
   while (ptr->if_name || ptr->if_index)
     {
       if (ptr->if_name)
-	free(ptr->if_name);
-      ptr++;
+	free (ptr->if_name);
+      ++ptr;
     }
-  free(ifn);
+  free (ifn);
 }
 
-struct if_nameindex *if_nameindex(void)
+struct if_nameindex *
+if_nameindex (void)
 {
-  FILE *fd = fopen(IF_INET6_FILENAME, "r");
-  struct if_nameindex *ifn = NULL;
-  int nifs = 0;
-  if (!fd) return NULL;
+  int fd = opensock ();
+  struct ifconf ifc;
+  unsigned int rq_ifs = 4, nifs, i;
+  struct if_nameindex *idx = NULL;
+
+  if (fd < 0)
+    return NULL;
+
+  ifc.ifc_buf = NULL;
+
+  /* Read all the interfaces out of the kernel.  */
   do
     {
-      struct if_nameindex *newifn;
-      nifs++;
-      newifn = realloc(ifn, nifs*sizeof(struct if_nameindex));
-      if (!newifn)
+      rq_ifs *= 2;
+      ifc.ifc_len = rq_ifs * sizeof (struct ifreq);
+      ifc.ifc_buf = realloc (ifc.ifc_buf, ifc.ifc_len);
+      if (ifc.ifc_buf == NULL)
 	{
-	  /* We ran out of memory. */
-	  if (--nifs)
-	    {
-	      free(ifn[nifs-1].if_name);
-	      ifn[nifs-1].if_name = 0;
-	      ifn[nifs-1].if_index = 0;
-	      if_freenameindex(ifn);
-	    }
+	  close(fd);
 	  return NULL;
 	}
-      ifn = newifn;
-      ifn[nifs-1].if_index = 0;
-      ifn[nifs-1].if_name = malloc(IFNAMSIZ);
-      if (ifn[nifs-1].if_name == NULL)
+      if (ioctl (fd, SIOCGIFCONF, &ifc) < 0)
+	goto jump;
+    }
+  while ((unsigned int) ifc.ifc_len == (rq_ifs * sizeof (struct ifreq)));
+
+  nifs = ifc.ifc_len / sizeof (struct ifreq);
+  ifc.ifc_buf = realloc (ifc.ifc_buf, ifc.ifc_len);
+
+  idx = malloc ((nifs+1) * sizeof (struct if_nameindex));
+  if (idx == NULL)
+    goto jump;
+
+  for (i = 0; i < nifs; ++i)
+    {
+      struct ifreq *ifr = &ifc.ifc_req[i];
+      if ((idx[i].if_name = malloc (strlen (ifr->ifr_name)+1)) == NULL)
 	{
-	  if_freenameindex(ifn);
-	  return NULL;
+	  free (idx);
+	  idx = NULL;
+	  goto jump;
+	}
+      strcpy (idx[i].if_name, ifr->ifr_name);
+      if (ioctl (fd, SIOGIFINDEX, ifr) < 0)
+	{
+	  free (idx);
+	  idx = NULL;
+	  goto jump;
 	}
+      idx[i].if_index = ifr->ifr_ifindex;
     }
-  while (get_one_interface(fd, ifn[nifs-1].if_name, IFNAMSIZ,
-			   &ifn[nifs-1].if_index) == 0);
-  free(ifn[nifs-1].if_name);
-  ifn[nifs-1].if_name = NULL;
-  fclose(fd);
-  return ifn;
+  idx[i].if_index = 0;
+  idx[i].if_name = NULL;
+
+jump:
+  free (ifc.ifc_buf);
+  close (fd);
+  return idx;
+}
+
+char *
+if_indextoname (unsigned int ifindex, char *ifname)
+{
+  struct if_nameindex *idx = if_nameindex ();
+  struct if_nameindex *p;
+
+  for (p = idx; p->if_index || p->if_name; ++p)
+    if (p->if_index == ifindex)
+      {
+	strncpy (ifname, p->if_name, IFNAMSIZ);
+	if_freenameindex (idx);
+	return ifname;
+      }
+
+  if_freenameindex (idx);
+  return NULL;
 }
diff --git a/sysdeps/unix/sysv/linux/ptrace.c b/sysdeps/unix/sysv/linux/ptrace.c
index 9f8053b0f0..b50234d2a1 100644
--- a/sysdeps/unix/sysv/linux/ptrace.c
+++ b/sysdeps/unix/sysv/linux/ptrace.c
@@ -52,6 +52,5 @@ ptrace (enum __ptrace_request request, ...)
       return res;
     }
 
-  __set_errno (-res);
   return -1;
 }
diff --git a/sysdeps/unix/sysv/linux/sys/fsuid.h b/sysdeps/unix/sysv/linux/sys/fsuid.h
index 8185b95724..fd30542e9f 100644
--- a/sysdeps/unix/sysv/linux/sys/fsuid.h
+++ b/sysdeps/unix/sysv/linux/sys/fsuid.h
@@ -20,7 +20,7 @@
 #define _SYS_FSUID_H	1
 
 #include <features.h>
-#include <gnu/types.h>
+#include <sys/types.h>
 
 __BEGIN_DECLS