AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-18 06:30:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tue Sep 12 14:30:07 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>

Browse Source 
* misc/mntent.c: New file.
	* misc/mntent.h: New file.
	* misc/Makefile (headers): Added mntent.h.
	(routines): Added mntent.
	* misc/fstab.c: Rewritten using mntent functions.

Mon Sep 11 14:00:14 1995  Roland McGrath  <roland@whiz-bang.gnu.ai.mit.edu>

	* posix/glob.c (glob): Comment fix.
This commit is contained in:
Roland McGrath 1995-09-14 09:00:06 +00:00
parent eef089c2ab
commit 7a770247ab
5 changed files with 288 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
Tue Sep 12 14:30:07 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* misc/mntent.c: New file.
* misc/mntent.h: New file.
* misc/Makefile (headers): Added mntent.h.
(routines): Added mntent.
* misc/fstab.c: Rewritten using mntent functions.
Mon Sep 11 14:00:14 1995 Roland McGrath <roland@whiz-bang.gnu.ai.mit.edu>
* posix/glob.c (glob): Comment fix.
Fri Sep 8 16:25:22 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> Fri Sep 8 16:25:22 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* libc-symbols.h [HAVE_ELF] (symbol_set_declare): Declare the * libc-symbols.h [HAVE_ELF] (symbol_set_declare): Declare the

4
misc/Makefile
View File

@ -25,7 +25,7 @@ subdir := misc
headers := sys/uio.h sys/ioctl.h sys/ptrace.h ioctls.h sys/file.h \ headers := sys/uio.h sys/ioctl.h sys/ptrace.h ioctls.h sys/file.h \
a.out.h nlist.h stab.h stab.def sgtty.h sys/dir.h sys/cdefs.h \ a.out.h nlist.h stab.h stab.def sgtty.h sys/dir.h sys/cdefs.h \
ttyent.h syscall.h syslog.h sys/syslog.h paths.h sys/reboot.h \ ttyent.h syscall.h syslog.h sys/syslog.h paths.h sys/reboot.h \
sys/mman.h sys/param.h fstab.h search.h utmp.h sys/mman.h sys/param.h fstab.h mntent.h search.h utmp.h
routines := brk sbrk sstk ioctl \ routines := brk sbrk sstk ioctl \
readv writev \ readv writev \
@ -42,7 +42,7 @@ routines := brk sbrk sstk ioctl \
ualarm usleep \ ualarm usleep \
gtty stty \ gtty stty \
ptrace \ ptrace \
nlist fstab \ nlist fstab mntent \
utimes \ utimes \
truncate ftruncate \ truncate ftruncate \
chflags fchflags \ chflags fchflags \

252
misc/fstab.c
View File

