Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/lib/libc/gen/fstab.c,v retrieving revision 1.6 retrieving revision 1.19 diff -u -p -r1.6 -r1.19 --- src/lib/libc/gen/fstab.c 1995/02/27 03:43:12 1.6 +++ src/lib/libc/gen/fstab.c 1999/02/23 17:00:53 1.19 @@ -1,4 +1,4 @@ -/* $NetBSD: fstab.c,v 1.6 1995/02/27 03:43:12 cgd Exp $ */ +/* $NetBSD: fstab.c,v 1.19 1999/02/23 17:00:53 mrg Exp $ */ /* * Copyright (c) 1980, 1988, 1993 @@ -33,14 +33,18 @@ * SUCH DAMAGE. */ +#include #if defined(LIBC_SCCS) && !defined(lint) #if 0 static char sccsid[] = "@(#)fstab.c 8.1 (Berkeley) 6/4/93"; #else -static char rcsid[] = "$NetBSD: fstab.c,v 1.6 1995/02/27 03:43:12 cgd Exp $"; +__RCSID("$NetBSD: fstab.c,v 1.19 1999/02/23 17:00:53 mrg Exp $"); #endif #endif /* LIBC_SCCS and not lint */ +#include "namespace.h" +#include +#include #include #include #include @@ -48,31 +52,60 @@ static char rcsid[] = "$NetBSD: fstab.c, #include #include +#ifdef __weak_alias +__weak_alias(endfsent,_endfsent); +__weak_alias(getfsent,_getfsent); +__weak_alias(getfsfile,_getfsfile); +__weak_alias(getfsspec,_getfsspec); +__weak_alias(setfsent,_setfsent); +#endif + static FILE *_fs_fp; +static size_t _fs_lineno = 0; +static const char *_fs_file = _PATH_FSTAB; static struct fstab _fs_fstab; -static error __P((int)); -static fstabscan __P((void)); +static int fstabscan __P((void)); + +static __inline char *nextfld __P((char **, const char *)); + + +static __inline char * +nextfld(str, sep) + char **str; + const char *sep; +{ + char *ret; + while ((ret = strsep(str, sep)) != NULL && *ret == '\0') + continue; + return ret; +} + -static +static int fstabscan() { - register char *cp; + char *cp, *lp, *sp; #define MAXLINELENGTH 1024 static char line[MAXLINELENGTH]; char subline[MAXLINELENGTH]; - int typexx; + static const char sep[] = ":\n"; + static const char ws[] = " \t\n"; + static char *fstab_type[] = { + FSTAB_RW, FSTAB_RQ, FSTAB_RO, FSTAB_SW, FSTAB_DP, FSTAB_XX, NULL + }; for (;;) { - if (!(cp = fgets(line, sizeof(line), _fs_fp))) - return(0); + if (!(lp = fgets(line, sizeof(line), _fs_fp))) + return 0; + _fs_lineno++; /* OLD_STYLE_FSTAB */ - if (!strpbrk(cp, " \t")) { - _fs_fstab.fs_spec = strtok(cp, ":\n"); + if (!strpbrk(lp, " \t")) { + _fs_fstab.fs_spec = nextfld(&lp, sep); if (!_fs_fstab.fs_spec || *_fs_fstab.fs_spec == '#') continue; - _fs_fstab.fs_file = strtok((char *)NULL, ":\n"); - _fs_fstab.fs_type = strtok((char *)NULL, ":\n"); + _fs_fstab.fs_file = nextfld(&lp, sep); + _fs_fstab.fs_type = nextfld(&lp, sep); if (_fs_fstab.fs_type) { if (!strcmp(_fs_fstab.fs_type, FSTAB_XX)) continue; @@ -80,66 +113,54 @@ fstabscan() _fs_fstab.fs_vfstype = strcmp(_fs_fstab.fs_type, FSTAB_SW) ? "ufs" : "swap"; - if (cp = strtok((char *)NULL, ":\n")) { + if ((cp = nextfld(&lp, sep)) != NULL) { _fs_fstab.fs_freq = atoi(cp); - if (cp = strtok((char *)NULL, ":\n")) { + if ((cp = nextfld(&lp, sep)) != NULL) { _fs_fstab.fs_passno = atoi(cp); - return(1); + return 1; } } } goto bad; } /* OLD_STYLE_FSTAB */ - _fs_fstab.fs_spec = strtok(cp, " \t\n"); + _fs_fstab.fs_spec = nextfld(&lp, ws); 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"); + _fs_fstab.fs_file = nextfld(&lp, ws); + _fs_fstab.fs_vfstype = nextfld(&lp, ws); + _fs_fstab.fs_mntops = nextfld(&lp, ws); 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) { + if ((cp = nextfld(&lp, ws)) != NULL) { _fs_fstab.fs_freq = atoi(cp); - if ((cp = strtok((char *)NULL, " \t\n")) != NULL) + if ((cp = nextfld(&lp, ws)) != NULL) _fs_fstab.fs_passno = atoi(cp); } - strcpy(subline, _fs_fstab.fs_mntops); - for (typexx = 0, cp = strtok(subline, ","); cp; - cp = strtok((char *)NULL, ",")) { + sp = strncpy(subline, _fs_fstab.fs_mntops, sizeof(subline)-1); + while ((cp = nextfld(&sp, ",")) != NULL) { + char **tp; + 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++; + + for (tp = fstab_type; *tp; tp++) + if (strcmp(cp, *tp) == 0) { + _fs_fstab.fs_type = *tp; + break; + } + if (*tp) break; - } } - if (typexx) + if (strcmp(_fs_fstab.fs_type, FSTAB_XX) == 0) continue; if (cp != NULL) - return(1); + return 1; -bad: /* no way to distinguish between EOF and syntax error */ - error(EFTYPE); +bad: + warnx("%s, %lu: Missing fields", _fs_file, (u_long)_fs_lineno); } /* NOTREACHED */ } @@ -147,43 +168,46 @@ bad: /* no way to distinguish between E struct fstab * getfsent() { - if (!_fs_fp && !setfsent() || !fstabscan()) - return((struct fstab *)NULL); - return(&_fs_fstab); + if ((!_fs_fp && !setfsent()) || !fstabscan()) + return NULL; + return &_fs_fstab; } struct fstab * getfsspec(name) - register const char *name; + const char *name; { if (setfsent()) while (fstabscan()) if (!strcmp(_fs_fstab.fs_spec, name)) - return(&_fs_fstab); - return((struct fstab *)NULL); + return &_fs_fstab; + return NULL; } struct fstab * getfsfile(name) - register const char *name; + const char *name; { if (setfsent()) while (fstabscan()) if (!strcmp(_fs_fstab.fs_file, name)) - return(&_fs_fstab); - return((struct fstab *)NULL); + return &_fs_fstab; + return NULL; } +int setfsent() { + _fs_lineno = 0; if (_fs_fp) { rewind(_fs_fp); - return(1); + return 1; + } + if ((_fs_fp = fopen(_PATH_FSTAB, "r")) == NULL) { + warn("Cannot open `%s'", _PATH_FSTAB); + return 0; } - if (_fs_fp = fopen(_PATH_FSTAB, "r")) - return(1); - error(errno); - return(0); + return 1; } void @@ -194,22 +218,3 @@ endfsent() _fs_fp = NULL; } } - -static -error(err) - int err; -{ - struct iovec iov[5]; - - iov[0].iov_base = "fstab: "; - iov[0].iov_len = 7; - iov[1].iov_base = _PATH_FSTAB; - iov[1].iov_len = sizeof(_PATH_FSTAB) - 1; - iov[2].iov_base = ": "; - iov[2].iov_len = 2; - iov[3].iov_base = strerror(err); - iov[3].iov_len = strlen(iov[3].iov_base); - iov[4].iov_base = "\n"; - iov[4].iov_len = 1; - (void)writev(STDERR_FILENO, iov, 5); -}