Fri Jun 28 02:41:08 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>cvs/libc-960628

	* nss/Makefile (databases): New variable.
	(routines, libnss_files-routines): Use it.
	(subdir-dirs): Compute from $(services).

	* sysdeps/unix/sysv/linux/syscalls.list (create_module, delete_module,
	init_module, klogctl): Use EXTRA in the "caller" column so these get
	added to unix-extra-syscalls and thus compiled in misc.

	* string/Makefile (routines): Add strndup.
	* string/strndup.c: New file.
	* string/string.h: Declare strndup.
	(strndupa): New macro.

	* string/string.h: Declare __strdup.
	* string/strdup.c: Deansideclized.  Define __ name and weak alias.

	* string/string.h: Don't define memccpy as macro for [__OPTIMIZE__].

Thu Jun 27 23:43:22 1996  Richard Henderson  <rth@tamu.edu>

	* sysdeps/alpha/dl-machine.h (elf_machine_rela):  The Alpha's
	address-of operation and plt format conspire to require all
	dynamic relocs to be resolved to actual symbols not plt entries.

Thu Jun 27 02:49:28 1996  Ulrich Drepper  <drepper@cygnus.com>

	* catgets/gencat.c: Add casts to avoid signed<->unsigned warnings.

	* grp/initgroups.c (initgroups): De-ansi-fy.
	Move declaration of NGROUPS and GROUPS outside #if so that
	the code compiles for NGROUPS_MAX != 0.

	* inet/Makefile (headers): Add netinet/ether.h and netinet/if_ether.h.
	(routines): Add ether_aton, ether_aton_r, ether_hton, ether_line,
	ether_ntoa, ether_ntoa_r, and ether_ntoh.
	* inet/ether_aton.c, inet/ether_aton_r.c, inet/ether_hton.c,
	inet/ether_line.c, inet/ether_ntoa.c, inet/ether_ntoa_r.c,
	inet/ether_ntoh.c: New files.  Implementation of functions to
	handle Ethernet address to host mapping.
	* inet/netinet/ether.h: New file.  Declare ether_* functions.
	* netinet/ether.h: Wrapper around inet/netinet/ether.h for glibc
	compilation.
	* nss/ethers-lookup.c: New file.  Lookup function for ethers database.
	* nss/Makefile (routines): Add ethers-lookup.
	(libnss_files-routines): Add files-ethers.

	* nss/getXXent_r.c: Don't define set*ent and end*ent function
	with _r suffix.

	* nss/nss_files/files-XXX.c (internal_endent): Don't reset
	KEEP_STREAM every time called.
	(_nss_files_end): Reset KEEP_STREAM here instead.
	(internal_getent): If STREAM == NULL try to open instead of
	signalling error.
	Use cast to prevent warning.
	Terminate read line in case the buffer is too small.

	* nss/nss_files/files-ethers.c: New file.  Implementation of
	Ethernet adress<->hostname lookup through files interface.

	* stdlib/mbstowcs.c: Define based on mbsrtowcs().
	* stdlib/mbtowc.c: Define based on mbrtowc().
	* stdlib/wcstombs.c: Define based on wcsrtombs().
	* stdlib/wctomb.c: Define based on wcrtomb().

	* sunrpc/xdr.c (xdr_u_int): Avoid bogus call to
	unexpected_sizes_in_xdr_u_int.

	* sysdeps/generic/netinet/if_ether.h: New file.  Generic declaration
	of `struct ether_addr'.
	* sysdeps/unix/sysv/linux/netinet/if_ether.h: New file.  Linux specific
	declaration of `struct ether_addr'.

	* wcsmbs/mbrtowc.c: Handle case where argument PS is NULL.
	* wcsmbs/mbsrtowcs.c: Ditto.
	* wcsmbs/wcrtomb.c: Ditto.
	* wcsmbs/wcsrtombs.c: Ditto.

	* wcsmbs/mbsinit.c: Prepare for PS being NULL.

5 files changed, 115 insertions, 16 deletions

diff --git a/nss/Makefile b/nss/Makefile
index 91c4ef7380..bdf1651bb1 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -25,10 +25,10 @@ distribute		:= nsswitch.h XXX-lookup.c getXXbyYY.c getXXbyYY_r.c \
 			   getXXent.c getXXent_r.c
 
 # This is the trivial part which goes into libc itself.
-routines		:= nsswitch \
-			   $(addsuffix -lookup,proto service host network \
-					       grp pwd rpc)
+routines		= nsswitch $(addsuffix -lookup,$(databases))
 
+# These are the databases that go through nss dispatch.
+databases		= proto service host network grp pwd rpc ethers
 
 # Specify rules for the nss_* modules.  We have some services.
 services		:= files dns
@@ -36,12 +36,11 @@ services		:= files dns
 extra-libs		= $(services:%=libnss_%)
 
 # The sources are found in the appropriate subdir.
-subdir-dirs = nss_files nss_dns
+subdir-dirs = $(services:%=nss_%)
 vpath %.c $(subdir-dirs)
 
 