@ -1,205 +1,109 @@
/* /*
* Copyright (c) 1980, 1988, 1993 Copyright (C) 1995 Free Software Foundation, Inc.
* The Regents of the University of California. All rights reserved. This file is part of the GNU C Library.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#if defined(LIBC_SCCS) && !defined(lint) The GNU C Library is free software; you can redistribute it and/or
static char sccsid[] = "@(#)fstab.c 8.1 (Berkeley) 6/4/93"; modify it under the terms of the GNU Library General Public License as
#endif /* LIBC_SCCS and not lint */ 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 <errno.h>
#include <fstab.h> #include <fstab.h>
#include <mntent.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#ifndef EFTYPE static FILE *fstab;
#define EFTYPE EINVAL
#endif
static FILE *_fs_fp; static FILE *
static struct fstab _fs_fstab; fstab_stream (void)
static void error __P((int));
static int
fstabscan __P((void))
{ {
register char *cp; if (! fstab)
#define MAXLINELENGTH 1024 fstab = setmntent (_PATH_FSTAB, "r");
static char line[MAXLINELENGTH]; return fstab;
char subline[MAXLINELENGTH]; }
int typexx;
for (;;) { int
if (!(cp = fgets(line, sizeof(line), _fs_fp))) setfsent (void)
return(0); {
/* OLD_STYLE_FSTAB */ if (fstab)
if (!strpbrk(cp, " \t")) { {
_fs_fstab.fs_spec = strtok(cp, ":\n"); rewind (fstab);
_fs_fstab.fs_file = strtok((char *)NULL, ":\n"); return 1;
_fs_fstab.fs_type = strtok((char *)NULL, ":\n");
if (_fs_fstab.fs_type) {
if (!strcmp(_fs_fstab.fs_type, FSTAB_XX))
continue;
_fs_fstab.fs_mntops = _fs_fstab.fs_type;
_fs_fstab.fs_vfstype =
strcmp(_fs_fstab.fs_type, FSTAB_SW) ?
"ufs" : "swap";
if (cp = strtok((char *)NULL, ":\n")) {
_fs_fstab.fs_freq = atoi(cp);
if (cp = strtok((char *)NULL, ":\n")) {
_fs_fstab.fs_passno = atoi(cp);
return(1);
} }
} else
} fstab = setmntent (_PATH_FSTAB, "r");
goto bad; return fstab ? 0 : 1;
} }
/* OLD_STYLE_FSTAB */
_fs_fstab.fs_spec = strtok(cp, " \t\n");
if (!_fs_fstab.fs_spec || *_fs_fstab.fs_spec == '#')
continue;
_fs_fstab.fs_file = strtok((char *)NULL, " \t\n");
_fs_fstab.fs_vfstype = strtok((char *)NULL, " \t\n");
_fs_fstab.fs_mntops = strtok((char *)NULL, " \t\n");
if (_fs_fstab.fs_mntops == NULL)
goto bad;
_fs_fstab.fs_freq = 0;
_fs_fstab.fs_passno = 0;
if ((cp = strtok((char *)NULL, " \t\n")) != NULL) {
_fs_fstab.fs_freq = atoi(cp);
if ((cp = strtok((char *)NULL, " \t\n")) != NULL)
_fs_fstab.fs_passno = atoi(cp);
}
strcpy(subline, _fs_fstab.fs_mntops);
for (typexx = 0, cp = strtok(subline, ","); cp;
cp = strtok((char *)NULL, ",")) {
if (strlen(cp) != 2)
continue;
if (!strcmp(cp, FSTAB_RW)) {
_fs_fstab.fs_type = FSTAB_RW;
break;
}
if (!strcmp(cp, FSTAB_RQ)) {
_fs_fstab.fs_type = FSTAB_RQ;
break;
}
if (!strcmp(cp, FSTAB_RO)) {
_fs_fstab.fs_type = FSTAB_RO;
break;
}
if (!strcmp(cp, FSTAB_SW)) {
_fs_fstab.fs_type = FSTAB_SW;
break;
}
if (!strcmp(cp, FSTAB_XX)) {
_fs_fstab.fs_type = FSTAB_XX;
typexx++;
break;
}
}
if (typexx)
continue;
if (cp != NULL)
return(1);
bad: /* no way to distinguish between EOF and syntax error */ static struct fstab *
error(EFTYPE); mnt2fs (struct mntent *m)
} {
/* NOTREACHED */ static struct fstab f;
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 * struct fstab *
getfsent() getfsent (void)
{ {
if (!_fs_fp && !setfsent() || !fstabscan()) FILE *s = fstab_stream ();
return((struct fstab *)NULL);
return(&_fs_fstab); if (! s)
return NULL;
return mnt2fs (getmntent (s));
} }
struct fstab * struct fstab *
getfsspec(name) getfsspec (name)
register const char *name; register const char *name;
{ {
if (setfsent()) struct mntent *m;
while (fstabscan()) if (setfsent ())
if (!strcmp(_fs_fstab.fs_spec, name)) while (m = getmntent (fstab))
return(&_fs_fstab); if (!strcmp (m->mnt_fsname, name))
return((struct fstab *)NULL); return mnt2fs (m);
return NULL;
} }
struct fstab * struct fstab *
getfsfile(name) getfsfile (name)
register const char *name; register const char *name;
{ {
if (setfsent()) struct mntent *m;
while (fstabscan()) if (setfsent ())
if (!strcmp(_fs_fstab.fs_file, name)) while (m = getmntent (fstab))
return(&_fs_fstab); if (!strcmp (m->mnt_dir, name))
return((struct fstab *)NULL); return mnt2fs (m);
} return NULL;
setfsent()
{
if (_fs_fp) {
rewind(_fs_fp);
return(1);
}
if (_fs_fp = fopen(_PATH_FSTAB, "r"))
return(1);
error(errno);
return(0);
} }
void void
endfsent() endfsent ()
{ {
if (_fs_fp) { if (fstab)
(void)fclose(_fs_fp); {
_fs_fp = NULL; (void) endmntent (fstab);
fstab = NULL;
} }
} }
static void
error(err)
int err;
{
char *p;
(void)write(STDERR_FILENO, "fstab: ", 7);
(void)write(STDERR_FILENO, _PATH_FSTAB, sizeof(_PATH_FSTAB) - 1);
(void)write(STDERR_FILENO, ": ", 1);
p = strerror(err);
(void)write(STDERR_FILENO, p, strlen(p));
(void)write(STDERR_FILENO, "\n", 1);
}

111
misc/mntent.c Normal file
View File

@ -0,0 +1,111 @@
/* 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>
/* 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)
{
return fclose (stream);
}
/* 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;
char *head;
do
{
if (getline (&buf, &bufsiz, stream) < 0)
return NULL;
head = buf;
} while (head[0] == '#'); /* Skip comment lines. */
m.mnt_fsname = strsep (&head, " \t") ?: (char *) "";
m.mnt_dir = strsep (&head, " \t") ?: (char *) "";
m.mnt_type = strsep (&head, " \t") ?: (char *) "";
m.mnt_opts = strsep (&head, " \t") ?: (char *) "";
switch (sscanf (head, "%d %d\n", &m.mnt_freq, &m.mnt_passno))
{
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)
{
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;
}

77
misc/mntent.h Normal file
View File

@ -0,0 +1,77 @@
/* <mntent.h> -- 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. */
#ifndef _MNTENT_H
#define _MNTENT_H 1
#include <features.h>
#define __need_FILE
#include <stdio.h>
/* File listing canonical interesting mount points. */
#define _PATH_MNTTAB "/etc/fstab"
#define MNTTAB _PATH_MNTTAB /* Deprecated alias. */
/* File listing currently active mount points. */
#define _PATH_MOUNTED "/var/run/mtab"
#define MOUNTED _PATH_MOUNTED /* Deprecated alias. */
__BEGIN_DECLS
/* Structure describing a mount table entry. */
struct mntent
{
char *mnt_fsname; /* Device or server for filesystem. */
char *mnt_dir; /* Directory mounted on. */
char *mnt_type; /* Type of filesystem: ufs, nfs, etc. */
char *mnt_opts; /* Comma-separated options for fs. */
int mnt_freq; /* Dump frequency (in days). */
int mnt_passno; /* Pass number for `fsck'. */
};
/* Prepare to begin reading and/or writing mount table entries from the
beginning of FILE. MODE is as for `fopen'. */
extern FILE *setmntent __P ((__const char *__file,
__const char *__mode));
/* 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). */
extern struct mntent *getmntent __P ((FILE *__stream));
/* Write the mount table entry described by MNT to STREAM.
Return zero on success, nonzero on failure. */
extern int addmntent __P ((FILE *__stream,
__const struct mntent *__mnt));
/* Close a stream opened with `setmntent'. */
extern int endmntent __P ((FILE *__stream));
/* Search MNT->mnt_opts for an option matching OPT.
Returns the address of the substring, or null if none found. */
extern char *hasmntopt __P ((__const struct mntent *__mnt,
__const char *__opt));
__END_DECLS
#endif /* mntent.h */