Update. cvs/libc-ud-970819

1997-08-20 05:30  Ulrich Drepper  <drepper@cygnus.com>

	* catgets/catgets.c (catclose): Use __munmap instead of munmap.
	* catgets/gencat.c (read_input_file): Fix typo.

	* dirent/dirent.h: Make seekdir and telldir available for __USE_XOPEN.

	* elf/dl-load.c: Fix case of missing DT_RPATH in object which gets
	executed (e.g., when it is a static binary).

	* intl/bindtextdomain.c: Use strdup in glibc.  Correct comment.
	* intl/dcgettext.c: Likewise.
	* intl/dgettext.c: Likewise.
	* intl/explodename.c: Likewise.
	* intl/finddomain.c: Likewise.
	* intl/gettext.c: Likewise.
	* intl/gettext.h: Likewise.
	* intl/hash-string.h: Likewise.
	* intl/l10nflist.c: Likewise.
	* intl/libintl.h: Likewise.
	* intl/loadinfo.h: Likewise.
	* intl/loadmsgcat.c: Likewise.
	* intl/localealias.c: Likewise.
	* intl/textdomain.c: Likewise.

	Unify libio sources with code in libg++.
	* libio/fcloseall.c: Update and reformat copyright.  Protect use
	of weak_alias.  Use _IO_* thread macros instead of __libc_*.
	* libio/feof.c: Likewise.
	* libio/feof_u.c: Likewise.
	* libio/ferror.c: Likewise.
	* libio/ferror_u.c: Likewise.
	* libio/fgetc.c: Likewise.
	* libio/filedoalloc.c: Likewise.
	* libio/fileno.c: Likewise.
	* libio/fileops.c: Likewise.
	* libio/fputc.c: Likewise.
	* libio/fputc_u.c: Likewise.
	* libio/freopen.c: Likewise.
	* libio/fseek.c: Likewise.
	* libio/genops.c: Likewise.
	* libio/getc.c: Likewise.
	* libio/getc_u.c: Likewise.
	* libio/getchar.c: Likewise.
	* libio/getchar_u.c: Likewise.
	* libio/iofclose.c: Likewise.
	* libio/iofdopen.c: Likewise.
	* libio/iofflush.c: Likewise.
	* libio/iofflush_u.c: Likewise.
	* libio/iofgetpos.c: Likewise.
	* libio/iofgets.c: Likewise.
	* libio/iofopen.c: Likewise.
	* libio/iofopncook.c: Likewise.
	* libio/iofprintf.c: Likewise.
	* libio/iofputs.c: Likewise.
	* libio/iofread.c: Likewise.
	* libio/iofsetpos.c: Likewise.
	* libio/ioftell.c: Likewise.
	* libio/iofwrite.c: Likewise.
	* libio/iogetdelim.c: Likewise.
	* libio/iogetline.c: Likewise.
	* libio/iogets.c: Likewise.
	* libio/iopadn.c: Likewise.
	* libio/iopopen.c: Likewise.
	* libio/ioputs.c: Likewise.
	* libio/ioseekoff.c: Likewise.
	* libio/ioseekpos.c: Likewise.
	* libio/iosetbuffer.c: Likewise.
	* libio/iosetvbuf.c: Likewise.
	* libio/iosprintf.c: Likewise.
	* libio/ioungetc.c: Likewise.
	* libio/iovdprintf.c: Likewise.
	* libio/iovsprintf.c: Likewise.
	* libio/iovsscanf.c: Likewise.
	* libio/libio.h: Likewise.
	* libio/libioP.h: Likewise.
	* libio/obprintf.c: Likewise.
	* libio/pclose.c: Likewise.
	* libio/peekc.c: Likewise.
	* libio/putc.c: Likewise.
	* libio/putchar.c: Likewise.
	* libio/rewind.c: Likewise.
	* libio/setbuf.c: Likewise.
	* libio/setlinebuf.c: Likewise.
	* libio/stdfiles.c: Likewise.
	* libio/stdio.c: Likewise.
	* libio/strfile.h: Likewise.
	* libio/strops.c: Likewise.
	* libio/vasprintf.c: Likewise.
	* libio/vscanf.c: Likewise.
	* libio/vsnprintf.c: Likewise.

	* manual/libc.texinfo: Add menu entries for chapter on message
	translation.
	* manual/locale.texi: Correct next entry in @node for new chapter.
	* manual/search.texi: Likewise for previous link.
	* manual/message.texi: New file.
	* manual/startup.texi: Document LC_ALL, LC_MESSAGES, NLSPATH,
	setenv, unsetenv, and clearenv.
	* manual/string.texi: Fix typos.  Patch by Jim Meyering.

	* math/Makefile (test-longdouble-yes): Enable.  We want long double
	tests now.

	Crusade against strcat.
	* nis/nss_nisplus/nisplus-publickey.c: Remove uses of strcat.
	* stdlib/canonicalize.c: Likewise.

	* posix/glob.h: Define __const if necessary.  Use __const in all
	prototypes.

	* sysdeps/generic/stpcpy.c: Use K&R form to allow use in other
	GNU packages.

	* posix/wordexp.c: Completely reworked buffer handling for much
	better performance.  Patch by Tim Waugh.

	* socket/sys/sochet.h (getpeername): Fix type of LEN parameter,
	it must be socklen_t.

	* sysdeps/libm-i387/e_remainder.S: Pretty print.
	* sysdeps/libm-i387/e_remainderf.S: Likewise.
	* sysdeps/libm-i387/e_remainderl.S: Pop extra value for FPU stack.
	* sysdeps/libm-i387/s_cexp.S: Little optimization.
	* sysdeps/libm-i387/s_cexpl.S: Likewise.
	* sysdep/libm-ieee754/s_csinhl.c: Include <fenv.h>.

1997-08-18 15:21  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/if_index.c (if_nameindex): Fix memory leak
	in cleanup code.

1997-08-17  Paul Eggert  <eggert@twinsun.com>

	* tzset.c (__tzset_internal): Fix memory leak when the user
	specifies a TZ value that uses a default rule file.
	Do not assume US DST rules when the user specifies
	that there is no DST.

1997-08-10 19:17  Philip Blundell  <Philip.Blundell@pobox.com>

	* inet/getnameinfo.c: Tidy up.
	* sysdeps/posix/getaddrinfo.c: Likewise.

	* sysdeps/unix/sysv/linux/if_index.c (if_nametoindex): Return 0 if
	using stub code.
	(if_indextoname): Use SIOGIFNAME ioctl if the kernel supports it.
	(if_nameindex): Use alloca() rather than malloc(); use
	SIOCGIFCOUNT ioctl if the kernel supports it.

1997-08-16  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/unix/sysv/linux/sys/mount.h: Remove the IS_* macros,
	they operate on internal kernel structures and have no place in a
	user header.

1997-08-16  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* Makerules (lib%.so): Depend on $(+preinit) and $(+postinit).
	(build-shlib): Filter them out of $^.

1997-08-15  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* elf/dl-error.c (_dl_signal_error): Fix error message.

1997-08-16 04:06  Ulrich Drepper  <drepper@cygnus.com>

	* assert/assert.h [__USE_GNU]: Undefine assert_perror.
	Reported by Theodore C. Belding <Ted.Belding@umich.edu>.

