update from main archive 961211cvs/libc-961214cvs/libc-961213cvs/libc-961212

Thu Dec 12 03:32:21 1996  Ulrich Drepper  <drepper@cygnus.com>

	* libio/_G_config.h: Add definition of _G_int16_t, _G_int32_t,
	_G_uint16_t, _G_uin32_t, _G_HAVE_BOOL, _G_HAVE_MMAP, and
	_G_ARGS.

	Change libio buffer handling to allocate internal buffers using
	mmap if possible.
	* libio/filedoalloc.c (_IO_file_doallocate): Change call to
	ALLOC_BUF.
	* libio/genops.c (_IO_setb, _IO_default_finish): Change call
	to FREE_BUF.
	(_IO_default_doallocate): Change call to ALLOC_BUF.
	* libio/libioP.h: Change definition of ALLOC_BUF and FREE_BUF
	to use mmap/munmap when possible.
	* libio/memstream.c: Don't use ALLOC_BUF, but directly malloc.
	* libio/vasprintf.c: Likewise.
	Patch by HJ Lu.

	* libio/libio.h: Define NULL as __null only for gcc-2.8 and up.
	* libio/libioP.h: Likewise.

	* libio/fileops.c (_IO_file_read, _IO_file_write): Don't
	restart syscall when EINTR was returned.  Necessary for POSIX.1.

	* libio/strops.c (_IO_str_overflow): Add cast to prevent warning.

	* new-malloc/malloc.c (heap_trim): Correctly place parentheses to
	prevent warnings.

	* nis/Makefile: Remove rules for bsd-tools which are not part
	of glibc.
	Patch by Thorsten Kukuk.

	* nis/ypclnt.c: Add prototype for xdr_free.
	Add const to first parameter for __yp_bind.
	* nis/nss_compat/compat-pwd.c (getpwent_next_netgr, getpwent_next_nis,
	getpwent_next_file): Variable `p2len' must have type size_t.
	* nis/nss_nis/nis-alias.c: Add casts to prevent warnings.
	* nis/nss_nis/nis-ethers.c: Likewise.
	* nis/nss_nis/nis-grp.c: Likewise.
	* nis/nss_nis/nis-hosts.c: Likewise.
	* nis/nss_nis/nis-network.c: Likewise.
	* nis/nss_nis/nis-proto.c: Likewise.
	* nis/nss_nis/nis-pwd.c: Likewise.
	* nis/nss_nis/nis-rpc.c: Likewise.
	* nis/nss_nis/nis-service.c: Likewise.
	* nis/nss_nis/nis-spwd.c: Likewise.

	* nis/rpcsvc/yp_prot.h (ypreq_key): Change type of members to
	`const char *'.
	(ypmaplist): Change member names to `map' and `next' and provide
	#defines for old names.
	Patch by Thorsten Kukuk.

	* nss/nss_files/files-parse.c (parse_line, parse_list): Change
	type for `datalen' parameter to size_t.

	* shsdow/lckpwdf.c: Use fcntl forlocking, not flock.

	* stdio-common/printf.c [USE_IN_LIBIO]: Provide alias _IO_printf
	for printf.
	* stdio-common/sscanf.c [USE_IN_LIBIO]: Provide alias _IO_sscanf
	for sscanf.
	Patch by HJ Lu.

	* stdio-common/tmpfile.c: Update copyright.

	* stdio-common/vfscanf.c: Correctly handle EINTR error from fgetc
	function.
	Don't eat white space for `C' format.

	* stdlib/tst-strtol.c [~0UL != 0xffffffff]: Fix typo in test data.

	* sysdeps/generic/abort.c: Update copyright.  De-ANSI-declfy.
	* sysdeps/i386/abort.c: Removed.  This version does not use
	signal SIGABRT.

	* sysdeps/i386/fpu/__math.h: Define __NO_MATH_INLINES if not using
	gcc-2.8 or up.
	Patch by HJ Lu.

	* sysdeps/posix/tempname.c: Test for error but EEXIST after open
	call.  If EMFILE, ENFILE, or EINTR return with error.

