1 files changed, 3 insertions, 102 deletions

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);
 }