1997-08-13  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* Makeconfig: Change object suffixes from *.[spgb]o to *.o[spgb]
	to avoid conflict with PO files.
	* Makerules: Likewise.
	* Rules: Likewise.
	* elf/Makefile: Likewise.
	* extra-lib.mk: Likewise.
	* gmon/Makefile: Likewise.
	* nis/Makefile: Likewise.
	* nss/Makefile: Likewise.
	* resolv/Makefile: Likewise.
	* rpm/Makefile: Likewise.
	* sunrpc/Makefile: Likewise.
	* sysdeps/sparc/elf/Makefile: Likewise.
	* sysdeps/sparc64/elf/Makefile: Likewise.
	* sysdeps/unix/sysv/linux/sparc/Makefile: Likewise.
	(ASFLAGS-.os): Renamed from as-FLAGS.os.

13 files changed, 532 insertions, 548 deletions

diff --git a/sysdeps/generic/stpcpy.c b/sysdeps/generic/stpcpy.c
index f010179e08..9800ace993 100644
--- a/sysdeps/generic/stpcpy.c
+++ b/sysdeps/generic/stpcpy.c
@@ -18,9 +18,15 @@
 
 #include <string.h>
 
+#ifndef weak_alias
+# define __stpcpy stpcpy
+#endif
+
 /* Copy SRC to DEST, returning the address of the terminating '\0' in DEST.  */
 char *
-__stpcpy (char *dest, const char *src)
+__stpcpy (dest, src)
+     char *dest;
+     const char *src;
 {
   register char *d = dest;
   register const char *s = src;
@@ -31,4 +37,6 @@ __stpcpy (char *dest, const char *src)
 
   return d - 1;
 }
+#ifdef weak_alias
 weak_alias (__stpcpy, stpcpy)
+#endif
diff --git a/sysdeps/libm-i387/e_remainder.S b/sysdeps/libm-i387/e_remainder.S
index 06cdddc9d1..2f43cb894c 100644
--- a/sysdeps/libm-i387/e_remainder.S
+++ b/sysdeps/libm-i387/e_remainder.S
@@ -14,6 +14,6 @@ ENTRY(__ieee754_remainder)
 	fstsw	%ax
 	sahf
 	jp	1b
-	fstpl	%st(1)
+	fstp	%st(1)
 	ret
 END (__ieee754_remainder)
diff --git a/sysdeps/libm-i387/e_remainderf.S b/sysdeps/libm-i387/e_remainderf.S
index d313a55382..79f821993b 100644
--- a/sysdeps/libm-i387/e_remainderf.S
+++ b/sysdeps/libm-i387/e_remainderf.S
@@ -14,6 +14,6 @@ ENTRY(__ieee754_remainderf)
 	fstsw	%ax
 	sahf
 	jp	1b
-	fstpl	%st(1)
+	fstp	%st(1)
 	ret
 END (__ieee754_remainderf)
diff --git a/sysdeps/libm-i387/e_remainderl.S b/sysdeps/libm-i387/e_remainderl.S
index 90a8da7633..5f50b626a2 100644
--- a/sysdeps/libm-i387/e_remainderl.S
+++ b/sysdeps/libm-i387/e_remainderl.S
@@ -16,5 +16,6 @@ ENTRY(__ieee754_remainderl)
 	fstsw	%ax
 	sahf
 	jp	1b
+	fstp	%st(1)
 	ret
 END (__ieee754_remainderl)
diff --git a/sysdeps/libm-i387/s_cexp.S b/sysdeps/libm-i387/s_cexp.S
index 5630d3cb65..61158d9540 100644
--- a/sysdeps/libm-i387/s_cexp.S
+++ b/sysdeps/libm-i387/s_cexp.S
@@ -237,8 +237,9 @@ ENTRY(__cexp)
 
 	fldl	MOX(huge_nan_null_null,%edx,1)
 	fldl	MOX(huge_nan_null_null+8,%edx,1)
-	fstpl	8(%eax)
+	fxch
 	fstpl	(%eax)
+	fstpl	8(%eax)
 	ret	$4
 
 	/* The real part is NaN.  */
diff --git a/sysdeps/libm-i387/s_cexpl.S b/sysdeps/libm-i387/s_cexpl.S
index 11c05c52e6..203a7ee779 100644
--- a/sysdeps/libm-i387/s_cexpl.S
+++ b/sysdeps/libm-i387/s_cexpl.S
@@ -161,8 +161,9 @@ ENTRY(__cexpl)
 	jnz	5f
 	fldl	MOX(huge_nan_null_null,%edx,1)
 	movl	4(%esp), %edx		/* Pointer to memory for result.  */
-	fstl	8(%edx)
-	fstpl	(%edx)
+	fld	%st
+	fstpt	12(%edx)
+	fstpt	(%edx)
 	ftst
 	fnstsw
 	shll	$7, %eax
@@ -188,8 +189,9 @@ ENTRY(__cexpl)
 	fsincos
 	fldl	MOX(huge_nan_null_null,%edx,1)
 	movl	4(%esp), %edx		/* Pointer to memory for result.  */
-	fstl	8(%edx)
-	fstpl	(%edx)
+	fld	%st
+	fstpt	12(%edx)
+	fstpt	(%edx)
 	ftst
 	fnstsw
 	shll	$7, %eax
@@ -237,8 +239,9 @@ ENTRY(__cexpl)
 
 	fldl	MOX(huge_nan_null_null,%edx,1)
 	fldl	MOX(huge_nan_null_null+8,%edx,1)
-	fstpt	12(%eax)
+	fxch
 	fstpt	(%eax)
+	fstpt	12(%eax)
 	ret	$4
 
 	/* The real part is NaN.  */
diff --git a/sysdeps/libm-ieee754/s_csinhl.c b/sysdeps/libm-ieee754/s_csinhl.c
index 694b39d670..471cc7e81e 100644
--- a/sysdeps/libm-ieee754/s_csinhl.c
+++ b/sysdeps/libm-ieee754/s_csinhl.c
@@ -19,6 +19,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <complex.h>
+#include <fenv.h>
 #include <math.h>
 
 #include "math_private.h"
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index fb9709fee7..fec30f97d7 100644
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -44,92 +44,98 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /* getaddrinfo() v1.13 */
 
-/* To do what POSIX says, even when it's broken: */
-#define BROKEN_LIKE_POSIX 1
-#define LOCAL 1
-#define INET6 1
-#define HOSTTABLE 0
-#define RESOLVER 1
-
 #include <sys/types.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/socket.h>
-#if LOCAL
 #include <stdio.h>
 #include <string.h>
 #include <sys/utsname.h>
 #include <sys/un.h>
-#endif /* LOCAL */
 #include <netinet/in.h>
 #include <netdb.h>
 #include <errno.h>
 #include <arpa/inet.h>
 
-#ifndef AF_LOCAL
-#define AF_LOCAL AF_UNIX
-#endif /* AF_LOCAL */
-#ifndef PF_LOCAL
-#define PF_LOCAL PF_UNIX
-#endif /* PF_LOCAL */
-#ifndef UNIX_PATH_MAX
-#define UNIX_PATH_MAX 108
-#endif /* UNIX_PATH_MAX */
-
 #define GAIH_OKIFUNSPEC 0x0100
 #define GAIH_EAI        ~(GAIH_OKIFUNSPEC)
 
-#if HOSTTABLE
-struct hostent *_hostname2addr_hosts(const char *name, int);
-struct hostent *_addr2hostname_hosts(const char *name, int, int);
-#endif /* HOSTTABLE */
+#ifndef UNIX_PATH_MAX
+#define UNIX_PATH_MAX  108
+#endif
 
