update from main archive 960921

Sun Sep 22 03:40:52 1996  Ulrich Drepper  <drepper@cygnus.com>

	* resolv/resolv.h: Update to bind-4.9.5-T4B.
	* resolv/base64.c: Likewise.
	* resolv/res_debug.c: Likewise.
	* resolv/res_query.c: Likewise.
	* resolv/gethnamaddr.c: Likewise.
	* nss/nss_dns/dns-host.c: Likewise.
	* resolv/res_comp.c: Likewise.
	* resolv/res_send.c: Likewise.
	* resolv/arpa/nameser.h: Likewise.  Attention: MAXDNAME is much
	higher now.

	* resolv/Banner: New file.
	* resolv/Makefile (distribute): Add Banner.

Sat Sep 21 19:15:24 1996  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/stub/getsysstats.c: New file.
	* sysdeps/unix/sysv/linux/getsysstats.c: New file.

	* misc/Makefile (headers): Add sys/sysinfo.h.
	(routines): Add getsysstats.
	* sysdeps/unix/sysv/linux/Makefile [$(subdir)==misc]
 	(sysdep_headers): Remove sys/sysinfo.h.
	* sysdeps/generic/sys/sysinfo.h: New file.
	* sysdeps/unix/sysv/linux/sys/sysinfo.h: Add prototype for get_nprocs,
	get_phys_pages, and get_avphys_pages.

	* misc/Makefile (routines): Add mntent_r.
	* misc/mntent_r.c: New file.
	* misc/mntent.c: Remove all functions but getmntent and use
	__getmntent_r.
	* misc/mntent.h: Add prototype for __getmntent_r.
	* misc/fstab.c: Use __getmntent_r function instead of getmntent.
	This will not clobber the state in getmntent.

	* sysdeps/generic/confname.h: Add _SC_PROCESSORS_CONF,
	_SC_NPROCESSORS_ONLN, _SC_PHYS_PAGES, _SC_AVPHYS_PAGES,
	_SC_ATEXIT_MAX, and _SC_PASS_MAX.
	* sysdeps/stub/sysconf.c: Add handling _SC_PROCESSORS_CONF and
	_SC_NPROCESSORS_ONLN by calling __get_nprocs, _SC_PHYS_PAGES by
	calling __get_phys_pages, _SY_AVPHYS_PAGES by calling
	__get_avphys_pages, _SC_ATEXIT_MAX and _SC_PASS_MAX.
	* sysdeps/posix/sysconf.c: Likewise.
	* posix/getconf.c (vars): Add _NPROCESSORS_CONF, _NPROCESSORS_ONLN,
	_PHYS_PAGES, _AVPHYS_PAGES, ATEXIT_MAX, and PASS_MAX entries.

Sat Sep 21 05:20:36 1996  Ulrich Drepper  <drepper@cygnus.com>

	* version.h (VERSION): Bump to 1.95.

	* Make-dist (+tsrcs): Don't filter out files in subdirs which
 	match files in the sysdeps hierachy (welcome back,
 	sys/syscall.h!).

	* resolv/Makefile (libresolv-routines): Remove getnetnamad.

Sat Sep 21 03:00:19 1996  Ulrich Drepper  <drepper@cygnus.com>

	* locale/loadlocale.c (_nl_free_locale): Remove function.
	* locale/localeinfo.h: Remove prototype for _nl_free_locale.
	* locale/setlocale.c (setlocale): Don't free locale data of
 	categories which succeeded to load after a wrong or missing data
 	file was observed.

	* locale/setlocale (setlocale): Initialize NEWNAME correctly so
	that it works even when the locale data is not used.

	* stdlib/random_r.c: Fix typo in comment.
	* stdlib/drand48-iter.c: Likewise.
	* stdlib/drand48.c: Likewise.
	* stdlib/erand48.c: Likewise.
	* stdlib/jrand48.c: Likewise.
	* stdlib/lcong48.c: Likewise.
	* stdlib/lrand48.c: Likewise.
	* stdlib/mrand48.c: Likewise.
	* stdlib/nrand48.c: Likewise.
	* stdlib/random.c: Likewise.
	* stdlib/seed48.c: Likewise.
	* stdlib/srand48.c: Likewise.
	* misc/search.h: Likewise.
	* misc/hsearch.c: Likewise.
	* misc/hsearch_r.c: Likewise.

	* sysdeps/unix/sysv/linux/m68k/sysdep.S (__errno_location):