Wed Dec 11 14:43:52 1996  Ulrich Drepper  <drepper@cygnus.com>

	* gnu-versions.h: Set _GNU_OBSTACK_INTERFACE_VERSION back to 1.
	We are compatible again.
	* new-malloc/obstack.h (struct obstack): Add back alloc_failed bit
	even though it is not used.
	* malloc/obstack.h: Likewise.
	* new-malloc/obstack.c (_obstack_begin, _obstack_begin_1): Initialize
	alloc_failed bit to 0.

	* time/strftime.c: Extend for Emacs' needs.  Recognize field width,
	%P format and `0' modifier.

Tue Dec 10 21:20:44 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* Makerules (make-link): Don't discard exit codes of intermediate
	commands.  Always use rellns-sh if symbolic links are available.

Tue Dec 10 20:09:51 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/unix/sysv/linux/netinet/in.h: Enclose #include
	<linux/in.h> in __BEGIN_DECLS/__END_DECLS to avoid linkage
	conflict of ntohs etc. in <asm/byteorder.h>.

14 files changed, 59 insertions, 56 deletions

diff --git a/nis/Makefile b/nis/Makefile
index 475ee67175..a6d4d4f56a 100644
--- a/nis/Makefile
+++ b/nis/Makefile
@@ -36,12 +36,8 @@ extra-libs		= libnsl $(services:%=libnss_%)
 # the `lib' pass, because they depend on libc.so being built already.
 extra-libs-others	= $(extra-libs)
 
-others = ypcat ypmatch yppoll ypset ypwhich
-install-bin = ypcat ypmatch ypwhich
-install-sbin = ypset yppoll
-
 # The sources are found in the appropriate subdir.
-subdir-dirs = bsd-tools $(services:%=nss_%)
+subdir-dirs = $(services:%=nss_%)
 vpath %.c $(subdir-dirs)
 
 libnsl-routines = yp_xdr ypclnt ypupdate_xdr
@@ -69,15 +65,9 @@ CFLAGS-nis-pwd.c = -Wno-strict-prototypes
 CFLAGS-nis-rpc.c = -Wno-strict-prototypes
 CFLAGS-nis-service.c = -Wno-strict-prototypes
 CFLAGS-nis-spwd.c = -Wno-strict-prototypes
-CFLAGS-ypclnt.c = -Wno-strict-prototypes -Wno-write-strings
-CFLAGS-yp_xdr.c = -Wno-strict-prototypes
-CFLAGS-ypupdate_xdr.c = -Wno-strict-prototypes
-CFLAGS-ypcat.c = -Wno-strict-prototypes
-CFLAGS-ypmatch.c = -Wno-strict-prototypes
-CFLAGS-ypwhich.c = -Wno-strict-prototypes
-CFLAGS-ypset.c = -Wno-strict-prototypes
-CFLAGS-yppoll.c = -Wno-strict-prototypes
-
+CFLAGS-ypclnt.c = -Wno-strict-prototypes -Wno-write-strings -Irpcsvc
+CFLAGS-yp_xdr.c = -Wno-strict-prototypes -Irpcsvc
+CFLAGS-ypupdate_xdr.c = -Wno-strict-prototypes -Irpcsvc
 
 include ../Rules
 
