mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
d68171edce
Sat Sep 28 03:02:49 1996 Ulrich Drepper <drepper@cygnus.com> * dirent/Makefile (routines): Add readdir_r. * dirent/readdir_r.c: New file. Wrapper around readdir.c. * dirent/dirent.h: Add prototype for readdir_r. * misc/hsearch_r.c (ENTRY): Make field `used' of type `unsigned int' to prevent warnings. * sysdeps/unix/sysv/linux/getsysstats.c (get_proc_path): Initialize `result'. Sat Sep 28 01:16:42 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/strsep.c: Rename to __strsep and make strsep weak alias. * string/string.h: Add prototype for __strsep. * misc/mntent_r.c: Use __strsep instead of strsep to keep namespace clean. * sysdeps/stub/nanosleep.c: Rename to __libc_nanosleep and make __nanosleep and nanosleep weak aliases. * sysdeps/unix/sysv/linux/syscalls.list: Add __nanosleep as weak alias. * sysdeps/unix/sysv/linux/sleep.c: Call __nanosleep instead of nanosleep to keep namespace clean. * sysdeps/posix/ttyname.c (ttyname): Add cast to prevent warning. * sysdeps/posix/ttyname_r.c (ttyname_r): Likewise. * sysdeps/posix/getcwd.c (__getcwd): Likewise. * sysdeps/unix/nlist.c: Use ISO C definition since we don't always have prototype. * login/Makefile (headers): Add pty.h. * login/pty.h: New file. * sysdeps/generic/pty.h: Include <pty.h>. * login/pututline_r.c: Add cast to prevent warning. * gmon/gmon.c: Add prototype for __profile_frequency. (monstartup): Add cast to prevent warning. * sysdeps/generic/prof-freq.c: Change to use ISO C style definition. * locale/programs/ld-time.c (time_output): Write `era' information in correct order. Sat Sep 28 00:11:08 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/syscalls.list: Add weak alias `adjtimex'. Set caller for mlock, mlockall, mremap, munlock, and munlockall to EXTRA. Reported by Matthias Urlichs <smurf@smurf.noris.de>. 1996-09-27 Paul Eggert <eggert@twinsun.com> * strftime.c (strftime): Output incomplete formats like %E at end of string. 1996-09-27 Paul Eggert <eggert@twinsun.com> * strftime.c (strftime): Add support for %EC and %Ey. Fix support for %EY. This uses the new _nl_get_era_entry function. Fri Sep 27 14:12:27 1996 Ulrich Drepper <drepper@cygnus.com> Security related patch by Elliot Lee <sopwith@redhat.com> and David Holland <dholland@eecs.harvard.edu>. * inet/rexec.c (rexec): Increase size of `num' array from 8 to 32. * inet/ruserpass.c (ruserpass): Don't allow $HOME envvar to not exist. * sysdeps/generic/getenv.c (__secure_getenv): New function. Return NULL when programs runs with SUID or SGID enabled. * sysdeps/stub/getenv.c: Make __secure_getenv an alias of getenv. * stdlib/stdlib.h: Add prototype for __secure_getenv. * locale/setlocale.c: Use __secure_getenv. * resolv/res_init.c: Likewise. * resolv/res_query.c: Likewise. * inet/ruserpass.c: Likewise. * sysdeps/posix/tempname.c: Likewise. * malloc/mtrace.c: Likewise. * catgets/catgets.c: Likewise. Make temporary file handling functions reentrant. * stdio-common/tmpnam.c: Rewrite to have own buffer to write result to. The called __stdio_gen_tempname function must be thread safe. * stdio-common/tmpnam_r.c: New file. * stdio/stdio.h: Add prototype for `tmpnam_r'. Change prototype for __stdio_gen_tempname. * stdio/libio.h: Likewise. * sysdeps/posix/tempname.c: Add new parameters and use them instead of static buffer. Don't reset `indeces' when PID changed between calls. Don't fail for long running programs when index counter once reached the limit. * sysdeps/stub/tempname.c: Likewise. * stdio-common/tempnam.c: Provide local buffer as extra argument to __stdio_gen_tempname. This makes this function reentrant. * stdio-common/tmpfile.c: Likewise. * stdio-common/temptest.c: Provide extra argument to __stdio_gen_tempname. * manual/filesys.texi: Describe tmpnam_r and add comments about reentrancy of the functions. * inet/rcmd.c: Fixed address length handling. * sysdeps/posix/mk-stdiolim.c: Count final \0 byte in L_tmpnam value. * time/strftime.c: Remove unused variables alt_digits and end_alt_digits. * sysdeps/unix/sysv/linux/sys/sysinfo.h: Correct prototype names for get_nprocs and get_nprocs_conf. * sysdeps/generic/sys/sysinfo.h: Likewise. * stdlib/test-canon.c: Finally do the right fix. * misc/Makefile: Only compile force-wrapper when compiling reentrant libc.
142 lines
3.8 KiB
C
142 lines
3.8 KiB
C
/* Utilities for reading/writing fstab, mtab, etc.
|
|
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 <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);
|
|
}
|
|
weak_alias (__setmntent, setmntent)
|
|
|
|
|
|
/* 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 */
|
|
}
|
|
weak_alias (__endmntent, endmntent)
|
|
|
|
|
|
/* 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_r (FILE *stream, struct mntent *mp, char *buffer, int bufsiz)
|
|
{
|
|
char *head;
|
|
|
|
do
|
|
{
|
|
char *end_ptr;
|
|
|
|
if (fgets (buffer, bufsiz, stream) == NULL)
|
|
return NULL;
|
|
|
|
end_ptr = strchr (buffer, '\n');
|
|
if (end_ptr != NULL) /* chop newline */
|
|
*end_ptr = '\0';
|
|
else
|
|
{
|
|
/* Not the whole line was read. Do it now but forget it. */
|
|
char tmp[1024];
|
|
while (fgets (tmp, sizeof tmp, stream) != NULL)
|
|
if (strchr (tmp, '\n') != NULL)
|
|
break;
|
|
}
|
|
|
|
head = buffer + strspn (buffer, " \t");
|
|
/* skip empty lines and comment lines: */
|
|
} while (head[0] == '\0' || head[0] == '#');
|
|
|
|
mp->mnt_fsname = __strsep (&head, " \t") ?: (char *) "";
|
|
if (head)
|
|
head += strspn (head, " \t");
|
|
mp->mnt_dir = __strsep (&head, " \t") ?: (char *) "";
|
|
if (head)
|
|
head += strspn (head, " \t");
|
|
mp->mnt_type = __strsep (&head, " \t") ?: (char *) "";
|
|
if (head)
|
|
head += strspn (head, " \t");
|
|
mp->mnt_opts = __strsep (&head, " \t") ?: (char *) "";
|
|
switch (head ? sscanf (head, " %d %d ", &mp->mnt_freq, &mp->mnt_passno) : 0)
|
|
{
|
|
case 0:
|
|
mp->mnt_freq = 0;
|
|
case 1:
|
|
mp->mnt_passno = 0;
|
|
case 2:
|
|
}
|
|
|
|
return mp;
|
|
}
|
|
weak_alias (__getmntent_r, getmntent_r)
|
|
|
|
/* 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);
|
|
}
|
|
weak_alias (__addmntent, addmntent)
|
|
|
|
|
|
/* 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;
|
|
}
|
|
weak_alias (__hasmntopt, hasmntopt)
|