Thu Sep 19 23:36:19 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>

	* hurd/hurdinit.c (__libc_argv): Provide common decl.
	(_hurd_setproc): Don't declare __libc_argv here.

8 files changed, 186 insertions, 119 deletions

diff --git a/misc/Makefile b/misc/Makefile
index 5bdb8252ed..343cc3ee62 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -28,7 +28,7 @@ headers	:= sys/uio.h iovec.h sys/ioctl.h ioctls.h ioctl-types.h \
 	   ttyent.h syslog.h sys/syslog.h paths.h sys/reboot.h \
 	   sys/mman.h sys/param.h fstab.h mntent.h search.h err.h error.h\
 	   sys/queue.h sysexits.h syscall.h sys/syscall.h sys/swap.h \
-	   sys/select.h ustat.h sys/ustat.h ustatbits.h
+	   sys/select.h ustat.h sys/ustat.h ustatbits.h sys/sysinfo.h
 
 routines := brk sbrk sstk ioctl \
 	    readv writev \
@@ -45,7 +45,7 @@ routines := brk sbrk sstk ioctl \
 	    ualarm usleep \
 	    gtty stty \
 	    ptrace nlist \
-	    fstab mntent \
+	    fstab mntent mntent_r \
 	    utimes \
 	    truncate ftruncate \
 	    chflags fchflags \
@@ -54,7 +54,8 @@ routines := brk sbrk sstk ioctl \
 	    mmap munmap mprotect msync madvise \
 	    efgcvt efgcvt_r qefgcvt qefgcvt_r \
 	    hsearch hsearch_r tsearch lsearch \
-	    err error ustat
+	    err error ustat \
+	    getsysstats
 aux := init-misc
 distribute := bsd-compat.c
 extra-objs := bsd-compat.o
diff --git a/misc/fstab.c b/misc/fstab.c
index c3c27df6ef..30a60a734c 100644
--- a/misc/fstab.c
+++ b/misc/fstab.c
@@ -1,5 +1,5 @@
-/* 
-Copyright (C) 1995 Free Software Foundation, Inc.
+/*
+Copyright (C) 1995, 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
@@ -22,6 +22,9 @@ Cambridge, MA 02139, USA.  */
 #include <stdio.h>
 
 static FILE *fstab;
+static struct mntent mntres;
+static char buffer[8192];
+
 
 static FILE *
 fstab_stream (void)
@@ -48,6 +51,10 @@ static struct fstab *
 mnt2fs (struct mntent *m)
 {
   static struct fstab f;
+
+  if (m == NULL)
+    return NULL;
+
   f.fs_spec = m->mnt_fsname;
   f.fs_file = m->mnt_dir;
   f.fs_vfstype = m->mnt_type;
@@ -70,8 +77,8 @@ getfsent (void)
 
   if (! s)
     return NULL;
-  
-  return mnt2fs (getmntent (s));
+
+  return mnt2fs (__getmntent_r (s, &mntres, buffer, sizeof buffer));
 }
 
 struct fstab *