-libnss_files-routines	:= files-proto files-service files-network \
-			   files-hosts files-grp files-pwd files-rpc
+libnss_files-routines	:= $(addprefix files-,$(databases))
 distribute		+= files-XXX.c files-parse.c
 
 libnss_dns-routines	:= dns-host dns-network
diff --git a/nss/ethers-lookup.c b/nss/ethers-lookup.c
new file mode 100644
index 0000000000..7746781a0c
--- /dev/null
+++ b/nss/ethers-lookup.c
@@ -0,0 +1,22 @@
+/* Copyright (C) 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+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.  */
+
+#define DATABASE_NAME ethers
+
+#include "XXX-lookup.c"
diff --git a/nss/getXXent_r.c b/nss/getXXent_r.c
index 3d1e9593e6..07e575997a 100644
--- a/nss/getXXent_r.c
+++ b/nss/getXXent_r.c
@@ -101,7 +101,7 @@ extern int DB_LOOKUP_FCT (service_user **nip, const char *name, void **fctp);
 
 
 void
-APPEND_R (SETFUNC_NAME) (STAYOPEN)
+SETFUNC_NAME (STAYOPEN)
 {
   set_function fct;
   int no_more;
@@ -138,7 +138,7 @@ APPEND_R (SETFUNC_NAME) (STAYOPEN)
 
 
 void
-APPEND_R (ENDFUNC_NAME) (void)
+ENDFUNC_NAME (void)
 {
   end_function fct;
   int no_more;
diff --git a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c
index 40bb7df81e..7291c75d84 100644
--- a/nss/nss_files/files-XXX.c
+++ b/nss/nss_files/files-XXX.c
@@ -102,9 +102,6 @@ internal_endent (void)
       fclose (stream);
       stream = NULL;
     }
-
-  /* Reset STAYOPEN flag.  */
-  keep_stream = 0;
 }
 
 
@@ -116,6 +113,9 @@ CONCAT(_nss_files_end,ENTNAME) (void)
 
   internal_endent ();
 
+  /* Reset STAYOPEN flag.  */
+  keep_stream = 0;
+
   __libc_lock_unlock (lock);
 
   return NSS_STATUS_SUCCESS;
@@ -131,15 +131,17 @@ internal_getent (struct STRUCTURE *result,
   struct parser_data *data = (void *) buffer;
   int linebuflen = buffer + buflen - data->linebuffer;
 
-  /* Someone called internal_setent before calling us, so if the
-     stream is not open now the file could not be opened.  */
+  /* Be prepared that the set*ent function was not called before.  */
   if (stream == NULL)
     {
-      H_ERRNO_SET (NETDB_INTERNAL);
-      return NSS_STATUS_UNAVAIL;
+      enum nss_status status;
+
+      status = internal_setent (0);
+      if (status != NSS_STATUS_SUCCESS)
+	return status;
     }
 
-  if (buflen < sizeof *data + 1)
+  if (buflen < (int) sizeof *data + 1)
     {
       errno = ERANGE;
       return NSS_STATUS_NOTFOUND;
@@ -155,6 +157,9 @@ internal_getent (struct STRUCTURE *result,
 	  return NSS_STATUS_NOTFOUND;
 	}
 
+      /* Terminate the line for any case.  */
+      data->linebuffer[linebuflen - 1] = '\0';
+
       /* Skip leading blanks.  */
       while (isspace (*p))
 	++p;
diff --git a/nss/nss_files/files-ethers.c b/nss/nss_files/files-ethers.c
new file mode 100644
index 0000000000..e7579a48bc
--- /dev/null
+++ b/nss/nss_files/files-ethers.c
@@ -0,0 +1,73 @@
+/* Copyright (C) 1996 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.  */
+
+#include <string.h>
+#include <netinet/if_ether.h>
+
+/* Because the `ethers' lookup does not fit so well in the scheme so
+   we define a dummy struct here which helps us to use the available
+   functions.  */
+struct etherent
+{
+  const char *e_name;
+  struct ether_addr e_addr;
+};
+struct etherent_data {};
+
+#define ENTNAME		etherent
+#define DATAFILE	"/etc/ethers"
+#include "files-parse.c"
+LINE_PARSER
+(
+ MIDLINE_COMMENTS;
+ /* Read the ethernet address: 6 x 8bit hexadecimal number.  */
+ {
+   size_t cnt;
+
+   for (cnt = 0; cnt < 6; ++cnt)
+     {
+       unsigned int number;
+
+       if (cnt < 5)
+	 INT_FIELD (number, ISCOLON , 0, 16, (unsigned int))
+       else
+	 INT_FIELD (number, isspace, 0, 16, (unsigned int))
+
+       if (number > 0xff)
+	 return 0;
+       result->e_addr.ether_addr_octet[cnt] = number;
+     }
+ };
+ STRING_FIELD (result->e_name, isspace, 1);
+ )
+
+
+#include "files-XXX.c"
+
+DB_LOOKUP (hostton,
+	   {
+	     if (strcmp (result->e_name, name) == 0)
+	       break;
+	   }, const char *name)
+
+DB_LOOKUP (ntohost,
+	   {
+	     if (memcmp (&result->e_addr, addr,
+			 sizeof (struct ether_addr)) == 0)
+	       break;
+	   }, struct ether_addr *addr)