update from main archive 970221 cvs/libc-970223 cvs/libc-970222

1997-02-22 00:17  Ulrich Drepper  <drepper@cygnus.com>

	* catgets/gencat.c: Change to use argp.
	* db/makedb: Likewise.
	* locale/programs/localedef.c: Likewise.

	* locale/programs/locale.c: Little adjustment for better usage of
	argp.

1997-02-20 20:07  Greg McGary  <gkm@eng.ascend.com>

	* Makeconfig: Add rules for libc with bounded pointers.
	* Makerules: Likewise.
	* config.make.in: Likewise.
	* configure.in: Likewise.

1997-02-21 10:41  Miles Bader  <miles@gnu.ai.mit.edu>

	* argp.h (OPTION_NO_USAGE): New macro.
	* argp-help.c (usage_long_opt, usage_argful_short_opt,
	add_argless_short_opt): Implement OPTION_NO_USAGE.

1997-02-20 16:41  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* malloc/obstack.h: Fix typo.

1997-02-20 15:56  Miles Bader  <miles@gnu.ai.mit.edu>

	* argp-fmtstream.c (__argp_fmtstream_update): Account for case
	where NEXTLINE points one past the end of the active buffer.

	* argp-help.c <stddef.h>: New include.
	(__argp_failure): Only exit if STATE says it's ok.
	(print_header, hol_entry_help): Use UPARAMS fields rather than
	constants.
	(_help): Call fill_in_uparams if necessary.
	(struct hol_help_state): New type.
	(struct pentry_state): Add hhstate field.  Remove prev_entry &
	sep_groups fields.
	(hol_entry_help): Add HHSTATE parameter.  Remove prev_entry &
	sep_groups parameters.
	Suppress duplicate arguments if requested, and note the fact.
	(print_header, comma): Use PEST->hhstate fields.
	(hol_help): Add HHSTATE variable & pass to hol_entry_help.
	Remove LAST_ENTRY & SEP_GROUPS variables.
	If any suplicate arguments were suppressed, print explanatory note.
	(filter_doc): Replace PEST parameter with STATE.
	(struct uparams): New type.
	(uparams): New variable.
	(struct uparam_name): New type.
	(uparam_names): New variable.
	(fill_in_uparams): New function.
	(__argp_failure, __argp_error, __argp_state_help): Make STATE
	parameter const.
	* argp.h (argp_state_help, __argp_state_help, argp_usage,
	__argp_usage, argp_error, __argp_error, argp_failure,
	__argp_failure): Make STATE parameter const.
	(ARGP_KEY_HELP_DUP_ARGS_NOTE): New macro.

	* argp.h (argp_program_bug_address): Make const.

1997-02-20 19:20  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/mman/syscalls.list: Explain msync interface.

1997-02-19 01:37  Erik Troan  <ewt@redhat.com>

	* shadow/sgetspent_r.c: Accept empty third, fourth and fifth fields.

1997-02-20 14:44  Andreas Jaeger  <aj@arthur.pfalz.de>

	* stdio-common/test-fseek.c: Remove temporary file, add
	copyright.

1997-02-20 17:51  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/generic/netinet/in.h: Protect contents using
	__BEGIN/END_DECLS.  Reported by a sun <asun@zoology.washington.edu>.

	* inet/net/ethernet.h: Move to sysdeps/unix/sysv/linux/net.
	* inet/Makefile (headers): Remove net/ethernet.h.
	* sysdeps/unix/sysv/linux/Makefile: Install net/ethernet.h.
	* sysdeps/unix/sysv/linux/Dist: Distribute net/ethernet.h.

1997-02-20 15:23  Thorsten Kukuk  <kukuk@weber.uni-paderborn.de>

	* nss/nsswitch.c (__nss_configure_lookup): Use correct test when
	searching in sorted array.

1997-02-20 01:24  Philip Blundell  <pjb27@cam.ac.uk>

	* inet/getnameinfo.c: Change to use reentrant getXXbyYY functions
	and protect modification of global data.

1997-02-19 18:48  Miles Bader  <miles@gnu.ai.mit.edu>

	* argp-parse.c (argp_default_parser): Set STATE->name for OPT_PROGNAME.
	(parser_init): Use the basename for PARSER->state.name.
	* argp-help.c (__argp_error, __argp_failure, __argp_state_help):
	Use PROGRAM_INVOCATION_SHORT_NAME instead of PROGRAM_INVOCATION_NAME.

	* argp-parse.c (parser_init): Set PARSER->state.flags.
	Make check whether PARSER has the prog name in argv[0] at the
	proper place.

