mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-21 10:20:06 +00:00
50304ef057
1998-07-16 10:23 Ulrich Drepper <drepper@cygnus.com> * argp/argp-fmtstream.c: Unify names of used global functions. * argp/argp-help.c: Likewise. * assert/assert-perr.c: Likewise * assert/assert.c: Likewise * dirent/scandir.c: Likewise * dirent/scandir64.c: Likewise * dirent/versionsort.c: Likewise * dirent/versionsort64.c: Likewise * gmon/bb_exit_func.c: Likewise. * gmon/gmon.c: Likewise. * grp/initgroups.c: Likewise. * iconv/gconv_conf.c: Likewise. * inet/getnameinfo.c: Likewise. * inet/getnetgrent_r.c: Likewise. * inet/inet_ntoa.c: Likewise. * inet/rcmd.c: Likewise. * inet/rexec.c: Likewise. * inet/ruserpass.c: Likewise. * io/fts.c: Likewise. * io/ftw.c: Likewise. * io/ftw64.c: Likewise. * io/getdirname.c: Likewise. * io/getwd.c: Likewise. * io/lockf.c: Likewise. * libio/iofdopen.c: Likewise. * libio/iopopen.c: Likewise. * login/utmp_daemon.c: Likewise. * malloc/mtrace.c: Likewise. * malloc/obstack.c * misc/daemon.c: Likewise. * misc/efgcvt_r.c: Likewise. * misc/err.c: Likewise. * misc/error.c: Likewise. * misc/fstab.c: Likewise. * misc/getpass.c: Likewise. * misc/getttyent.c: Likewise. * misc/mntent_r.c: Likewise. * misc/search.h: Likewise. * misc/syslog.c: Likewise. * nscd/nscd_getgr_r.c: Likewise. * nscd/nscd_getpw_r.c: Likewise. * posix/getpgrp.c: Likewise. * posix/wordexp.c: Likewise. * pwd/fgetpwent_r.c: Likewise. * pwd/getpw.c: Likewise. * resolv/herror.c: Likewise. * resolv/res_init.c: Likewise. * shadow/fgetspent_r.c: Likewise. * shadow/lckpwdf.c: Likewise. * signal/sigrelse.c: Likewise. * stdio-common/asprintf.c: Likewise. * stdio-common/dprintf.c: Likewise. * stdio-common/getw.c: Likewise. * stdio-common/putw.c: Likewise. * stdio-common/snprintf.c: Likewise. * stdio-common/sprintf.c: Likewise. * stdio-common/sscanf.c: Likewise. * stdlib/lrand48_r.c: Likewise. * stdlib/mrand48_r.c: Likewise. * string/argz-replace.c: Likewise. * string/envz.c: Likewise. * sunrpc/auth_des.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * sunrpc/clnt_gen.c: Likewise. * sunrpc/clnt_perr.c: Likewise. * sunrpc/clnt_simp.c: Likewise. * sunrpc/clnt_tcp.c: Likewise. * sunrpc/clnt_udp.c: Likewise. * sunrpc/get_myaddr.c: Likewise. * sunrpc/key_call.c: Likewise. * sunrpc/netname.c: Likewise. * sunrpc/openchild.c: Likewise. * sunrpc/pmap_rmt.c: Likewise. * sunrpc/rpc_dtable.c: Likewise. * sunrpc/rtime.c: Likewise. * sunrpc/svc_run.c: Likewise. * sunrpc/svc_simple.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sunrpc/svcauth_des.c: Likewise. * sunrpc/xdr_array.c: Likewise. * sunrpc/xdr_rec.c: Likewise. * sunrpc/xdr_ref.c: Likewise. * sunrpc/xdr_stdio.c: Likewise. * sysdeps/generic/abort.c: Likewise. * sysdeps/generic/dl-sysdep.c: Likewise. * sysdeps/generic/fstatfs64.c: Likewise. * sysdeps/generic/ftruncate64.c: Likewise. * sysdeps/generic/getrlimit64.c: Likewise. * sysdeps/generic/glob.c: Likewise. * sysdeps/generic/prof-freq.c: Likewise. * sysdeps/generic/putenv.c: Likewise. * sysdeps/generic/statfs64.c: Likewise. * sysdeps/generic/ttyname_r.c: Likewise. * sysdeps/generic/utmp_file.c: Likewise. * sysdeps/generic/vlimit.c: Likewise. * sysdeps/generic/vtimes.c: Likewise. * sysdeps/posix/cuserid.c: Likewise. * sysdeps/posix/euidaccess.c: Likewise. * sysdeps/posix/mkstemp.c: Likewise. * sysdeps/posix/mktemp.c: Likewise. * sysdeps/posix/pread.c: Likewise. * sysdeps/posix/pread64.c: Likewise. * sysdeps/posix/profil.c: Likewise. * sysdeps/posix/pwrite.c: Likewise. * sysdeps/posix/pwrite64.c: Likewise. * sysdeps/posix/sigblock.c: Likewise. * sysdeps/posix/sigpause.c: Likewise. * sysdeps/posix/ttyname.c: Likewise. * sysdeps/posix/ttyname_r.c: Likewise. * sysdeps/posix/waitid.c: Likewise. * sysdeps/unix/getlogin_r.c: Likewise. * sysdeps/unix/grantpt.c: Likewise. * sysdeps/unix/rewinddir.c: Likewise. * sysdeps/unix/sysv/linux/gethostid.c: Likewise. * sysdeps/unix/sysv/linux/getpt.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * sysdeps/unix/sysv/linux/ptsname.c: Likewise. * sysdeps/unix/sysv/linux/sendmsg.c: Likewise. * sysdeps/unix/sysv/linux/statvfs.c: Likewise. * sysdeps/unix/sysv/linux/ttyname.c: Likewise. * sysdeps/unix/sysv/linux/ttyname_r.c: Likewise. * sysdeps/unix/sysv/linux/ulimit.c: Likewise. * sysdeps/unix/sysv/linux/unlockpt.c: Likewise. * sysvipc/sys/shm.h: Likewise. * time/ctime_r.c: Likewise. * time/strptime.c: Likewise. * wcsmbs/mbrlen.c: Likewise. * wcsmbs/wcsdup.c: Likewise. * wcsmbs/wcsxfrm.c: Likewise. * wctype/wcfuncs.c: Likewise. * sysdeps/unix/sysv/linux/i386/socker.S: Change to honor NO_WEAK_ALIAS. * sysdeps/unix/sysv/linux/accept.S: Don't generate __ name. * sysdeps/unix/sysv/linux/bind.S: Likewise. * sysdeps/unix/sysv/linux/getsockname.S: Likewise. * sysdeps/unix/sysv/linux/listen.S: Likewise. * sysdeps/unix/sysv/linux/recvfrom.S: Likewise. * sysdeps/unix/sysv/linux/sendto.S: Likewise. * sysdeps/unix/sysv/linux/setsockopt.S: Likewise. * grp/fgetgrent_r.c: Use explicit locking of the stream. * elf/Makefile (rtld-routines): Add dl-environ. * sysdeps/generic/dl-environ.c: New file. * libio/Makefile [REENTRANT] (routines): Add iofputs_u. * libio/Versions: Add fputs_unlocked. * libio/iofputs_u.c: New file. * libio/stdio.h: Add prototype for fputs_unlocked. * sunrpc/rpc/auth.h: Use __PMT instead of __P in type definitions. * sunrpc/rpc/clnt.h: Likewise. * sunrpc/rpc/pmap_clnt.h: Likewise. * sunrpc/rpc/svc.h: Likewise. * sunrpc/rpc/xdr.h: Likewise. * sysdeps/i386/memchr.S: Correct for more strict gas. * sysdeps/i386/fpu/bits/mathinline.h: Likewise. * sysdeps/libm-i387/i686/s_fdim.S: Likewise. * sysdeps/libm-i387/i686/s_fdimf.S: Likewise. * sysdeps/libm-i387/i686/s_fdiml.S: Likewise. 1998-07-15 Andreas Jaeger <aj@arthur.rhein-neckar.de> * configure.in: Change message for binutils version from 2.8.1.0.17->2.8.1.0.23. 1998-07-15 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h: Define LOC. Patch by John Tobey <jtobey@banta-im.com>.
194 lines
4.0 KiB
C
194 lines
4.0 KiB
C
/* Copyright (C) 1995, 1996, 1997, 1998 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., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <fstab.h>
|
|
#include <mntent.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <bits/libc-lock.h>
|
|
|
|
#define BUFFER_SIZE 0x1fc0
|
|
|
|
struct fstab_state
|
|
{
|
|
FILE *fs_fp;
|
|
char *fs_buffer;
|
|
struct mntent fs_mntres;
|
|
struct fstab fs_ret;
|
|
};
|
|
|
|
static struct fstab_state *fstab_init (int opt_rewind);
|
|
static struct mntent *fstab_fetch (struct fstab_state *state);
|
|
static struct fstab *fstab_convert (struct fstab_state *state);
|
|
|
|
static struct fstab_state fstab_state;
|
|
|
|
|
|
int
|
|
setfsent (void)
|
|
{
|
|
return fstab_init (1) != NULL;
|
|
}
|
|
|
|
|
|
struct fstab *
|
|
getfsent (void)
|
|
{
|
|
struct fstab_state *state;
|
|
|
|
state = fstab_init (0);
|
|
if (state == NULL)
|
|
return NULL;
|
|
if (fstab_fetch (state) == NULL)
|
|
return NULL;
|
|
return fstab_convert (state);
|
|
}
|
|
|
|
|
|
struct fstab *
|
|
getfsspec (name)
|
|
const char *name;
|
|
{
|
|
struct fstab_state *state;
|
|
struct mntent *m;
|
|
|
|
state = fstab_init (1);
|
|
if (state == NULL)
|
|
return NULL;
|
|
while ((m = fstab_fetch (state)) != NULL)
|
|
if (strcmp (m->mnt_fsname, name) == 0)
|
|
return fstab_convert (state);
|
|
return NULL;
|
|
}
|
|
|
|
|
|
struct fstab *
|
|
getfsfile (name)
|
|
const char *name;
|
|
{
|
|
struct fstab_state *state;
|
|
struct mntent *m;
|
|
|
|
state = fstab_init (1);
|
|
if (state == NULL)
|
|
return NULL;
|
|
while ((m = fstab_fetch (state)) != NULL)
|
|
if (strcmp (m->mnt_dir, name) == 0)
|
|
return fstab_convert (state);
|
|
return NULL;
|
|
}
|
|
|
|
|
|
void
|
|
endfsent ()
|
|
{
|
|
struct fstab_state *state;
|
|
|
|
state = &fstab_state;
|
|
if (state->fs_fp != NULL)
|
|
{
|
|
(void) __endmntent (state->fs_fp);
|
|
state->fs_fp = NULL;
|
|
}
|
|
}
|
|
|
|
|
|
static struct fstab_state *
|
|
fstab_init (int opt_rewind)
|
|
{
|
|
struct fstab_state *state;
|
|
char *buffer;
|
|
FILE *fp;
|
|
|
|
state = &fstab_state;
|
|
|
|
buffer = state->fs_buffer;
|
|
if (buffer == NULL)
|
|
{
|
|
buffer = (char *) malloc (BUFFER_SIZE);
|
|
if (buffer == NULL)
|
|
return NULL;
|
|
state->fs_buffer = buffer;
|
|
}
|
|
|
|
fp = state->fs_fp;
|
|
if (fp != NULL)
|
|
{
|
|
if (opt_rewind)
|
|
rewind (fp);
|
|
}
|
|
else
|
|
{
|
|
fp = __setmntent (_PATH_FSTAB, "r");
|
|
if (fp == NULL)
|
|
return NULL;
|
|
state->fs_fp = fp;
|
|
}
|
|
|
|
return state;
|
|
}
|
|
|
|
|
|
static struct mntent *
|
|
fstab_fetch (struct fstab_state *state)
|
|
{
|
|
return __getmntent_r (state->fs_fp, &state->fs_mntres,
|
|
state->fs_buffer, BUFFER_SIZE);
|
|
}
|
|
|
|
|
|
static struct fstab *
|
|
fstab_convert (struct fstab_state *state)
|
|
{
|
|
struct mntent *m;
|
|
struct fstab *f;
|
|
|
|
m = &state->fs_mntres;
|
|
f = &state->fs_ret;
|
|
|
|
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) ? FSTAB_RW :
|
|
__hasmntopt (m, FSTAB_RQ) ? FSTAB_RQ :
|
|
__hasmntopt (m, FSTAB_RO) ? FSTAB_RO :
|
|
__hasmntopt (m, FSTAB_SW) ? FSTAB_SW :
|
|
__hasmntopt (m, FSTAB_XX) ? FSTAB_XX :
|
|
"??");
|
|
f->fs_freq = m->mnt_freq;
|
|
f->fs_passno = m->mnt_passno;
|
|
return f;
|
|
}
|
|
|
|
|
|
/* Make sure the memory is freed if the programs ends while in
|
|
memory-debugging mode and something actually was allocated. */
|
|
static void
|
|
__attribute__ ((unused))
|
|
fstab_free (void)
|
|
{
|
|
char *buffer;
|
|
|
|
buffer = fstab_state.fs_buffer;
|
|
if (buffer != NULL)
|
|
free ((void *) buffer);
|
|
}
|
|
|
|
text_set_element (__libc_subfreeres, fstab_free);
|