diff --git a/nis/nss_compat/compat-pwd.c b/nis/nss_compat/compat-pwd.c
index 503aafb51e..39ee2c5901 100644
--- a/nis/nss_compat/compat-pwd.c
+++ b/nis/nss_compat/compat-pwd.c
@@ -270,7 +270,8 @@ getpwent_next_netgr (struct passwd *result, ent_t *ent, char *group,
 		     char *buffer, size_t buflen)
 {
   char *ypdomain, *host, *user, *domain, *outval, *p, *p2;
-  int status, outvallen, p2len;
+  int status, outvallen;
+  size_t p2len;
 
   if (yp_get_default_domain (&ypdomain) != YPERR_SUCCESS)
     {
@@ -337,7 +338,8 @@ getpwent_next_nis (struct passwd *result, ent_t *ent, char *buffer,
 		   size_t buflen)
 {
   char *domain, *outkey, *outval, *p, *p2;
-  int outkeylen, outvallen, p2len;
+  int outkeylen, outvallen;
+  size_t p2len;
 
   if (yp_get_default_domain (&domain) != YPERR_SUCCESS)
     {
@@ -413,7 +415,7 @@ getpwent_next_file (struct passwd *result, ent_t *ent,
   while (1)
     {
       char *p, *p2;
-      int p2len;
+      size_t p2len;
 
       do
 	{
diff --git a/nis/nss_nis/nis-alias.c b/nis/nss_nis/nis-alias.c
index af83d9cd7c..df884d6faa 100644
--- a/nis/nss_nis/nis-alias.c
+++ b/nis/nss_nis/nis-alias.c
@@ -172,7 +172,7 @@ internal_nis_getaliasent_r (struct aliasent *alias, char *buffer,
           return retval;
         }
 
-      if (len + 1 > buflen)
+      if ((size_t) (len + 1) > buflen)
         {
 	  free (result);
           __set_errno (ERANGE);
@@ -244,7 +244,7 @@ _nss_nis_getaliasbyname_r (const char *name, struct aliasent *alias,
       return retval;
     }
 
-  if (len + 1 > buflen)
+  if ((size_t) (len + 1) > buflen)
     {
       free (result);
       __set_errno (ERANGE);
diff --git a/nis/nss_nis/nis-ethers.c b/nis/nss_nis/nis-ethers.c
index 26449720bb..ae3ba76adf 100644
--- a/nis/nss_nis/nis-ethers.c
+++ b/nis/nss_nis/nis-ethers.c
@@ -107,7 +107,7 @@ internal_nis_getetherent_r (struct ether *eth, char *buffer, size_t buflen)
           return retval;
         }
 
-      if (len + 1 > buflen)
+      if ((size_t) (len + 1) > buflen)
         {
           free (result);
           __set_errno (ERANGE);
@@ -175,7 +175,7 @@ _nss_nis_getethernam_r (const char *name, struct ether *eth,
       return retval;
     }
 
-  if (len + 1 > buflen)
+  if ((size_t) (len + 1) > buflen)
     {
       free (result);
       __set_errno (ERANGE);
@@ -237,7 +237,7 @@ _nss_nis_getetherbyaddr_r (struct ether_addr *addr, struct ether *eth,
       return retval;
     }
 
-  if (len + 1 > buflen)
+  if ((size_t) (len + 1) > buflen)
     {
       free (result);
       __set_errno (ERANGE);
diff --git a/nis/nss_nis/nis-grp.c b/nis/nss_nis/nis-grp.c
index 1bab862c2f..72de8b3c83 100644
--- a/nis/nss_nis/nis-grp.c
+++ b/nis/nss_nis/nis-grp.c
@@ -101,7 +101,7 @@ internal_nis_getgrent_r (struct group *grp, char *buffer, size_t buflen)
           return retval;
         }
 
-      if (len + 1 > buflen)
+      if ((size_t) (len + 1) > buflen)
         {
           free (result);
           __set_errno (ERANGE);
@@ -169,7 +169,7 @@ _nss_nis_getgrnam_r (const char *name, struct group *grp,
       return retval;
     }
 
-  if (len + 1 > buflen)
+  if ((size_t) (len + 1) > buflen)
     {
       free (result);
       __set_errno (ERANGE);
@@ -219,7 +219,7 @@ _nss_nis_getgrgid_r (gid_t gid, struct group *grp,
       return retval;
     }
 
-  if (len + 1 > buflen)
+  if ((size_t) (len + 1) > buflen)
     {
       free (result);
       __set_errno (ERANGE);
diff --git a/nis/nss_nis/nis-hosts.c b/nis/nss_nis/nis-hosts.c
index 9adce18ca3..bab7f4c5f4 100644
--- a/nis/nss_nis/nis-hosts.c
+++ b/nis/nss_nis/nis-hosts.c
@@ -195,7 +195,7 @@ internal_nis_gethostent_r (struct hostent *host, char *buffer,
 	  return retval;
 	}
 
-      if (len + 1 > linebuflen)
+      if ((size_t) (len + 1) > linebuflen)
         {
           free (result);
 	  *h_errnop = NETDB_INTERNAL;
@@ -281,7 +281,7 @@ _nss_nis_gethostbyname_r (const char *name, struct hostent *host,
       return retval;
     }
 
-  if (len + 1 > linebuflen)
+  if ((size_t) (len + 1) > linebuflen)
     {
       free (result);
       *h_errnop = NETDB_INTERNAL;
@@ -354,7 +354,7 @@ _nss_nis_gethostbyaddr_r (char *addr, int addrlen, int type,
       return retval;
     }
 
-  if (len + 1 > linebuflen)
+  if ((size_t) (len + 1) > linebuflen)
     {
       free (result);
       __set_errno (ERANGE);
diff --git a/nis/nss_nis/nis-network.c b/nis/nss_nis/nis-network.c
index 2795feb421..e82b40143e 100644
--- a/nis/nss_nis/nis-network.c
+++ b/nis/nss_nis/nis-network.c
@@ -106,7 +106,7 @@ internal_nis_getnetent_r (struct netent *net, char *buffer, size_t buflen,
           return retval;
         }
 
-      if (len + 1 > buflen)
+      if ((size_t) (len + 1) > buflen)
         {
           free (result);
           __set_errno (ERANGE);
@@ -183,7 +183,7 @@ _nss_nis_getnetbyname_r (const char *name, struct netent *net,
       return retval;
     }
 
-  if (len + 1 > buflen)
+  if ((size_t) (len + 1) > buflen)
     {
       free (result);
       __set_errno (ERANGE);
@@ -261,7 +261,7 @@ _nss_nis_getnetbyaddr_r (unsigned long addr, int type, struct netent *net,
 	      }
 	  }
 
-      if (len + 1 > buflen)
+      if ((size_t) (len + 1) > buflen)
 	{
 	  free (result);
 	  __set_errno (ERANGE);
diff --git a/nis/nss_nis/nis-proto.c b/nis/nss_nis/nis-proto.c
index f62dfb1492..6feae63258 100644
--- a/nis/nss_nis/nis-proto.c
+++ b/nis/nss_nis/nis-proto.c
@@ -101,7 +101,7 @@ internal_nis_getprotoent_r (struct protoent *proto,
           return retval;
         }
 
-      if (len + 1 > buflen)
+      if ((size_t) (len + 1) > buflen)
         {
           free (result);
           __set_errno (ERANGE);
@@ -169,7 +169,7 @@ _nss_nis_getprotobyname_r (const char *name, struct protoent *proto,
       return retval;
     }
 
-  if (len + 1 > buflen)
+  if ((size_t) (len + 1) > buflen)
     {
       free (result);
       __set_errno (ERANGE);
@@ -219,7 +219,7 @@ _nss_nis_getprotobynumber_r (int number, struct protoent *proto,
       return retval;
     }
 
-  if (len + 1 > buflen)
+  if ((size_t) (len + 1) > buflen)
     {
       free (result);
       __set_errno (ERANGE);
diff --git a/nis/nss_nis/nis-pwd.c b/nis/nss_nis/nis-pwd.c
index afcc7a428e..752f7032a6 100644
--- a/nis/nss_nis/nis-pwd.c
+++ b/nis/nss_nis/nis-pwd.c
@@ -101,7 +101,7 @@ internal_nis_getpwent_r (struct passwd *pwd, char *buffer, size_t buflen)
           return retval;
         }
 
-      if (len + 1 > buflen)
+      if ((size_t) (len + 1) > buflen)
         {
           free (result);
           __set_errno (ERANGE);
@@ -169,7 +169,7 @@ _nss_nis_getpwnam_r (const char *name, struct passwd *pwd,
       return retval;
     }
 
-  if (len + 1 > buflen)
+  if ((size_t) (len + 1) > buflen)
     {
       free (result);
       __set_errno (ERANGE);
@@ -219,7 +219,7 @@ _nss_nis_getpwuid_r (uid_t uid, struct passwd *pwd,
       return retval;
     }
 
-  if (len + 1 > buflen)
+  if ((size_t) (len + 1) > buflen)
     {
       free (result);
       __set_errno (ERANGE);
diff --git a/nis/nss_nis/nis-rpc.c b/nis/nss_nis/nis-rpc.c
index 91f54be3a9..a549076537 100644
--- a/nis/nss_nis/nis-rpc.c
+++ b/nis/nss_nis/nis-rpc.c
@@ -128,7 +128,7 @@ internal_nis_getrpcent_r (struct rpcent *rpc, char *buffer, size_t buflen,
           return retval;
         }
 
-      if (len + 1 > buflen)
+      if ((size_t) (len + 1) > buflen)
         {
           free (result);
           __set_errno (ERANGE);
@@ -243,7 +243,7 @@ _nss_nis_getrpcbynumber_r (int number, struct rpcent *rpc,
       return retval;
     }
 
-  if (len + 1 > buflen)
+  if ((size_t) (len + 1) > buflen)
     {
       free (result);
       __set_errno (ERANGE);
diff --git a/nis/nss_nis/nis-service.c b/nis/nss_nis/nis-service.c
index 03a9fbf48e..6d07479ee2 100644
--- a/nis/nss_nis/nis-service.c
+++ b/nis/nss_nis/nis-service.c
@@ -28,6 +28,13 @@
 
 #include "nss-nis.h"
 
+
+/* The parser is defined in a different module.  */
+extern int _nss_files_parse_servent (char *line, struct servent *result,
+				     char *data, size_t datalen);
+
+
+
 __libc_lock_define_initialized (static, lock)
 
 struct intern_t
@@ -127,7 +134,7 @@ internal_nis_getservent_r (struct servent *serv, char *buffer,
           return retval;
         }
 
-      if (len + 1 > buflen)
+      if ((size_t) (len + 1) > buflen)
         {
           free (result);
           __set_errno (ERANGE);
diff --git a/nis/nss_nis/nis-spwd.c b/nis/nss_nis/nis-spwd.c
index 928489245b..b5f8c3afd2 100644
--- a/nis/nss_nis/nis-spwd.c
+++ b/nis/nss_nis/nis-spwd.c
@@ -101,7 +101,7 @@ internal_nis_getspent_r (struct spwd *sp, char *buffer, size_t buflen)
           return retval;
         }
 
-      if (len + 1 > buflen)
+      if ((size_t) (len + 1) > buflen)
         {
           free (result);
           __set_errno (ERANGE);
@@ -169,7 +169,7 @@ _nss_nis_getspnam_r (const char *name, struct spwd *sp,
       return retval;
     }
 
-  if (len + 1 > buflen)
+  if ((size_t) (len + 1) > buflen)
     {
       free (result);
       __set_errno (ERANGE);
diff --git a/nis/rpcsvc/yp_prot.h b/nis/rpcsvc/yp_prot.h
index 60c24a2f5f..a52b43fac0 100644
--- a/nis/rpcsvc/yp_prot.h
+++ b/nis/rpcsvc/yp_prot.h
@@ -1,7 +1,7 @@
 /*
  * This file contains symbols and structures defining the rpc protocol
  * between the NIS clients and the NIS servers.  The servers
- * are the NIS database servers, and the NIS binders.  
+ * are the NIS database servers, and the NIS binders.
  */
 
 #ifndef _RPCSVC_YP_PROT_H
@@ -14,24 +14,24 @@
 
 /*
  * The following procedures are supported by the protocol:
- * 
+ *
  * YPPROC_NULL() returns () takes nothing, returns nothing.  This indicates
  * that the NIS server is alive.
- * 
+ *
  * YPPROC_DOMAIN (char *) returns (bool_t) TRUE.  Indicates that the
  * responding NIS server does serve the named domain; FALSE indicates no
  * support.
- * 
+ *
  * YPPROC_DOMAIN_NONACK (char *) returns (TRUE) if the NIS server does serve
  * the named domain, otherwise does not return.  Used in the broadcast case.
- * 
+ *
  * YPPROC_MATCH (struct ypreq_key) returns (struct ypresp_val).  Returns the
  * right-hand value for a passed left-hand key, within a named map and
  * domain.
- * 
+ *
  * YPPROC_FIRST (struct ypreq_nokey) returns (struct ypresp_key_val).
  * Returns the first key-value pair from a named domain and map.
- * 
+ *
  * YPPROC_NEXT (struct ypreq_key) returns (struct ypresp_key_val).  Returns
  * the key-value pair following a passed key-value pair within a named
  * domain and map.
@@ -42,7 +42,7 @@
  * YPPROC_CLEAR	takes nothing, returns nothing.  Instructs a NIS server to
  * close the current map, so that old versions of the disk file don't get
  * held open.
- * 
+ *
  * YPPROC_ALL (struct ypreq_nokey), returns
  * 	union switch (bool_t more) {
  *		TRUE:	(struct ypresp_key_val);
@@ -89,8 +89,8 @@ struct ypmap_parms {
  */
 
 struct ypreq_key {
-  char *domain;
-  char *map;
+  const char *domain;
+  const char *map;
   datum keydat;
 };
 
@@ -144,8 +144,10 @@ struct ypresp_order {
 };
 
 struct ypmaplist {
-  char ypml_name[YPMAXMAP + 1];
-  struct ypmaplist *ypml_next;
+  char map[YPMAXMAP + 1];
+#define ypml_name map
+  struct ypmaplist *next;
+#define ypml_next next
 };
 
 struct ypresp_maplist {
@@ -201,7 +203,7 @@ struct ypresp_maplist {
  *
  * YPBINDPROC_SETDOM takes (struct ypbind_setdom) returns nothing
  */
- 
+
 /* Program and version symbols, magic numbers */
 
 #define YPBINDPROG		((u_long)100007)
diff --git a/nis/ypclnt.c b/nis/ypclnt.c
index 3e05cf984c..8e24ca468d 100644
--- a/nis/ypclnt.c
+++ b/nis/ypclnt.c
@@ -42,8 +42,10 @@ static char __ypdomainname[MAXHOSTNAMELEN + 1] = "\0";
 __libc_lock_define_initialized (static, ypbindlist_lock)
 static dom_binding *__ypbindlist = NULL;
 
+extern void xdr_free (xdrproc_t proc, char *objp);
+
 static int
-__yp_bind (char *domain, dom_binding ** ypdb)
+__yp_bind (const char *domain, dom_binding ** ypdb)
 {
   struct sockaddr_in clnt_saddr;
   struct ypbind_resp ypbr;