mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
2064087b5f
* manual/Makefile (glibc-targets): Variable and targets removed. Sat Jul 13 23:50:17 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * manual/Makefile (lib): New phony target. Depend on stamp files. ($(objpfx)stamp%-$(subdir)): New rule to create them when necessary. 1996-07-13 Paul Eggert <eggert@twinsun.com> * time/strftime.c (strftime): Use space padding for %e, %k, %l, to match Emacs format-time-string specification. (DO_NUMBER_SPACEPAD): Renamed from DO_NUMBER_NOPAD. Sat Jul 13 20:17:38 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * elf/dl-deps.c (_dl_map_object_deps): Take new args PRELOADS and NPRELOADS, vector of `struct link_map *'s; add them to the searchlist between MAP and its deps. * elf/link.h: Fix decl. * elf/rtld.c (dl_main): If not secure, parse LD_PRELOAD for colon-separated list of names, map those and pass vector of ptrs as PRELOADS list to _dl_map_object_deps. * elf/dl-runtime.c (_dl_object_relocation_scope): Pass new args to _dl_map_object_deps with empty preload list. * elf/dl-open.c (_dl_open): Likewise. * sysdeps/mach/hurd/dl-sysdep.c (_dl_sysdep_open_zero_fill): Function removed. (__mmap): Pass MACH_PORT_NULL for memobj port when (flags & MAP_ANON). * sysdeps/generic/dl-sysdep.c (_dl_sysdep_open_zero_fill): Conditionalize defn on [! MAP_ANON]. * elf/dl-minimal.c (malloc): Conditionalize use of _dl_zerofd on [! MAP_ANON]. * elf/rtld.c (dl_main): Likewise. * elf/dl-load.c (_dl_zerofd): Conditionalize defn on [! MAP_ANON]. (_dl_map_object_from_fd): Conditionalize initialization of _dl_zerofd. * elf/dl-fini.c (_dl_fini): Skip finalizer for executable itself. Sat Jul 13 02:47:53 1996 David Mosberger-Tang <davidm@azstarnet.com> * stdlib/random.c (__random): Declare as int32_t to be in sync with declaration. * socket/Makefile (headers): Add socketbits.h. * misc/mntent.c (endmntent): Allow for NULL stream. SunOS does it that way. * grp/initgroups.c (initgroups): Add groups that user is a member of, not the ones he is _not_ a member of. * nss/nsswitch.c (known_compare): Make known_compare() a static instead of a local function. The latter are difficult to debug and slow to execute on certain platforms. * sysdeps/posix/ttyname_r.c (ttyname_r): Use sizeof (dev) - 1 in place of sizeof (dev). The size of a literal string includes the NUL byte. * sysdeps/unix/getlogin.c (getlogin): Initialize ut_fd with -1. Thu Jul 11 16:59:10 1996 David Mosberger-Tang <davidm@azstarnet.com> * misc/mntent.c (addmntent): Seek to end of file before writing entry. Return 1 on error, not -1. Tue Jul 9 19:08:05 1996 David Mosberger-Tang <davidm@azstarnet.com> * sysdeps/unix/sysv/linux/syscalls.list: Mark bdflush as EXTRA syscall. Fri Jul 5 18:44:55 1996 David Mosberger-Tang <davidm@azstarnet.com> * sysdeps/unix/sysv/linux/alpha/ioperm.c (port_to_cpu_addr): Size shift amount for Jensen must be 5 not 4. Sat Jul 13 20:04:28 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * socket/sys/socket.h (struct osockaddr): New type. Sat Jul 13 03:50:53 1996 Ulrich Drepper <drepper@cygnus.com> * misc/Makefile (routines): Add qefgcvt and qefgcvt_r. * misc/efgcvt.c, misc/efgcvt_r.c: Change code so that the `double' and `long double' versions can be generated. * misc/qefgcvt.c, misc/qefgcvt_r.c: New files. Define macros so that included efgcvt{,_r}.c file generate `long double' versions. * stdlib/stdlib.h: Add prototypes for q[efg]cvt() and q[ef]cvt_r() functions. * manual/startup.texi: Document new getsubopt function. * manual/examples/subopt.c: New example program for documenting getsubopt function. Fri Jul 12 23:58:37 1996 Ulrich Drepper <drepper@cygnus.com> * stdlib/Makefile (routines): Add getsubopt. * stdlib/stdlib.h: Add prototype for getsubopt. * stdlib/getsubopt.c: New file. Implement getsubopt function to handle suboption parsing.
129 lines
3.4 KiB
C
129 lines
3.4 KiB
C
/* Utilities for reading/writing fstab, mtab, etc.
|
|
Copyright (C) 1995 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 <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 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;
|
|
}
|