-static struct addrinfo nullreq =
-{ 0, PF_UNSPEC, 0, 0, 0, NULL, NULL, NULL };
+struct gaih_service
+  {
+    const char *name;
+    int num;
+  };
 
-struct gaih_service {
-  char *name;
-  int num;
-};
+struct gaih_servtuple
+  {
+    struct gaih_servtuple *next;
+    int socktype;
+    int protocol;
+    int port;
+  };
 
-struct gaih_servtuple {
-  struct gaih_servtuple *next;
-  int socktype;
-  int protocol;
-  int port;
-};
+static struct gaih_servtuple nullserv = { NULL, 0, 0, 0 };
 
-static struct gaih_servtuple nullserv = {
-  NULL, 0, 0, 0
-};
+struct gaih_addrtuple
+  {
+    struct gaih_addrtuple *next;
+    int family;
+    char addr[16];
+  };
 
-struct gaih_addrtuple {
-  struct gaih_addrtuple *next;
-  int family;
-  char addr[16];
-};
+struct gaih_typeproto
+  {
+    int socktype;
+    int protocol;
+    char *name;
+  };
 
-struct gaih_typeproto {
-  int socktype;
-  int protocol;
-  char *name;
+static struct gaih_typeproto gaih_inet_typeproto[] =
+{
+  { 0, 0, NULL },
+  { SOCK_STREAM, IPPROTO_TCP, (char *) "tcp" },
+  { SOCK_DGRAM, IPPROTO_UDP, (char *) "udp" },
+  { 0, 0, NULL }
 };
 
-#if LOCAL
-static int gaih_local(const char *name, const struct gaih_service *service,
-		     const struct addrinfo *req, struct addrinfo **pai)
+struct gaih
+  {
+    int family;
+    int (*gaih)(const char *name, const struct gaih_service *service,
+		const struct addrinfo *req, struct addrinfo **pai);
+  };
+
+static struct addrinfo default_hints =
+	{ 0, PF_UNSPEC, 0, 0, 0, NULL, NULL, NULL };
+
+
+static int
+gaih_local (const char *name, const struct gaih_service *service,
+	    const struct addrinfo *req, struct addrinfo **pai)
 {
   struct utsname utsname;
 
-  if (name || (req->ai_flags & AI_CANONNAME))
+  if ((name != NULL) || (req->ai_flags & AI_CANONNAME))
     if (uname(&utsname))
       return -EAI_SYSTEM;
-  if (name) {
-    if (strcmp(name, "localhost") && strcmp(name, "local") && strcmp(name, "unix") && strcmp(name, utsname.nodename))
-      return (GAIH_OKIFUNSPEC | -EAI_NONAME);
-  };
 
-  if (!(*pai = malloc(sizeof(struct addrinfo) + sizeof(struct sockaddr_un) + ((req->ai_flags & AI_CANONNAME) ? (strlen(utsname.nodename) + 1): 0))))
+  if (name != NULL)
+    {
+      if (strcmp(name, "localhost") &&
+	  strcmp(name, "local") &&
+	  strcmp(name, "unix") &&
+	  strcmp(name, utsname.nodename))
+	return GAIH_OKIFUNSPEC | -EAI_NONAME;
+    }
+
+  *pai = malloc (sizeof(struct addrinfo) + sizeof(struct sockaddr_un)
+		 + ((req->ai_flags & AI_CANONNAME)
+		    ? (strlen(utsname.nodename) + 1): 0));
+  if (*pai == NULL)
     return -EAI_MEMORY;
 
   (*pai)->ai_next = NULL;
@@ -139,63 +145,79 @@ static int gaih_local(const char *name, const struct gaih_service *service,
   (*pai)->ai_protocol = req->ai_protocol;
   (*pai)->ai_addrlen = sizeof(struct sockaddr_un);
   (*pai)->ai_addr = (void *)(*pai) + sizeof(struct addrinfo);
+
 #if SALEN
-  ((struct sockaddr_un *)(*pai)->ai_addr)->sun_len = sizeof(struct sockaddr_un);
+  ((struct sockaddr_un *) (*pai)->ai_addr)->sun_len =
+    sizeof (struct sockaddr_un);
 #endif /* SALEN */
+
   ((struct sockaddr_un *)(*pai)->ai_addr)->sun_family = AF_LOCAL;
   memset(((struct sockaddr_un *)(*pai)->ai_addr)->sun_path, 0, UNIX_PATH_MAX);
-  if (service) {
-    char *c;
-    if (c = strchr(service->name, '/')) {
-      if (strlen(service->name) >= sizeof(((struct sockaddr_un *)(*pai)->ai_addr)->sun_path))
-        return (GAIH_OKIFUNSPEC | -EAI_SERVICE);
-      strcpy(((struct sockaddr_un *)(*pai)->ai_addr)->sun_path, service->name);
-    } else {
-      if (strlen(P_tmpdir "/") + 1 + strlen(service->name) >= sizeof(((struct sockaddr_un *)(*pai)->ai_addr)->sun_path))
-        return (GAIH_OKIFUNSPEC | -EAI_SERVICE);
-      strcpy(((struct sockaddr_un *)(*pai)->ai_addr)->sun_path, P_tmpdir "/");
-      strcat(((struct sockaddr_un *)(*pai)->ai_addr)->sun_path, service->name);
-    };
-  } else {
-    if (!tmpnam(((struct sockaddr_un *)(*pai)->ai_addr)->sun_path))
-      return -EAI_SYSTEM;
-  };
+
+  if (service)
+    {
+      struct sockaddr_un *sunp = (struct sockaddr_un *) (*pai)->ai_addr;
+
+      if (strchr (service->name, '/') != NULL)
+	{
+	  if (strlen (service->name) >= sizeof (sunp->sun_path))
+	    return GAIH_OKIFUNSPEC | -EAI_SERVICE;
+
+	  strcpy (sunp->sun_path, service->name);
+	}
+      else
+	{
+	  if (strlen (P_tmpdir "/") + 1 + strlen (service->name) >=
+	      sizeof (sunp->sun_path))
+	    return GAIH_OKIFUNSPEC | -EAI_SERVICE;
+
+	  __stpcpy (__stpcpy (sunp->sun_path, P_tmpdir "/"), service->name);
+	}
+    }
+  else
+    {
+      if (tmpnam (((struct sockaddr_un *) (*pai)->ai_addr)->sun_path) == NULL)
+	return -EAI_SYSTEM;
+    }
+
   if (req->ai_flags & AI_CANONNAME)
-    strcpy((*pai)->ai_canonname = (char *)(*pai) + sizeof(struct addrinfo) + sizeof(struct sockaddr_un), utsname.nodename);
+    strcpy ((*pai)->ai_canonname = (char *)(*pai) + sizeof(struct addrinfo) +
+	    sizeof(struct sockaddr_un), utsname.nodename);
   else
     (*pai)->ai_canonname = NULL;
   return 0;
-};
-#endif /* LOCAL */
-
-static struct gaih_typeproto gaih_inet_typeproto[] =
-{
-  { 0, 0, NULL },
-  { SOCK_STREAM, IPPROTO_TCP, (char *) "tcp" },
-  { SOCK_DGRAM, IPPROTO_UDP, (char *) "udp" },
-  { 0, 0, NULL }
-};
+}
 
-static int gaih_inet_serv(char *servicename, struct gaih_typeproto *tp, struct gaih_servtuple **st)
+static int
+gaih_inet_serv (const char *servicename, struct gaih_typeproto *tp,
+	       struct gaih_servtuple **st)
 {
   struct servent *s;
-  int tmpbuflen = 1024;
+  size_t tmpbuflen = 1024;
   struct servent ts;
-  char *tmpbuf = __alloca (tmpbuflen);
-  while (__getservbyname_r (servicename, tp->name, &ts, tmpbuf, tmpbuflen, &s))
+  char *tmpbuf;
+  int r;
+
+  do
     {
-      if (errno == ERANGE)
-	{
-	  tmpbuflen *= 2;
-	  tmpbuf = __alloca (tmpbuflen);
-	}
-      else
+      tmpbuf = __alloca (tmpbuflen);
+      if (tmpbuf == NULL)
+	return -EAI_MEMORY;
+
+      r = __getservbyname_r (servicename, tp->name, &ts, tmpbuf, tmpbuflen,
+			     &s);
+      if (r)
 	{
-	  return GAIH_OKIFUNSPEC | -EAI_SERVICE;
+	  if (errno == ERANGE)
+	    tmpbuflen *= 2;
+	  else
+	    return GAIH_OKIFUNSPEC | -EAI_SERVICE;
 	}
     }
+  while (r);
 
-  if (!(*st = malloc (sizeof (struct gaih_servtuple))))
+  *st = malloc (sizeof (struct gaih_servtuple));
+  if (*st == NULL)
     return -EAI_MEMORY;
 
   (*st)->next = NULL;
@@ -206,426 +228,330 @@ static int gaih_inet_serv(char *servicename, struct gaih_typeproto *tp, struct g
   return 0;
 }
 
-static int gaih_inet(const char *name, const struct gaih_service *service,
-		     const struct addrinfo *req, struct addrinfo **pai)
+#define gethosts(_family, _type)				\
+ {								\
+  int i, herrno;						\
+  size_t tmpbuflen;						\
+  struct hostent th;						\
+  char *tmpbuf;							\
+  tmpbuflen = 512;						\
+  do {								\
+    tmpbuflen *= 2;						\
+    tmpbuf = __alloca (tmpbuflen);				\
+    if (tmpbuf == NULL)						\
+      return -EAI_MEMORY;					\
+    rc = __gethostbyname2_r (name, _family, &th, tmpbuf,	\
+         tmpbuflen, &h, &herrno);				\
+  } while ((rc != 0) &&						\
+    (herrno == NETDB_INTERNAL) && (errno == ERANGE));		\
+  if ((rc != 0) && (herrno == NETDB_INTERNAL))			\
+    {								\
+      __set_h_errno (herrno);					\
+      return -EAI_SYSTEM;					\
+    }								\
+  if (h != NULL)						\
+    {								\
+      for (i = 0; h->h_addr_list[i]; i++)			\
+	{							\
+	  if (*pat == NULL)					\
+	    {							\
+	      *pat = __alloca (sizeof(struct gaih_addrtuple));	\
+	      if (*pat == NULL)					\
+		return -EAI_MEMORY;				\
+	    }							\
+	  (*pat)->next = NULL;					\
+	  (*pat)->family = _family;				\
+	  memcpy ((*pat)->addr, h->h_addr_list[i],		\
+		 sizeof(_type));				\
+	  pat = &((*pat)->next);				\
+	}							\
+    }								\
+ }
+
+static int
+gaih_inet (const char *name, const struct gaih_service *service,
+	   const struct addrinfo *req, struct addrinfo **pai)
 {
   struct gaih_typeproto *tp = gaih_inet_typeproto;
   struct gaih_servtuple *st = &nullserv;
   struct gaih_addrtuple *at = NULL;
-  int i;
-
-  if (req->ai_protocol || req->ai_socktype) {
-    for (tp++; tp->name &&
-	  ((req->ai_socktype != tp->socktype) || !req->ai_socktype) &&
-	  ((req->ai_protocol != tp->protocol) || !req->ai_protocol); tp++);
-    if (!tp->name)
-      if (req->ai_socktype)
-	return (GAIH_OKIFUNSPEC | -EAI_SOCKTYPE);
-      else
-	return (GAIH_OKIFUNSPEC | -EAI_SERVICE);
-  }
+  int rc;
 
-  if (service) {
-    if (service->num < 0) {
-      if (tp->name) {
-	if (i = gaih_inet_serv(service->name, tp, &st))
-	  return i;
-      } else {
-	struct gaih_servtuple **pst = &st;
-	for (tp++; tp->name; tp++) {
-	  if (i = gaih_inet_serv(service->name, tp, pst)) {
-	    if (i & GAIH_OKIFUNSPEC)
-	      continue;
-	    goto ret;
-	  }
-	  pst = &((*pst)->next);
+  if (req->ai_protocol || req->ai_socktype)
+    {
+      for (tp++; tp->name &&
+	     ((req->ai_socktype != tp->socktype) || !req->ai_socktype) &&
+	     ((req->ai_protocol != tp->protocol) || !req->ai_protocol); tp++);
+      if (tp->name == NULL)
+	if (req->ai_socktype)
+	  return (GAIH_OKIFUNSPEC | -EAI_SOCKTYPE);
+	else
+	  return (GAIH_OKIFUNSPEC | -EAI_SERVICE);
+    }
+
+  if (service != NULL)
+    {
+      if (service->num < 0)
+	{
+	  if (tp->name != NULL)
+	    {
+	      if (rc = gaih_inet_serv (service->name, tp, &st))
+		return rc;
+	    }
+	  else
+	    {
+	      struct gaih_servtuple **pst = &st;
+	      for (tp++; tp->name; tp++)
+		{
+		  if (rc = gaih_inet_serv (service->name, tp, pst))
+		    {
+		      if (rc & GAIH_OKIFUNSPEC)
+			continue;
+		      return rc;
+		    }
+		  pst = &((*pst)->next);
+		}
+	      if (st == &nullserv)
+		return (GAIH_OKIFUNSPEC | -EAI_SERVICE);
+	    }
 	}
-	if (st == &nullserv) {
-	  i = (GAIH_OKIFUNSPEC | -EAI_SERVICE);
-	  goto ret;
+      else
+	{
+	  st = __alloca (sizeof(struct gaih_servtuple));
+	  if (st == NULL)
+	    return -EAI_MEMORY;
+
+	  st->next = NULL;
+	  st->socktype = tp->socktype;
+	  st->protocol = tp->protocol;
+	  st->port = htons (service->num);
 	}
-      }
-    } else {
-      if (!(st = malloc(sizeof(struct gaih_servtuple))))
+    }
+
+  if (name != NULL)
+    {
+      at = __alloca (sizeof(struct gaih_addrtuple));
+      if (at == NULL)
 	return -EAI_MEMORY;
 
-      st->next = NULL;
-      st->socktype = tp->socktype;
-      st->protocol = tp->protocol;
-      st->port = htons(service->num);
-    }
-  }
+      at->family = 0;
+      at->next = NULL;
 
-  if (name) {
-    if (!(at = malloc(sizeof(struct gaih_addrtuple)))) {
-      i = -EAI_MEMORY;
-      goto ret;
-    }
+      if (at->family || !req->ai_family || (req->ai_family == AF_INET))
+	if (inet_pton (AF_INET, name, at->addr) > 0)
+	  at->family = AF_INET;
 
-    at->family = 0;
-    at->next = NULL;
-
-    if (!at->family || !req->ai_family || (req->ai_family == AF_INET))
-      if (inet_pton(AF_INET, name, at->addr) > 0)
-	at->family = AF_INET;
-
-#if INET6
-    if (!at->family && (!req->ai_family || (req->ai_family == AF_INET6)))
-      if (inet_pton(AF_INET6, name, at->addr) > 0)
-	at->family = AF_INET6;
-#endif /* INET6 */
-
-#if HOSTTABLE
-    if (!at->family) {
-      struct hostent *h;
-      struct gaih_addrtuple **pat = &at;
-
-#if INET6
-      if (!req->ai_family || (req->ai_family == AF_INET6))
-	if (h = _hostname2addr_hosts(name, AF_INET6)) {
-	  for (i = 0; h->h_addr_list[i]; i++) {
-	    if (!*pat) {
-	      if (!(*pat = malloc(sizeof(struct gaih_addrtuple)))) {
-		i = -EAI_MEMORY;
-		goto ret;
-	      }
-	    }
-	    (*pat)->next = NULL;
-	    (*pat)->family = AF_INET6;
-	    memcpy((*pat)->addr, h->h_addr_list[i], sizeof(struct in6_addr));
-	    pat = &((*pat)->next);
-	  }
-	}
-#endif /* INET6 */
-
-      if (!req->ai_family || (req->ai_family == AF_INET))
-	if (h = _hostname2addr_hosts(name, AF_INET)) {
-	  for (i = 0; h->h_addr_list[i]; i++) {
-	    if (!*pat) {
-	      if (!(*pat = malloc(sizeof(struct gaih_addrtuple)))) {
-		i = -EAI_MEMORY;
-		goto ret;
-	      }
-	    }
-	    (*pat)->next = NULL;
-	    (*pat)->family = AF_INET;
-	    memcpy((*pat)->addr, h->h_addr_list[i], sizeof(struct in_addr));
-	    pat = &((*pat)->next);
-	  }
+      if (!at->family && (!req->ai_family || (req->ai_family == AF_INET6)))
+	if (inet_pton (AF_INET6, name, at->addr) > 0)
+	  at->family = AF_INET6;
+
+      if (at->family == AF_UNSPEC)
+	{
+	  struct hostent *h;
+	  struct gaih_addrtuple **pat = &at;
+
+	  if ((req->ai_family == AF_UNSPEC) || (req->ai_family == AF_INET6))
+	    gethosts (AF_INET6, struct in6_addr);
+
+	  if ((req->ai_family == AF_UNSPEC) || (req->ai_family == AF_INET))
+	    gethosts (AF_INET, struct in_addr);
 	}
+
+      if (at->family == AF_UNSPEC)
+	return (GAIH_OKIFUNSPEC | -EAI_NONAME);
+
     }
-#endif /* HOSTTABLE */
-
-#if RESOLVER
-    if (!at->family) {
-      struct hostent *h;
-      struct gaih_addrtuple **pat = &at;
-
-#if INET6
-      if (!req->ai_family || (req->ai_family == AF_INET6)) {
-	int herrno;
-	int tmpbuflen = 1024;
-	struct hostent th;
-	char *tmpbuf = __alloca(tmpbuflen);
-	while (__gethostbyname2_r(name, AF_INET6, &th, tmpbuf, tmpbuflen,
-				  &h, &herrno)) {
-	  if (herrno == NETDB_INTERNAL) {
-	    if (errno == ERANGE) {
-	      /* Need more buffer */
-	      tmpbuflen *= 2;
-	      tmpbuf = __alloca(tmpbuflen);
-	    } else {
-	      /* Bail out */
-	      __set_h_errno(herrno);
-	      i = -EAI_SYSTEM;
-	      goto ret;
-	    }
-	  } else {
-	    break;
-	  }
-	}
-	if (h) {
-	  for (i = 0; h->h_addr_list[i]; i++) {
-	    if (!*pat) {
-	      if (!(*pat = malloc(sizeof(struct gaih_addrtuple)))) {
-		i = -EAI_MEMORY;
-		goto ret;
-	      }
-	    }
-	    (*pat)->next = NULL;
-	    (*pat)->family = AF_INET6;
-	    memcpy((*pat)->addr, h->h_addr_list[i], sizeof(struct in6_addr));
-	    pat = &((*pat)->next);
-	  }
-	}
-      }
-#endif /* INET6 */
-
-      if (!req->ai_family || (req->ai_family == AF_INET)) {
-	int herrno;
-	struct hostent th;
-	int tmpbuflen = 1024;
-	char *tmpbuf = __alloca(tmpbuflen);
-	while (__gethostbyname2_r(name, AF_INET, &th, tmpbuf, tmpbuflen,
-				&h, &herrno)) {
-	  if (herrno == NETDB_INTERNAL) {
-	    if (errno == ERANGE) {
-	      /* Need more buffer */
-	      tmpbuflen *= 2;
-	      tmpbuf = __alloca(tmpbuflen);
-	    } else {
-	      /* Bail out */
-	      __set_h_errno(herrno);
-	      i = -EAI_SYSTEM;
-	      goto ret;
-	    }
-	  } else {
-	    break;
-	  }
-	}
-	if (h) {
-	  for (i = 0; h->h_addr_list[i]; i++) {
-	    if (!*pat) {
-	      if (!(*pat = malloc(sizeof(struct gaih_addrtuple)))) {
-		i = -EAI_MEMORY;
-		goto ret;
-	      }
-	    }
-	    (*pat)->next = NULL;
-	    (*pat)->family = AF_INET;
-	    memcpy((*pat)->addr, h->h_addr_list[i], sizeof(struct in_addr));
-	    pat = &((*pat)->next);
-	  }
-	}
-      }
+  else
+    {
+      at = __alloca (sizeof(struct gaih_addrtuple));
+      if (at == NULL)
+	return -EAI_MEMORY;
+
+      memset (at, 0, sizeof(struct gaih_addrtuple));
+
+      at->next = __alloca (sizeof(struct gaih_addrtuple));
+      if (at->next == NULL)
+	return -EAI_MEMORY;
+
+      at->family = AF_INET6;
+
+      memset (at->next, 0, sizeof(struct gaih_addrtuple));
+      at->next->family = AF_INET;
     }
-#endif /* RESOLVER */
-
-    if (!at->family)
-      return (GAIH_OKIFUNSPEC | -EAI_NONAME);
-  } else {
-    if (!(at = malloc(sizeof(struct gaih_addrtuple)))) {
-      i = -EAI_MEMORY;
-      goto ret;
-    };
-
-    memset(at, 0, sizeof(struct gaih_addrtuple));
-
-#if INET6
-    if (!(at->next = malloc(sizeof(struct gaih_addrtuple)))) {
-      i = -EAI_MEMORY;
-      goto ret;
-    };
-
-    at->family = AF_INET6;
-
-    memset(at->next, 0, sizeof(struct gaih_addrtuple));
-    at->next->family = AF_INET;
-#else /* INET6 */
-    at->family = AF_INET;
-#endif /* INET6 */
-  };
 
-  if (!pai) {
-    i = 0;
-    goto ret;
-  };
+  if (pai == NULL)
+    return 0;
 
   {
     const char *c = NULL;
     struct gaih_servtuple *st2;
     struct gaih_addrtuple *at2 = at;
-    int j;
+    size_t socklen, namelen;
+
     /*
       buffer is the size of an unformatted IPv6 address in printable format.
      */
     char buffer[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"];
 
-    while(at2) {
-      if (req->ai_flags & AI_CANONNAME) {
-        struct hostent *h = NULL;
-
-#if RESOLVER
-        int herrno;
-	struct hostent th;
-	int tmpbuflen = 1024;
-	char *tmpbuf = __alloca(tmpbuflen);
-	while (__gethostbyaddr_r(at2->addr,
-#if INET6
-	    (at2->family == AF_INET6) ? sizeof(struct in6_addr) :
-#endif /* INET6 */
-				 sizeof(struct in_addr), at2->family,
-				 &th, tmpbuf, tmpbuflen, &h, &herrno)) {
-	  if (herrno == NETDB_INTERNAL) {
-	    if (errno == ERANGE) {
-	      /* Need more buffer */
-	      tmpbuflen *= 2;
-	      tmpbuf = __alloca(tmpbuflen);
-	    } else {
-	      /* Bail out */
-	      __set_h_errno(herrno);
-	      i = -EAI_SYSTEM;
-	      goto ret;
-	    }
-	  } else {
-	    break;
-	  }
-	}
-#endif /* RESOLVER */
-#if HOSTTABLE
-	if (!h)
-	  h = _addr2hostname_hosts(at2->addr,
-#if INET6
-	    (at2->family == AF_INET6) ? sizeof(struct in6_addr) :
-#endif /* INET6 */
-	    sizeof(struct in_addr), at2->family);
-#endif /* HOSTTABLE */
-
-	if (!h)
-          c = inet_ntop(at2->family, at2->addr, buffer, sizeof(buffer));
-	else
-          c = h->h_name;
+    while (at2 != NULL)
+      {
+	if (req->ai_flags & AI_CANONNAME)
+	  {
+	    struct hostent *h = NULL;
 
-	if (!c) {
-	  i = (GAIH_OKIFUNSPEC | -EAI_NONAME);
-	  goto ret;
-	}
+	    int herrno;
+	    struct hostent th;
+	    size_t tmpbuflen = 512;
+	    char *tmpbuf;
 
-	j = strlen(c) + 1;
-      } else
-	j = 0;
+	    do
+	      {
+		tmpbuflen *= 2;
+		tmpbuf = __alloca (tmpbuflen);
 
-#if INET6
-      if (at2->family == AF_INET6)
-	i = sizeof(struct sockaddr_in6);
-      else
-#endif /* INET6 */
-	i = sizeof(struct sockaddr_in);
-
-      st2 = st;
-      while(st2) {
-	if (!(*pai = malloc(sizeof(struct addrinfo) + i + j))) {
-	  i = -EAI_MEMORY;
-	  goto ret;
-	}
-	(*pai)->ai_flags = req->ai_flags;
-	(*pai)->ai_family = at2->family;
-	(*pai)->ai_socktype = st2->socktype;
-	(*pai)->ai_protocol = st2->protocol;
-	(*pai)->ai_addrlen = i;
-	(*pai)->ai_addr = (void *)(*pai) + sizeof(struct addrinfo);
+		if (tmpbuf == NULL)
+		  return -EAI_MEMORY;
+
+		rc = __gethostbyaddr_r (at2->addr,
+					((at2->family == AF_INET6)
+					 ? sizeof(struct in6_addr)
+					 : sizeof(struct in_addr)),
+					at2->family, &th, tmpbuf, tmpbuflen,
+					&h, &herrno);
+
+	      }
+	    while ((rc != 0) && (herrno == NETDB_INTERNAL)
+		   && (errno == ERANGE));
+
+	    if ((rc != 0) && (herrno == NETDB_INTERNAL))
+	      {
+		__set_h_errno (herrno);
+		return -EAI_SYSTEM;
+	      }
+
+	    if (h == NULL)
+	      c = inet_ntop (at2->family, at2->addr, buffer, sizeof(buffer));
+	    else
+	      c = h->h_name;
+
+	    if (c == NULL)
+	      return GAIH_OKIFUNSPEC | -EAI_NONAME;
+
+	    namelen = strlen (c) + 1;
+	  }
+	else
+	  namelen = 0;
+
+	if (at2->family == AF_INET6)
+	  socklen = sizeof (struct sockaddr_in6);
+	else
+	  socklen = sizeof (struct sockaddr_in);
+
+	for (st2 = st; st2 != NULL; st2 = st2->next)
+	  {
+	    *pai = malloc (sizeof (struct addrinfo) + socklen + namelen);
+	    if (*pai == NULL)
+	      return -EAI_MEMORY;
+
+	    (*pai)->ai_flags = req->ai_flags;
+	    (*pai)->ai_family = at2->family;
+	    (*pai)->ai_socktype = st2->socktype;
+	    (*pai)->ai_protocol = st2->protocol;
+	    (*pai)->ai_addrlen = socklen;
+	    (*pai)->ai_addr = (void *) (*pai) + sizeof(struct addrinfo);
 #if SALEN
-	((struct sockaddr_in *)(*pai)->ai_addr)->sin_len = i;
+	    ((struct sockaddr_in *) (*pai)->ai_addr)->sin_len = i;
 #endif /* SALEN */
-	((struct sockaddr_in *)(*pai)->ai_addr)->sin_family = at2->family;
-	((struct sockaddr_in *)(*pai)->ai_addr)->sin_port = st2->port;
-
-#if INET6
-	if (at2->family == AF_INET6) {
-	  ((struct sockaddr_in6 *)(*pai)->ai_addr)->sin6_flowinfo = 0;
-	  memcpy(&((struct sockaddr_in6 *)(*pai)->ai_addr)->sin6_addr, at2->addr, sizeof(struct in6_addr));
-	} else
-#endif /* INET6 */
-	{
-	  memcpy(&((struct sockaddr_in *)(*pai)->ai_addr)->sin_addr, at2->addr, sizeof(struct in_addr));
-	  memset(((struct sockaddr_in *)(*pai)->ai_addr)->sin_zero, 0, sizeof(((struct sockaddr_in *)(*pai)->ai_addr)->sin_zero));
-	}
+	    ((struct sockaddr_in *) (*pai)->ai_addr)->sin_family = at2->family;
+	    ((struct sockaddr_in *) (*pai)->ai_addr)->sin_port = st2->port;
 
-	if (c) {
-	  (*pai)->ai_canonname = (void *)(*pai) + sizeof(struct addrinfo) + i;
-	  strcpy((*pai)->ai_canonname, c);
-	} else
-	  (*pai)->ai_canonname = NULL;
-	(*pai)->ai_next = NULL;
+	    if (at2->family == AF_INET6)
+	      {
+		struct sockaddr_in6 *sin6p =
+		  (struct sockaddr_in6 *) (*pai)->ai_addr;
 
-	pai = &((*pai)->ai_next);
+		sin6p->sin6_flowinfo = 0;
+		memcpy (&sin6p->sin6_addr,
+			at2->addr, sizeof (struct in6_addr));
+	      }
+	    else
+	      {
+		struct sockaddr_in *sinp =
+		  (struct sockaddr_in *) (*pai)->ai_addr;
+		memcpy (&sinp->sin_addr,
+			at2->addr, sizeof (struct in_addr));
+		memset (sinp->sin_zero, '\0', sizeof (sinp->sin_zero));
+	      }
 
-	st2 = st2->next;
-      }
-      at2 = at2->next;
-    }
-  }
+	    if (c)
+	      {
+		(*pai)->ai_canonname = ((void *) (*pai) +
+					sizeof (struct addrinfo) + socklen);
+		strcpy ((*pai)->ai_canonname, c);
+	      }
+	    else
+	      (*pai)->ai_canonname = NULL;
 
-  i = 0;
+	    (*pai)->ai_next = NULL;
+	    pai = &((*pai)->ai_next);
+	  }
 
-ret:
-  if (st != &nullserv) {
-    struct gaih_servtuple *st2 = st;
-    while(st) {
-      st2 = st->next;
-      free(st);
-      st = st2;
-    }
-  }
-  if (at) {
-    struct gaih_addrtuple *at2 = at;
-    while(at) {
-      at2 = at->next;
-      free(at);
-      at = at2;
-    }
+	at2 = at2->next;
+      }
   }
-  return i;
+  return 0;
 }
 
-struct gaih {
-  int family;
-  int (*gaih)(const char *name, const struct gaih_service *service,
-	      const struct addrinfo *req, struct addrinfo **pai);
-};
-
-static struct gaih gaih[] = {
-#if INET6
-  { PF_INET6, gaih_inet },
-#endif /* INET6 */
-  { PF_INET, gaih_inet },
-#if LOCAL
-  { PF_LOCAL, gaih_local },
-#endif /* LOCAL */
-  { PF_UNSPEC, NULL }
-};
+static struct gaih gaih[] =
+  {
+    { PF_INET6, gaih_inet },
+    { PF_INET, gaih_inet },
+    { PF_LOCAL, gaih_local },
+    { PF_UNSPEC, NULL }
+  };
 
-int getaddrinfo(const char *name, const char *service,
-		const struct addrinfo *req, struct addrinfo **pai)
+int
+getaddrinfo (const char *name, const char *service,
+	     const struct addrinfo *hints, struct addrinfo **pai)
 {
   int i = 0, j = 0;
   struct addrinfo *p = NULL, **end;
   struct gaih *g = gaih, *pg = NULL;
   struct gaih_service gaih_service, *pservice;
 
-  if (name && (name[0] == '*') && !name[1])
+  if (name != NULL && name[0] == '*' && name[1] == 0)
     name = NULL;
 
-  if (service && (service[0] == '*') && !service[1])
+  if (service != NULL && service[0] == '*' && service[1] == 0)
     service = NULL;
 
-#if BROKEN_LIKE_POSIX
-  if (!name && !service)
+  if (name == NULL && service == NULL)
     return EAI_NONAME;
-#endif /* BROKEN_LIKE_POSIX */
 
-  if (!req)
-    req = &nullreq;
+  if (hints == NULL)
+    hints = &default_hints;
 
-  if (req->ai_flags & ~3)
+  if (hints->ai_flags & ~3)
     return EAI_BADFLAGS;
 
-  if ((req->ai_flags & AI_CANONNAME) && !name)
+  if ((hints->ai_flags & AI_CANONNAME) && name == NULL)
     return EAI_BADFLAGS;
 
-  if (service && *service) {
-    char *c;
-    gaih_service.num = strtoul(gaih_service.name = (void *)service, &c, 10);
-    if (*c) {
-      gaih_service.num = -1;
-    }
-#if BROKEN_LIKE_POSIX
+  if (service && service[0])
+    {
+      char *c;
+      gaih_service.name = service;
+      gaih_service.num = strtoul (gaih_service.name, &c, 10);
+      if (*c)
+	gaih_service.num = -1;
       else
-        if (!req->ai_socktype)
+	/* Can't specify a numerical socket unless a protocol family was
+	   given. */
+        if (hints->ai_socktype == 0)
           return EAI_SERVICE;
-#endif /* BROKEN_LIKE_POSIX */
-    pservice = &gaih_service;
-  } else
+      pservice = &gaih_service;
+    }
+  else
     pservice = NULL;
 
   if (pai)
@@ -633,51 +559,58 @@ int getaddrinfo(const char *name, const char *service,
   else
     end = NULL;
 
-  while(g->gaih) {
-    if ((req->ai_family == g->family) || !req->ai_family) {
-      j++;
-      if (!((pg && (pg->gaih == g->gaih)))) {
-	pg = g;
-	if (i = g->gaih(name, pservice, req, end)) {
-	  if (!req->ai_family && (i & GAIH_OKIFUNSPEC))
-	    continue;
-	  goto gaih_err;
+  while (g->gaih)
+    {
+      if ((hints->ai_family == g->family) || (hints->ai_family == AF_UNSPEC))
+	{
+	  j++;
+	  if ((pg == NULL) || (pg->gaih != g->gaih))
+	    {
+	      pg = g;
+	      if (i = g->gaih (name, pservice, hints, end))
+		{
+		  if ((hints->ai_family == AF_UNSPEC) && (i & GAIH_OKIFUNSPEC))
+		    continue;
+
+		  if (p)
+		    freeaddrinfo (p);
+
+		  return (i)?-(i & GAIH_EAI):EAI_NONAME;
+		}
+	      if (end)
+		while(*end) end = &((*end)->ai_next);
+	    }
 	}
-	if (end)
-          while(*end) end = &((*end)->ai_next);
-      }
+      ++g;
     }
-    g++;
-  }
 
-  if (!j)
+  if (j == 0)
     return EAI_FAMILY;
 
-  if (p) {
-    *pai = p;
-    return 0;
-  }
+  if (p)
+    {
+      *pai = p;
+      return 0;
+    }
 
-  if (!pai && !i)
+  if (pai == NULL && i == 0)
     return 0;
 
-gaih_err:
   if (p)
-    freeaddrinfo(p);
-
-  if (i)
-    return -(i & GAIH_EAI);
+    freeaddrinfo (p);
 
-  return EAI_NONAME;
+  return i ? -(i & GAIH_EAI) : EAI_NONAME;
 }
 
-void freeaddrinfo(struct addrinfo *ai)
+void
+freeaddrinfo (struct addrinfo *ai)
 {
   struct addrinfo *p;
 
-  while(ai) {
-    p = ai;
-    ai = ai->ai_next;
-    free((void *)p);
-  }
+  while (ai != NULL)
+    {
+      p = ai;
+      ai = ai->ai_next;
+      free (p);
+    }
 }
diff --git a/sysdeps/sparc/sparc32/elf/Makefile b/sysdeps/sparc/sparc32/elf/Makefile
index 319fbdef10..a995e6cdf1 100644
--- a/sysdeps/sparc/sparc32/elf/Makefile
+++ b/sysdeps/sparc/sparc32/elf/Makefile
@@ -1,4 +1,4 @@
 # Sparc/ELF specific definitions.
 
 # The assembler on SPARC needs the -fPIC flag even when it's assembler code.
-ASFLAGS-.so = -fPIC
+ASFLAGS-.os = -fPIC
diff --git a/sysdeps/sparc/sparc64/elf/Makefile b/sysdeps/sparc/sparc64/elf/Makefile
index 1b38355b38..8da8a88c1b 100644
--- a/sysdeps/sparc/sparc64/elf/Makefile
+++ b/sysdeps/sparc/sparc64/elf/Makefile
@@ -1,5 +1,5 @@
 # The assembler on SPARC needs the -fPIC flag even when it's assembler code.
-ASFLAGS-.so = -fPIC
+ASFLAGS-.os = -fPIC
 
 ifeq ($(subdir), csu)
 extra-objs += crtbegin.o crtend.o crtbeginS.o crtendS.o
diff --git a/sysdeps/unix/sysv/linux/if_index.c b/sysdeps/unix/sysv/linux/if_index.c
index 615a81d14a..7d7fc02717 100644
--- a/sysdeps/unix/sysv/linux/if_index.c
+++ b/sysdeps/unix/sysv/linux/if_index.c
@@ -113,62 +113,85 @@ if_nameindex (void)
   int fd = opensock ();
   struct ifconf ifc;
   unsigned int rq_ifs = 4, nifs, i;
+  int rq_len;
   struct if_nameindex *idx = NULL;
+#ifdef SIOCGIFCOUNT
+  static int siocgifcount_works = 1;
+#endif
 
   if (fd < 0)
     return NULL;
 
+#ifdef SIOCGIFCOUNT
+  /* We may be able to find out how many interfaces really exist, rather
+     than guessing.  This ioctl is not present in kernels before version
+     2.1.50.  */
+  if (siocgifcount_works)
+    {
+      int serrno = errno;
+
+      if (ioctl (fd, SIOCGIFCOUNT, &nifs) < 0)
+	{
+	  if (errno == EINVAL)
+	    {
+	      siocgifcount_works = 0;
+	      __set_errno (serrno);
+	    }
+	}
+      else
+	rq_ifs = nifs + 1;
+    }
+#endif
+
   ifc.ifc_buf = NULL;
 
   /* Read all the interfaces out of the kernel.  */
   do
     {
-      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)
+      rq_len = ifc.ifc_len = rq_ifs * sizeof (struct ifreq);
+      ifc.ifc_buf = alloca (ifc.ifc_len);
+      if ((ifc.ifc_buf == NULL) || (ioctl (fd, SIOCGIFCONF, &ifc) < 0))
 	{
-	  close(fd);
+	  close (fd);
 	  return NULL;
 	}
-      if (ioctl (fd, SIOCGIFCONF, &ifc) < 0)
-	goto jump;
+      rq_ifs *= 2;
     }
-  while ((unsigned int) ifc.ifc_len == (rq_ifs * sizeof (struct ifreq)));
+  while (ifc.ifc_len == rq_len);
 
   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));
+  idx = malloc ((nifs + 1) * sizeof (struct if_nameindex));
   if (idx == NULL)
-    goto jump;
+    {
+      close (fd);
+      return NULL;
+    }
 
   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)
-	{
-	  free (idx);
-	  idx = NULL;
-	  goto jump;
-	}
-      strcpy (idx[i].if_name, ifr->ifr_name);
-      if (ioctl (fd, SIOGIFINDEX, ifr) < 0)
+      idx[i].if_name = __strdup (ifr->ifr_name);
+      if (idx[i].if_name == NULL
+	  || ioctl (fd, SIOGIFINDEX, ifr) < 0)
 	{
 	  int saved_errno = errno;
+	  unsigned int j;
+
+	  for (j =  0; j < i; ++j)
+	    free (idx[j].if_name);
 	  free (idx);
-	  idx = NULL;
+	  close (fd);
 	  if (saved_errno == EINVAL)
 	    __set_errno (ENOSYS);
-	  goto jump;
+	  return NULL;
 	}
       idx[i].if_index = ifr->ifr_ifindex;
     }
+
   idx[i].if_index = 0;
   idx[i].if_name = NULL;
 
-jump:
-  free (ifc.ifc_buf);
   close (fd);
   return idx;
 #endif
@@ -181,10 +204,46 @@ if_indextoname (unsigned int ifindex, char *ifname)
   __set_errno (ENOSYS);
   return NULL;
 #else
-  struct if_nameindex *idx = if_nameindex ();
+  struct if_nameindex *idx;
   struct if_nameindex *p;
   char *result = NULL;
 
+#ifdef SIOGIFNAME
+  /* We may be able to do the conversion directly, rather than searching a
+     list.  This ioctl is not present in kernels before version 2.1.50.  */
+  struct ifreq ifr;
+  int fd;
+  static int siogifname_works = 1;
+
+  if (siogifname_works)
+    {
+      int serrno = errno;
+
+      fd = opensock ();
+
+      if (fd < 0)
+	return NULL;
+
+      ifr.ifr_ifindex = ifindex;
+      if (ioctl (fd, SIOGIFNAME, &ifr) < 0)
+	{
+	  if (errno == EINVAL)
+	    siogifname_works = 0;   /* Don't make the same mistake twice. */
+	}
+      else
+	{
+	  close (fd);
+	  return strncpy (ifname, ifr.ifr_name, IFNAMSIZ);
+	}
+
+      close (fd);
+
+      __set_errno (serrno);
+    }
+#endif
+
+  idx = if_nameindex ();
+
   if (idx != NULL)
     {
       for (p = idx; p->if_index || p->if_name; ++p)
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/Makefile b/sysdeps/unix/sysv/linux/sparc/sparc32/Makefile
index 4cbd3bd004..01a0e8310f 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/Makefile
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/Makefile
@@ -3,7 +3,7 @@ sysdep_routines += __sigtrampoline
 endif
 
 asm-CPPFLAGS=-D__ASSEMBLY__
-as-FLAGS-.so=-fPIC
+ASFLAGS-.os=-fPIC
 
 # When I get this to work, this is the right thing
 ifeq ($(subdir),elf)
diff --git a/sysdeps/unix/sysv/linux/sys/mount.h b/sysdeps/unix/sysv/linux/sys/mount.h
index 08a2e3158f..f7d45704d2 100644
--- a/sysdeps/unix/sysv/linux/sys/mount.h
+++ b/sysdeps/unix/sysv/linux/sys/mount.h
@@ -57,28 +57,6 @@ __BEGIN_DECLS
 #define MS_MGC_MSK 0xffff0000	/* Magic flag number mask */
 
 
-/* Note that read-only etc flags are inode-specific: setting some
-   file-system flags just means all the inodes inherit those flags by
-   default. It might be possible to override it selectively if you
-   really wanted to with some ioctl() that is not currently
-   implemented.
-
-   Exception: MS_RDONLY is always applied to the entire file system.  */
-#define IS_RDONLY(inode) \
-     (((inode)->i_sb) && ((inode)->i_sb->s_flags & MS_RDONLY))
-#define DO_UPDATE_ATIME(inode) \
-     (!((inode)->i_flags & MS_NOATIME) && !IS_RDONLY (inode))
-#define IS_NOSUID(inode) ((inode)->i_flags & MS_NOSUID)
-#define IS_NODEV(inode) ((inode)->i_flags & MS_NODEV)
-#define IS_NOEXEC(inode) ((inode)->i_flags & MS_NOEXEC)
-#define IS_SYNC(inode) ((inode)->i_flags & MS_SYNCHRONOUS)
-#define IS_MANDLOCK(inode) ((inode)->i_flags & MS_MANDLOCK)
-
-#define IS_WRITABLE(inode) ((inode)->i_flags & S_WRITE)
-#define IS_APPEND(inode) ((inode)->i_flags & S_APPEND)
-#define IS_IMMUTABLE(inode) ((inode)->i_flags & S_IMMUTABLE)
-
-
 /* The read-only stuff doesn't really belong here, but any other place
    is probably as bad and I don't want to create yet another include
    file.  */