summaryrefslogtreecommitdiff
path: root/misc/mntent.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1996-09-22 03:06:42 +0000
committerUlrich Drepper <drepper@redhat.com>1996-09-22 03:06:42 +0000
commit845dcb57b1de1b8c2ea88cd101d6e5a80181ee4e (patch)
treec13a286fe36773fc4d7d34af8527956a6ec8838b /misc/mntent.c
parentdaf2bb515bdd8212c8d95b78e70ef02f035304c5 (diff)
downloadglibc-845dcb57b1de1b8c2ea88cd101d6e5a80181ee4e.tar.gz
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.
Diffstat (limited to 'misc/mntent.c')
-rw-r--r--misc/mntent.c105
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);
}