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.16 retrieving revision 1.28 diff -u -p -r1.16 -r1.28 --- src/lib/libc/gen/fstab.c 1998/10/16 11:24:30 1.16 +++ src/lib/libc/gen/fstab.c 2006/08/12 23:49:54 1.28 @@ -1,4 +1,4 @@ -/* $NetBSD: fstab.c,v 1.16 1998/10/16 11:24:30 kleink Exp $ */ +/* $NetBSD: fstab.c,v 1.28 2006/08/12 23:49:54 christos Exp $ */ /* * Copyright (c) 1980, 1988, 1993 @@ -12,11 +12,7 @@ * 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 + * 3. 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. * @@ -38,13 +34,14 @@ #if 0 static char sccsid[] = "@(#)fstab.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: fstab.c,v 1.16 1998/10/16 11:24:30 kleink Exp $"); +__RCSID("$NetBSD: fstab.c,v 1.28 2006/08/12 23:49:54 christos Exp $"); #endif #endif /* LIBC_SCCS and not lint */ #include "namespace.h" #include -#include + +#include #include #include #include @@ -54,171 +51,183 @@ __RCSID("$NetBSD: fstab.c,v 1.16 1998/10 #include #ifdef __weak_alias -__weak_alias(endfsent,_endfsent); -__weak_alias(getfsent,_getfsent); -__weak_alias(getfsfile,_getfsfile); -__weak_alias(getfsspec,_getfsspec); -__weak_alias(setfsent,_setfsent); +__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 void error __P((int)); static int fstabscan __P((void)); +static char *nextfld(char **, const char *); +static int fstabscan(void); + + +static char * +nextfld(char **str, const char *sep) +{ + char *ret; + + _DIAGASSERT(str != NULL); + _DIAGASSERT(sep != NULL); + + while ((ret = stresep(str, sep, '\\')) != NULL && *ret == '\0') + continue; + return ret; +} + + static int -fstabscan() +fstabscan(void) { - char *cp; + char *cp, *lp, *sp; #define MAXLINELENGTH 1024 static char line[MAXLINELENGTH]; char subline[MAXLINELENGTH]; - int typexx; - char *lastp; static const char sep[] = ":\n"; static const char ws[] = " \t\n"; + static const char *fstab_type[] = { + FSTAB_RW, FSTAB_RQ, FSTAB_RO, FSTAB_SW, FSTAB_DP, FSTAB_XX, NULL + }; + (void)memset(&_fs_fstab, 0, sizeof(_fs_fstab)); 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_r(cp, sep, &lastp); + 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_r(NULL, sep, &lastp); - _fs_fstab.fs_type = strtok_r(NULL, sep, &lastp); + _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; _fs_fstab.fs_mntops = _fs_fstab.fs_type; _fs_fstab.fs_vfstype = + __UNCONST( strcmp(_fs_fstab.fs_type, FSTAB_SW) ? - "ufs" : "swap"; - if ((cp = strtok_r(NULL, sep, &lastp)) - != NULL) { + "ufs" : "swap"); + if ((cp = nextfld(&lp, sep)) != NULL) { _fs_fstab.fs_freq = atoi(cp); - if ((cp = strtok_r(NULL, sep, &lastp)) - != NULL) { + 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_r(cp, ws, &lastp); + _fs_fstab.fs_spec = nextfld(&lp, ws); if (!_fs_fstab.fs_spec || *_fs_fstab.fs_spec == '#') continue; - _fs_fstab.fs_file = strtok_r(NULL, ws, &lastp); - _fs_fstab.fs_vfstype = strtok_r(NULL, ws, &lastp); - _fs_fstab.fs_mntops = strtok_r(NULL, ws, &lastp); + _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_r(NULL, ws, &lastp)) != NULL) { + if ((cp = nextfld(&lp, ws)) != NULL) { _fs_fstab.fs_freq = atoi(cp); - if ((cp = strtok_r(NULL, ws, &lastp)) != NULL) + if ((cp = nextfld(&lp, ws)) != NULL) _fs_fstab.fs_passno = atoi(cp); } - (void)strncpy(subline, _fs_fstab.fs_mntops, sizeof(subline)-1); - for (typexx = 0, cp = strtok_r(subline, ",", &lastp); cp; - cp = strtok_r((char *)NULL, ",", &lastp)) { + + /* subline truncated iff line truncated */ + (void)strlcpy(subline, _fs_fstab.fs_mntops, sizeof(subline)); + sp = subline; + + while ((cp = nextfld(&sp, ",")) != NULL) { + const 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 = __UNCONST(*tp); + break; + } + if (*tp) break; - } } - if (typexx) + if (_fs_fstab.fs_type == NULL) + goto bad; + 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 */ } struct fstab * -getfsent() +getfsent(void) { if ((!_fs_fp && !setfsent()) || !fstabscan()) - return((struct fstab *)NULL); - return(&_fs_fstab); + return NULL; + return &_fs_fstab; } struct fstab * -getfsspec(name) - const char *name; +getfsspec(const char *name) { + + _DIAGASSERT(name != NULL); + 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) - const char *name; +getfsfile(const char *name) { + + _DIAGASSERT(name != NULL); + 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() +setfsent(void) { + _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")) != NULL) - return(1); - error(errno); - return(0); + return 1; } void -endfsent() +endfsent(void) { if (_fs_fp) { (void)fclose(_fs_fp); _fs_fp = NULL; } } - -static void -error(err) - int err; -{ - - errno = err; - warn(_PATH_FSTAB); -}