diff options
author | Ulrich Drepper <drepper@redhat.com> | 1996-09-22 03:06:42 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1996-09-22 03:06:42 +0000 |
commit | 845dcb57b1de1b8c2ea88cd101d6e5a80181ee4e (patch) | |
tree | c13a286fe36773fc4d7d34af8527956a6ec8838b /misc/fstab.c | |
parent | daf2bb515bdd8212c8d95b78e70ef02f035304c5 (diff) | |
download | glibc-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/fstab.c')
-rw-r--r-- | misc/fstab.c | 21 |
1 files changed, 14 insertions, 7 deletions
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; |