1997-02-19 23:34  Ulrich Drepper  <drepper@cygnus.com>

	* locale/programs/ld-time.c (time_finish): t_fmt_ampm is optional.
	Use default value instead of printing a warning.

	* nss/XXX-lookup.c: Add misssing explanation.

1997-02-19 19:14  Andreas Jaeger  <aj@arthur.pfalz.de>

	* inet/in6_addr.c: Add missing braces.

	* inet/getnameinfo.c: Include <arpa/inet.h>.

	* sysdeps/posix/getaddrinfo.c: Include <arpa/inet.h>.

1997-02-19 11:46  Ulrich Drepper  <drepper@cygnus.com>

	* string/strxfrm.c (STRCOLL): Correct handling of `position'
	levels with no non-IGNOREd element and handling of NUL byte.
	* string/strcoll.c (STRXFRM): Likewise.
	* locale/weight.h: Likewise.

	* shadow/sgetspent_r.c (LINE_PARSER): Add missing ')'.

3 files changed, 128 insertions, 112 deletions

diff --git a/inet/getnameinfo.c b/inet/getnameinfo.c
index b9454f6396..95ed6bf3f9 100644
--- a/inet/getnameinfo.c
+++ b/inet/getnameinfo.c
@@ -45,6 +45,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define INET6 1
 #define LOCAL 1
 #define HOSTTABLE 0
+#define RESOLVER 1
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -59,6 +60,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
+#include <alloca.h>
+#include <libc-lock.h>
+#include <arpa/inet.h>
 
 #ifndef AF_LOCAL
 #define AF_LOCAL AF_UNIX
@@ -79,39 +83,91 @@ struct hostent *_addr2hostname_hosts(const char *, int, int);
 static char *domain;
 static char domainbuffer[MAXHOSTNAMELEN];
 
-
-static char *
-nrl_domainname (void)
+static char *nrl_domainname(void)
 {
   static int first = 1;
 
   if (first) {
-    char *c;
-    struct hostent *h;
-
-    first = 0;
-
-    if ((h = gethostbyname("localhost")) && (c = strchr(h->h_name, '.')))
-      return strcpy(domain = domainbuffer, ++c);
-
-    if (!gethostname(domainbuffer, sizeof(domainbuffer))) {
-      if (c = strchr(domainbuffer, '.'))
-        return (domain = ++c);
-
-      if ((h = gethostbyname(domainbuffer)) && (c = strchr(h->h_name, '.')))
-        return strcpy(domain = domainbuffer, ++c);
-    }
 
-    {
-      struct in_addr in_addr;
+    __libc_lock_define_initialized (static, lock);
+    __libc_lock_lock (lock);
+
+    if (first) {
+      char *c;
+      struct hostent *h, th;
+      int tmpbuflen = 1024;
+      char *tmpbuf = __alloca(tmpbuflen);
+      int herror;
+
+      first = 0;
+
+      while (__gethostbyname_r("localhost", &th, tmpbuf, tmpbuflen, &h,
+			       &herror)) {
+	if (herror == NETDB_INTERNAL) {
+	  if (errno == ERANGE) {
+	    tmpbuflen *= 2;
+	    tmpbuf = __alloca(tmpbuflen);
+	  }
+	} else {
+	  break;
+	}
+      }
+
+      if (h && (c = strchr(h->h_name, '.'))) {
+	strcpy(domain = domainbuffer, ++c);
+	goto ret;
+      }
+
+      if (!gethostname(domainbuffer, sizeof(domainbuffer))) {
+	if (c = strchr(domainbuffer, '.')) {
+	  domain = ++c;
+	  goto ret;
+	}
+
+	while (__gethostbyname_r(domainbuffer, &th, tmpbuf, tmpbuflen, &h,
+				 &herror)) {
+	  if (herror == NETDB_INTERNAL) {
+	    if (errno == ERANGE) {
+	      tmpbuflen *= 2;
+	      tmpbuf = __alloca(tmpbuflen);
+	    }
+	  } else {
+	    break;
+	  }
+	}
+
+	if (h && (c = strchr(h->h_name, '.'))) {
+	  strcpy(domain = domainbuffer, ++c);
+	  goto ret;
+	}
+      }
+
+      {
+	struct in_addr in_addr;
+
+	in_addr.s_addr = htonl(0x7f000001);
+
+	while (__gethostbyaddr_r((const char *)&in_addr, sizeof(struct in_addr), AF_INET, &th, tmpbuf, tmpbuflen, &h, &herror)) {
+	  if (herror == NETDB_INTERNAL) {
+	    if (errno == ERANGE) {
+	      tmpbuflen *= 2;
+	      tmpbuf = __alloca(tmpbuflen);
+	    }
+	  } else {
+	    break;
+	  }
+	}
 
-      in_addr.s_addr = htonl(0x7f000001);
+	if (h && (c = strchr(h->h_name, '.'))) {
+	  domain = domainbuffer, ++c;
+	  goto ret;
+	}
+      }
 
-      if ((h = gethostbyaddr((const char *)&in_addr, sizeof(struct in_addr), AF_INET)) && (c = strchr(h->h_name, '.')))
-        return strcpy(domain = domainbuffer, ++c);
     }
 
-    return NULL;
+  ret:
+    __libc_lock_unlock (lock);
   };
 
   return domain;
@@ -120,6 +176,10 @@ nrl_domainname (void)
 int getnameinfo(const struct sockaddr *sa, size_t addrlen, char *host, size_t hostlen, char *serv, size_t servlen, int flags)
 {
   int serrno = errno;
+  int tmpbuflen = 1024;
+  int herrno;
+  char *tmpbuf = __alloca(tmpbuflen);
+  struct hostent th;
 
   if (!sa)
     return -1;
@@ -144,20 +204,39 @@ int getnameinfo(const struct sockaddr *sa, size_t addrlen, char *host, size_t ho
 #if RESOLVER
 	  if (!h) {
 #if INET6
-	    if (sa->sa_family == AF_INET6)
-	      h = gethostbyaddr((void *)&(((struct sockaddr_in6 *)sa)->sin6_addr), sizeof(struct in6_addr), AF_INET6);
-	    else
+	    if (sa->sa_family == AF_INET6) {
+	      while (__gethostbyaddr_r((void *)&(((struct sockaddr_in6 *)sa)->sin6_addr), sizeof(struct in6_addr), AF_INET6, &th, tmpbuf, tmpbuflen, &h, &herrno)) {
+		if (herrno == NETDB_INTERNAL) {
+		  if (errno == ERANGE) {
+		    tmpbuflen *= 2;
+		    tmpbuf = __alloca(tmpbuflen);
+		  } else {
+		    __set_h_errno(herrno);
+		    goto fail;
+		  }
+		} else {
+		  break;
+		}
+	      }
+	    } else {
 #endif /* INET6 */
-	      h = gethostbyaddr((void *)&(((struct sockaddr_in *)sa)->sin_addr), sizeof(struct in_addr), AF_INET);
-	    endhostent();
-	  };
+	      while (__gethostbyaddr_r((void *)&(((struct sockaddr_in *)sa)->sin_addr), sizeof(struct in_addr), AF_INET, &th, tmpbuf, tmpbuflen, &h, &herrno)) {
+		if (errno == ERANGE) {
+		  tmpbuflen *= 2;
+		  tmpbuf = __alloca(tmpbuflen);
+		} else {
+		  break;
+		}
+	      }
+	    }
+	  }
 #endif /* RESOLVER */
 
 	  if (h) {
 	    if (flags & NI_NOFQDN) {
 	      char *c;
 	      if ((c = nrl_domainname()) && (c = strstr(h->h_name, c)) && (c != h->h_name) && (*(--c) == '.')) {
-		strncpy(host, h->h_name, min(hostlen, (c - h->h_name)));
+		strncpy(host, h->h_name, min(hostlen, (size_t) (c - h->h_name)));
 		break;
 	      };
 	    };
@@ -210,8 +289,20 @@ int getnameinfo(const struct sockaddr *sa, size_t addrlen, char *host, size_t ho
       case AF_INET6:
 #endif /* INET6 */
 	if (!(flags & NI_NUMERICSERV)) {
-	  struct servent *s;
-	  if (s = getservbyport(((struct sockaddr_in *)sa)->sin_port, (flags & NI_DGRAM) ? "udp" : "tcp")) {
+	  struct servent *s, ts;
+	  while (__getservbyport_r(((struct sockaddr_in *)sa)->sin_port, ((flags & NI_DGRAM) ? "udp" : "tcp"), &ts, tmpbuf, tmpbuflen, &s)) {
+	    if (herrno == NETDB_INTERNAL) {
+	      if (errno == ERANGE) {
+		tmpbuflen *= 2;
+		tmpbuf = __alloca(tmpbuflen);
+	      } else {
+		goto fail;
+	      }
+	    } else {
+	      break;
+	    }
+	  }
+	  if (s) {
 	    strncpy(serv, s->s_name, servlen);
 	    break;
 	  };
@@ -224,7 +315,6 @@ int getnameinfo(const struct sockaddr *sa, size_t addrlen, char *host, size_t ho
 	break;
 #endif /* LOCAL */
     };
-
   if (host && (hostlen > 0))
     host[hostlen-1] = 0;
   if (serv && (servlen > 0))
diff --git a/inet/in6_addr.c b/inet/in6_addr.c
index a68990e160..69c9c0b468 100644
--- a/inet/in6_addr.c
+++ b/inet/in6_addr.c
@@ -19,8 +19,10 @@
 
 #include <netinet/in.h>
 
-const struct in6_addr in6addr_any = { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } };
-const struct in6_addr in6addr_loopback = { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } };
+const struct in6_addr in6addr_any =
+{ { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } };
+const struct in6_addr in6addr_loopback =
+{ { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } };
 
 int inet6_isipv4mapped(const struct in6_addr *addr)
 {
diff --git a/inet/net/ethernet.h b/inet/net/ethernet.h
deleted file mode 100644
index 89a92c53f1..0000000000
--- a/inet/net/ethernet.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* Based on the FreeBSD version of this file. Curiously, that file
-   lacks a copyright in the header. */
-
-#ifndef __NET_ETHERNET_H
-#define __NET_ETHERNET_H 1
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <linux/if_ether.h>     /* IEEE 802.3 Ethernet constants */
-
-__BEGIN_DECLS
-
-/* This is a name for the 48 bit ethernet address available on many
-   systems.  */
-struct ether_addr
-{
-  u_int8_t ether_addr_octet[ETH_ALEN];
-};
-
-/* 10Mb/s ethernet header */
-struct ether_header
-{
-  u_int8_t  ether_dhost[ETH_ALEN];	/* destination eth addr	*/
-  u_int8_t  ether_shost[ETH_ALEN];	/* source ether addr	*/
-  u_int16_t ether_type;		        /* packet type ID field	*/
-};
-
-/* Ethernet protocol ID's */
-#define	ETHERTYPE_PUP		0x0200          /* Xerox PUP */
-#define	ETHERTYPE_IP		0x0800		/* IP */
-#define	ETHERTYPE_ARP		0x0806		/* Address resolution */
-#define	ETHERTYPE_REVARP	0x8035		/* Reverse ARP */
-
-#define	ETHER_ADDR_LEN	ETH_ALEN                 /* size of ethernet addr */
-#define	ETHER_TYPE_LEN	2                        /* bytes in type field */
-#define	ETHER_CRC_LEN	4                        /* bytes in CRC field */
-#define	ETHER_HDR_LEN	ETH_HLEN                 /* total octets in header */
-#define	ETHER_MIN_LEN	(ETH_ZLEN + ETH_CRC_LEN) /* min packet length */
-#define	ETHER_MAX_LEN	(ETH_FRAME_LEN + ETH_CRC_LEN) /* max packet length */
-
-/* make sure ethenet length is valid */
-#define	ETHER_IS_VALID_LEN(foo)	\
-	((foo) >= ETHER_MIN_LEN && (foo) <= ETHER_MAX_LEN)
-
-/*
- * The ETHERTYPE_NTRAILER packet types starting at ETHERTYPE_TRAIL have
- * (type-ETHERTYPE_TRAIL)*512 bytes of data followed
- * by an ETHER type (as given above) and then the (variable-length) header.
- */
-#define	ETHERTYPE_TRAIL		0x1000		/* Trailer packet */
-#define	ETHERTYPE_NTRAILER	16
-
-#define	ETHERMTU	ETH_DATA_LEN
-#define	ETHERMIN	(ETHER_MIN_LEN-ETHER_HDR_LEN-ETHER_CRC_LEN)
-
-__END_DECLS
-
-#endif /* net/ethernet.h */