@@ -80,7 +87,7 @@ getfsspec (name)
 {
   struct mntent *m;
   if (setfsent ())
-    while (m = getmntent (fstab))
+    while (m = __getmntent_r (fstab, &mntres, buffer, sizeof buffer))
       if (!strcmp (m->mnt_fsname, name))
 	return mnt2fs (m);
   return NULL;
@@ -88,11 +95,11 @@ getfsspec (name)
 
 struct fstab *
 getfsfile (name)
-	register const char *name;
+     register const char *name;
 {
   struct mntent *m;
   if (setfsent ())
-    while (m = getmntent (fstab))
+    while (m = __getmntent_r (fstab, &mntres, buffer, sizeof buffer))
       if (!strcmp (m->mnt_dir, name))
 	return mnt2fs (m);
   return NULL;
diff --git a/misc/hsearch.c b/misc/hsearch.c
index 7df8686dc3..e0b2e3e0ff 100644
--- a/misc/hsearch.c
+++ b/misc/hsearch.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995, 1996 Free Software Foundation, Inc.
 Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 This file is part of the GNU C Library.
 
@@ -19,11 +19,11 @@ Boston, MA 02111-1307, USA.  */
 
 #include <search.h>
 
-/* The non-reenttrent version use a global space for storing the table.  */
+/* The non-reentrant version use a global space for storing the table.  */
 static struct hsearch_data htab;
 
 
-/* Define the non-reentrent function using the reentrent counterparts.  */
+/* Define the non-reentrant function using the reentrant counterparts.  */
 ENTRY *
 hsearch (item, action)
      ENTRY item;
diff --git a/misc/hsearch_r.c b/misc/hsearch_r.c
index 86dbe793c0..151bb31efc 100644
--- a/misc/hsearch_r.c
+++ b/misc/hsearch_r.c
@@ -27,7 +27,7 @@ Boston, MA 02111-1307, USA.  */
    [Knuth]            The Art of Computer Programming, part 3 (6.4)  */
 
 
-/* The reentrent version has no static variables to maintain the state.
+/* The reentrant version has no static variables to maintain the state.
    Instead the interface of all functions is extended to take an argument
    which describes the current status.  */
 typedef struct _ENTRY
diff --git a/misc/mntent.c b/misc/mntent.c
index 0aa1fb8cde..37a52a354b 100644
--- a/misc/mntent.c
+++ b/misc/mntent.c
@@ -1,5 +1,5 @@
 /* Utilities for reading/writing fstab, mtab, etc.
-Copyright (C) 1995 Free Software Foundation, Inc.
+Copyright (C) 1995, 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
@@ -18,111 +18,12 @@ not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
 #include <mntent.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
 
-/* Prepare to begin reading and/or writing mount table entries from the
-   beginning of FILE.  MODE is as for `fopen'.  */
-FILE *
-setmntent (const char *file, const char *mode)
-{
-  return fopen (file, mode);
-}
-
-/* Close a stream opened with `setmntent'.  */
-int
-endmntent (FILE *stream)
-{
-  if (stream)		/* SunOS 4.x allows for NULL stream */
-    fclose (stream);
-  return 1;		/* SunOS 4.x says to always return 1 */
-}
-
-
-/* Read one mount table entry from STREAM.  Returns a pointer to storage
-   reused on the next call, or null for EOF or error (use feof/ferror to
-   check).  */
 struct mntent *
 getmntent (FILE *stream)
 {
-  static char *buf;
-  static size_t bufsiz;
+  static char buf[8192];
   static struct mntent m;
-  ssize_t nread;
-  char *head;
-
-  do
-    {
-      nread = getline (&buf, &bufsiz, stream);
-      if (nread <= 0)
-	return NULL;
-
-      if (buf[nread - 1] == '\n')	/* chop newline */
-	buf[nread - 1] = '\0';
-
-      head = buf + strspn (buf, " \t");
-      /* skip empty lines and comment lines:  */
-    } while (head[0] == '\0' || head[0] == '#');
-    
-  m.mnt_fsname = strsep (&head, " \t") ?: (char *) "";
-  if (head)
-    head += strspn (head, " \t");
-  m.mnt_dir = strsep (&head, " \t") ?: (char *) "";
-  if (head)
-    head += strspn (head, " \t");
-  m.mnt_type = strsep (&head, " \t") ?: (char *) "";
-  if (head)
-    head += strspn (head, " \t");
-  m.mnt_opts = strsep (&head, " \t") ?: (char *) "";
-  switch (head ? sscanf (head, " %d %d ", &m.mnt_freq, &m.mnt_passno) : 0)
-    {
-    case 0:
-      m.mnt_freq = 0;
-    case 1:
-      m.mnt_passno = 0;
-    case 2:
-    }
-
-  return &m;
-}
-
-/* Write the mount table entry described by MNT to STREAM.
-   Return zero on success, nonzero on failure.  */
-int
-addmntent (FILE *stream, const struct mntent *mnt)
-{
-  if (fseek (stream, 0, SEEK_END))
-    return 1;
-
-  return (fprintf (stream, "%s %s %s %s %d %d\n",
-		   mnt->mnt_fsname,
-		   mnt->mnt_dir,
-		   mnt->mnt_type,
-		   mnt->mnt_opts,
-		   mnt->mnt_freq,
-		   mnt->mnt_passno)
-	  < 0 ? 1 : 0);
-}
-
-/* Search MNT->mnt_opts for an option matching OPT.
-   Returns the address of the substring, or null if none found.  */
-char *
-hasmntopt (const struct mntent *mnt, const char *opt)
-{
-  const size_t optlen = strlen (opt);
-  char *rest = mnt->mnt_opts, *p;
-
-  while ((p = strstr (rest, opt)) != NULL)
-    {
-      if (p == rest || p[-1] == ',' &&
-	  (p[optlen] == '\0' ||
-	   p[optlen] == '=' ||
-	   p[optlen] == ','))
-	return p;
-
-      rest = strchr (rest, ',');
-    }
 
-  return NULL;
+  return __getmntent_r (stream, &m, buf, sizeof buf);
 }
diff --git a/misc/mntent.h b/misc/mntent.h
index 99fa56ded4..8fa93f721b 100644
--- a/misc/mntent.h
+++ b/misc/mntent.h
@@ -1,5 +1,5 @@
 /* <mntent.h> -- Utilities for reading/writing fstab, mtab, etc.
-Copyright (C) 1995 Free Software Foundation, Inc.
+Copyright (C) 1995, 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
@@ -50,6 +50,8 @@ struct mntent
 
 /* Prepare to begin reading and/or writing mount table entries from the
    beginning of FILE.  MODE is as for `fopen'.  */
+extern FILE *__setmntent __P ((__const char *__file,
+			       __const char *__mode));
 extern FILE *setmntent __P ((__const char *__file,
 			     __const char *__mode));
 
@@ -58,16 +60,31 @@ extern FILE *setmntent __P ((__const char *__file,
    check).  */
 extern struct mntent *getmntent __P ((FILE *__stream));
 
+#ifdef __USE_REENTRANT
+/* Reentrant version of the above function.  */
+extern struct mntent *__getmntent_r __P ((FILE *__stream,
+					  struct mntent *__result,
+					  char *__buffer, int __bufsize));
+extern struct mntent *getmntent_r __P ((FILE *__stream,
+					struct mntent *__result,
+					char *__buffer, int __bufsize));
+#endif
+
 /* Write the mount table entry described by MNT to STREAM.
    Return zero on success, nonzero on failure.  */
+extern int __addmntent __P ((FILE *__stream,
+			     __const struct mntent *__mnt));
 extern int addmntent __P ((FILE *__stream,
 			   __const struct mntent *__mnt));
 
 /* Close a stream opened with `setmntent'.  */
+extern int __endmntent __P ((FILE *__stream));
 extern int endmntent __P ((FILE *__stream));
 
 /* Search MNT->mnt_opts for an option matching OPT.
    Returns the address of the substring, or null if none found.  */
+extern char *__hasmntopt __P ((__const struct mntent *__mnt,
+			       __const char *__opt));
 extern char *hasmntopt __P ((__const struct mntent *__mnt,
 			     __const char *__opt));
 
diff --git a/misc/mntent_r.c b/misc/mntent_r.c
new file mode 100644
index 0000000000..93955254cd
--- /dev/null
+++ b/misc/mntent_r.c
@@ -0,0 +1,141 @@
+/* Utilities for reading/writing fstab, mtab, etc.
+Copyright (C) 1995, 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., 675 Mass Ave,
+Cambridge, MA 02139, USA.  */
+
+#include <mntent.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
+
+/* Prepare to begin reading and/or writing mount table entries from the
+   beginning of FILE.  MODE is as for `fopen'.  */
+FILE *
+__setmntent (const char *file, const char *mode)
+{
+  return fopen (file, mode);
+}
+weak_alias (__setmntent, setmntent)
+
+
+/* Close a stream opened with `setmntent'.  */
+int
+__endmntent (FILE *stream)
+{
+  if (stream)		/* SunOS 4.x allows for NULL stream */
+    fclose (stream);
+  return 1;		/* SunOS 4.x says to always return 1 */
+}
+weak_alias (__endmntent, endmntent)
+
+
+/* Read one mount table entry from STREAM.  Returns a pointer to storage
+   reused on the next call, or null for EOF or error (use feof/ferror to
+   check).  */
+struct mntent *
+__getmntent_r (FILE *stream, struct mntent *mp, char *buffer, int bufsiz)
+{
+  char *head;
+
+  do
+    {
+      char *end_ptr;
+
+      if (fgets (buffer, bufsiz, stream) == NULL)
+	return NULL;
+
+      end_ptr = strchr (buffer, '\n');
+      if (end_ptr != NULL)	/* chop newline */
+	*end_ptr = '\0';
+      else
+	{
+	  /* Not the whole line was read.  Do it now but forget it.  */
+	  char tmp[1024];
+	  while (fgets (tmp, sizeof tmp, stream) != NULL)
+	    if (strchr (tmp, '\n') != NULL)
+	      break;
+	}
+
+      head = buffer + strspn (buffer, " \t");
+      /* skip empty lines and comment lines:  */
+    } while (head[0] == '\0' || head[0] == '#');
+
+  mp->mnt_fsname = strsep (&head, " \t") ?: (char *) "";
+  if (head)
+    head += strspn (head, " \t");
+  mp->mnt_dir = strsep (&head, " \t") ?: (char *) "";
+  if (head)
+    head += strspn (head, " \t");
+  mp->mnt_type = strsep (&head, " \t") ?: (char *) "";
+  if (head)
+    head += strspn (head, " \t");
+  mp->mnt_opts = strsep (&head, " \t") ?: (char *) "";
+  switch (head ? sscanf (head, " %d %d ", &mp->mnt_freq, &mp->mnt_passno) : 0)
+    {
+    case 0:
+      mp->mnt_freq = 0;
+    case 1:
+      mp->mnt_passno = 0;
+    case 2:
+    }
+
+  return mp;
+}
+weak_alias (__getmntent_r, getmntent_r)
+
+/* Write the mount table entry described by MNT to STREAM.
+   Return zero on success, nonzero on failure.  */
+int
+__addmntent (FILE *stream, const struct mntent *mnt)
+{
+  if (fseek (stream, 0, SEEK_END))
+    return 1;
+
+  return (fprintf (stream, "%s %s %s %s %d %d\n",
+		   mnt->mnt_fsname,
+		   mnt->mnt_dir,
+		   mnt->mnt_type,
+		   mnt->mnt_opts,
+		   mnt->mnt_freq,
+		   mnt->mnt_passno)
+	  < 0 ? 1 : 0);
+}
+weak_alias (__addmntent, addmntent)
+
+
+/* Search MNT->mnt_opts for an option matching OPT.
+   Returns the address of the substring, or null if none found.  */
+char *
+__hasmntopt (const struct mntent *mnt, const char *opt)
+{
+  const size_t optlen = strlen (opt);
+  char *rest = mnt->mnt_opts, *p;
+
+  while ((p = strstr (rest, opt)) != NULL)
+    {
+      if (p == rest || p[-1] == ',' &&
+	  (p[optlen] == '\0' ||
+	   p[optlen] == '=' ||
+	   p[optlen] == ','))
+	return p;
+
+      rest = strchr (rest, ',');
+    }
+
+  return NULL;
+}
+weak_alias (__hasmntopt, hasmntopt)
diff --git a/misc/search.h b/misc/search.h
index 5e237a2791..158332cd61 100644
--- a/misc/search.h
+++ b/misc/search.h
@@ -70,7 +70,7 @@ ENTRY;
 /* Opaque type for internal use.  */
 struct _ENTRY;
 
-/* Data type for reentrent functions.  */
+/* Data type for reentrant functions.  */
 struct hsearch_data
   {
     struct _ENTRY *table;
@@ -79,7 +79,7 @@ struct hsearch_data
   };
 
 /* Family of hash table handling functions.  The functions also have
-   reentrent counterparts ending with _r.  */
+   reentrant counterparts ending with _r.  */
 extern ENTRY *hsearch __P ((ENTRY __item, ACTION __action));
 extern int hcreate __P ((unsigned int __nel));
 extern void hdestroy __P ((void));