glibc/misc/fstab.c
Ulrich Drepper 845dcb57b1 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.
1996-09-22 03:06:42 +00:00

117 lines
2.5 KiB
C

/*
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 <fstab.h>
#include <mntent.h>
#include <stdio.h>
static FILE *fstab;
static struct mntent mntres;
static char buffer[8192];
static FILE *
fstab_stream (void)
{
if (! fstab)
fstab = setmntent (_PATH_FSTAB, "r");
return fstab;
}
int
setfsent (void)
{
if (fstab)
{
rewind (fstab);
return 1;
}
else
fstab = setmntent (_PATH_FSTAB, "r");
return fstab ? 0 : 1;
}
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;
f.fs_mntops = m->mnt_opts;
f.fs_type = (hasmntopt (m, FSTAB_RW) ? (char *) FSTAB_RW :
hasmntopt (m, FSTAB_RQ) ? (char *) FSTAB_RQ :
hasmntopt (m, FSTAB_RO) ? (char *) FSTAB_RO :
hasmntopt (m, FSTAB_SW) ? (char *) FSTAB_SW :
hasmntopt (m, FSTAB_XX) ? (char *) FSTAB_XX :
(char *) "??");
f.fs_freq = m->mnt_freq;
f.fs_passno = m->mnt_passno;
return &f;
}
struct fstab *
getfsent (void)
{
FILE *s = fstab_stream ();
if (! s)
return NULL;
return mnt2fs (__getmntent_r (s, &mntres, buffer, sizeof buffer));
}
struct fstab *
getfsspec (name)
register const char *name;
{
struct mntent *m;
if (setfsent ())
while (m = __getmntent_r (fstab, &mntres, buffer, sizeof buffer))
if (!strcmp (m->mnt_fsname, name))
return mnt2fs (m);
return NULL;
}
struct fstab *
getfsfile (name)
register const char *name;
{
struct mntent *m;
if (setfsent ())
while (m = __getmntent_r (fstab, &mntres, buffer, sizeof buffer))
if (!strcmp (m->mnt_dir, name))
return mnt2fs (m);
return NULL;
}
void
endfsent ()
{
if (fstab)
{
(void) endmntent (fstab);
fstab = NULL;
}
}