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.12
diff -u -p -r1.6 -r1.12
--- src/lib/libc/gen/fstab.c	1995/02/27 03:43:12	1.6
+++ src/lib/libc/gen/fstab.c	1998/02/03 18:23:42	1.12
@@ -1,4 +1,4 @@
-/*	$NetBSD: fstab.c,v 1.6 1995/02/27 03:43:12 cgd Exp $	*/
+/*	$NetBSD: fstab.c,v 1.12 1998/02/03 18:23:42 perry Exp $	*/
 
 /*
  * Copyright (c) 1980, 1988, 1993
@@ -33,14 +33,17 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #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.12 1998/02/03 18:23:42 perry Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
+#include <sys/types.h>
+#include <sys/uio.h>
 #include <errno.h>
 #include <fstab.h>
 #include <stdio.h>
@@ -48,31 +51,41 @@ static char rcsid[] = "$NetBSD: fstab.c,
 #include <string.h>
 #include <unistd.h>
 
+#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 struct fstab _fs_fstab;
 
-static error __P((int));
-static fstabscan __P((void));
+static void error __P((int));
+static int fstabscan __P((void));
 
-static
+static int
 fstabscan()
 {
-	register char *cp;
+	char *cp;
 #define	MAXLINELENGTH	1024
 	static char line[MAXLINELENGTH];
 	char subline[MAXLINELENGTH];
 	int typexx;
+	static const char sep[] = ":\n";
+	static const char ws[] = " \t\n";
 
 	for (;;) {
 		if (!(cp = fgets(line, sizeof(line), _fs_fp)))
 			return(0);
 /* OLD_STYLE_FSTAB */
 		if (!strpbrk(cp, " \t")) {
-			_fs_fstab.fs_spec = strtok(cp, ":\n");
+			_fs_fstab.fs_spec = strtok(cp, 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 = strtok(NULL, sep);
+			_fs_fstab.fs_type = strtok(NULL, sep);
 			if (_fs_fstab.fs_type) {
 				if (!strcmp(_fs_fstab.fs_type, FSTAB_XX))
 					continue;
@@ -80,9 +93,9 @@ fstabscan()
 				_fs_fstab.fs_vfstype =
 				    strcmp(_fs_fstab.fs_type, FSTAB_SW) ?
 				    "ufs" : "swap";
-				if (cp = strtok((char *)NULL, ":\n")) {
+				if ((cp = strtok(NULL, sep)) != NULL) {
 					_fs_fstab.fs_freq = atoi(cp);
-					if (cp = strtok((char *)NULL, ":\n")) {
+					if ((cp = strtok(NULL, sep)) != NULL) {
 						_fs_fstab.fs_passno = atoi(cp);
 						return(1);
 					}
@@ -91,22 +104,22 @@ fstabscan()
 			goto bad;
 		}
 /* OLD_STYLE_FSTAB */
-		_fs_fstab.fs_spec = strtok(cp, " \t\n");
+		_fs_fstab.fs_spec = strtok(cp, 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 = strtok(NULL, ws);
+		_fs_fstab.fs_vfstype = strtok(NULL, ws);
+		_fs_fstab.fs_mntops = strtok(NULL, 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 = strtok(NULL, ws)) != NULL) {
 			_fs_fstab.fs_freq = atoi(cp);
-			if ((cp = strtok((char *)NULL, " \t\n")) != NULL)
+			if ((cp = strtok(NULL, ws)) != NULL)
 				_fs_fstab.fs_passno = atoi(cp);
 		}
-		strcpy(subline, _fs_fstab.fs_mntops);
+		(void)strncpy(subline, _fs_fstab.fs_mntops, sizeof(subline)-1);
 		for (typexx = 0, cp = strtok(subline, ","); cp;
 		     cp = strtok((char *)NULL, ",")) {
 			if (strlen(cp) != 2)
@@ -147,14 +160,14 @@ bad:		/* no way to distinguish between E
 struct fstab *
 getfsent()
 {
-	if (!_fs_fp && !setfsent() || !fstabscan())
+	if ((!_fs_fp && !setfsent()) || !fstabscan())
 		return((struct fstab *)NULL);
 	return(&_fs_fstab);
 }
 
 struct fstab *
 getfsspec(name)
-	register const char *name;
+	const char *name;
 {
 	if (setfsent())
 		while (fstabscan())
@@ -165,7 +178,7 @@ getfsspec(name)
 
 struct fstab *
 getfsfile(name)
-	register const char *name;
+	const char *name;
 {
 	if (setfsent())
 		while (fstabscan())
@@ -174,13 +187,14 @@ getfsfile(name)
 	return((struct fstab *)NULL);
 }
 
+int
 setfsent()
 {
 	if (_fs_fp) {
 		rewind(_fs_fp);
 		return(1);
 	}
-	if (_fs_fp = fopen(_PATH_FSTAB, "r"))
+	if ((_fs_fp = fopen(_PATH_FSTAB, "r")) != NULL)
 		return(1);
 	error(errno);
 	return(0);
@@ -195,7 +209,7 @@ endfsent()
 	}
 }
 
-static
+static void
 error(err)
 	int err;
 {