More err()/warn()/etc. argument fixes.

9 files changed, 28 insertions, 28 deletions

diff --git a/sbin/modload/modload.c b/sbin/modload/modload.c
index 70761990431..68099079c5f 100644
--- a/sbin/modload/modload.c
+++ b/sbin/modload/modload.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: modload.c,v 1.13 1997/06/25 18:21:35 kstailey Exp $	*/
+/*	$OpenBSD: modload.c,v 1.14 1997/08/24 08:07:02 downsj Exp $	*/
 /*	$NetBSD: modload.c,v 1.13 1995/05/28 05:21:58 jtc Exp $	*/
 
 /*
@@ -285,7 +285,7 @@ main(argc, argv)
 	 * Pre-open the 0-linked module to get the size information
 	 */
 	if ((modfd = open(out, O_RDONLY, 0)) == -1)
-		err(4, out);
+		err(4, "%s", out);
 	fileopen |= MOD_OPEN;
 
 	/*
@@ -356,7 +356,7 @@ main(argc, argv)
 	 * Open the relinked module to load it...
 	 */
 	if ((modfd = open(out, O_RDONLY, 0)) == -1)
-		err(4, out);
+		err(4, "%s", out);
 	fileopen |= MOD_OPEN;
 
 	/*
diff --git a/sbin/mount_ados/mount_ados.c b/sbin/mount_ados/mount_ados.c
index 7fb2f7178a6..46feeae01b6 100644
--- a/sbin/mount_ados/mount_ados.c
+++ b/sbin/mount_ados/mount_ados.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_ados.c,v 1.6 1997/08/20 05:10:17 millert Exp $	*/
+/*	$OpenBSD: mount_ados.c,v 1.7 1997/08/24 08:07:05 downsj Exp $	*/
 /*	$NetBSD: mount_ados.c,v 1.5 1996/04/13 01:30:59 jtc Exp $	*/
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: mount_ados.c,v 1.6 1997/08/20 05:10:17 millert Exp $";
+static char rcsid[] = "$OpenBSD: mount_ados.c,v 1.7 1997/08/24 08:07:05 downsj Exp $";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
@@ -135,7 +135,7 @@ main(argc, argv)
 		if (errno == EOPNOTSUPP)
 			errx(1, "%s: Filesystem not supported by kernel", dir);
 		else
-			err(1, dir);
+			err(1, "%s", dir);
 	}
 	exit (0);
 }
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index 42d689a0ccd..7b05a892b64 100644
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_cd9660.c,v 1.7 1997/08/20 05:10:18 millert Exp $	*/
+/*	$OpenBSD: mount_cd9660.c,v 1.8 1997/08/24 08:07:08 downsj Exp $	*/
 /*	$NetBSD: mount_cd9660.c,v 1.3 1996/04/13 01:31:08 jtc Exp $	*/
 
 /*
@@ -49,7 +49,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mount_cd9660.c	8.4 (Berkeley) 3/27/94";
 #else
-static char rcsid[] = "$OpenBSD: mount_cd9660.c,v 1.7 1997/08/20 05:10:18 millert Exp $";
+static char rcsid[] = "$OpenBSD: mount_cd9660.c,v 1.8 1997/08/24 08:07:08 downsj Exp $";
 #endif
 #endif /* not lint */
 
@@ -128,7 +128,7 @@ main(argc, argv)
 		if (errno == EOPNOTSUPP)
 			errx(1, "%s: Filesystem not supported by kernel", dir);
 		else
-			err(1, dir);
+			err(1, "%s", dir);
 	}
 	exit(0);
 }
diff --git a/sbin/mount_fdesc/mount_fdesc.c b/sbin/mount_fdesc/mount_fdesc.c
index 98dff956c01..be6b4aece8d 100644
--- a/sbin/mount_fdesc/mount_fdesc.c
+++ b/sbin/mount_fdesc/mount_fdesc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_fdesc.c,v 1.5 1997/08/20 05:10:20 millert Exp $	*/
+/*	$OpenBSD: mount_fdesc.c,v 1.6 1997/08/24 08:07:11 downsj Exp $	*/
 /*	$NetBSD: mount_fdesc.c,v 1.7 1996/04/13 01:31:15 jtc Exp $	*/
 
 /*
@@ -48,7 +48,7 @@ char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mount_fdesc.c	8.2 (Berkeley) 3/27/94";
 #else
-static char rcsid[] = "$OpenBSD: mount_fdesc.c,v 1.5 1997/08/20 05:10:20 millert Exp $";
+static char rcsid[] = "$OpenBSD: mount_fdesc.c,v 1.6 1997/08/24 08:07:11 downsj Exp $";
 #endif
 #endif /* not lint */
 
@@ -99,7 +99,7 @@ main(argc, argv)
 			errx(1, "%s: Filesystem not supported by kernel",
 			    argv[1]);
 		else
-			err(1, argv[1]);
+			err(1, "%s", argv[1]);
 	}
 	exit(0);
 }
diff --git a/sbin/mount_null/mount_null.c b/sbin/mount_null/mount_null.c
index 54b1caa3317..4e01fc03154 100644
--- a/sbin/mount_null/mount_null.c
+++ b/sbin/mount_null/mount_null.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_null.c,v 1.5 1997/08/20 05:10:24 millert Exp $	*/
+/*	$OpenBSD: mount_null.c,v 1.6 1997/08/24 08:07:14 downsj Exp $	*/
 /*	$NetBSD: mount_null.c,v 1.3 1996/04/13 01:31:49 jtc Exp $	*/
 
 /*
@@ -47,7 +47,7 @@ char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mount_null.c	8.5 (Berkeley) 3/27/94";
 #else
-static char rcsid[] = "$OpenBSD: mount_null.c,v 1.5 1997/08/20 05:10:24 millert Exp $";
+static char rcsid[] = "$OpenBSD: mount_null.c,v 1.6 1997/08/24 08:07:14 downsj Exp $";
 #endif
 #endif /* not lint */
 
@@ -111,7 +111,7 @@ main(argc, argv)
 			errx(1, "%s: Filesystem not supported by kernel",
 			    argv[1]);
 		else
-			err(1, argv[1]);
+			err(1, "%s", argv[1]);
 	}
 	exit(0);
 }
diff --git a/sbin/mount_procfs/mount_procfs.c b/sbin/mount_procfs/mount_procfs.c
index 40eb98951d8..b42c961c47f 100644
--- a/sbin/mount_procfs/mount_procfs.c
+++ b/sbin/mount_procfs/mount_procfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_procfs.c,v 1.5 1997/08/20 05:10:26 millert Exp $	*/
+/*	$OpenBSD: mount_procfs.c,v 1.6 1997/08/24 08:07:17 downsj Exp $	*/
 /*	$NetBSD: mount_procfs.c,v 1.7 1996/04/13 01:31:59 jtc Exp $	*/
 
 /*
@@ -48,7 +48,7 @@ char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mount_procfs.c	8.3 (Berkeley) 3/27/94";
 #else
-static char rcsid[] = "$OpenBSD: mount_procfs.c,v 1.5 1997/08/20 05:10:26 millert Exp $";
+static char rcsid[] = "$OpenBSD: mount_procfs.c,v 1.6 1997/08/24 08:07:17 downsj Exp $";
 #endif
 #endif /* not lint */
 
@@ -99,7 +99,7 @@ main(argc, argv)
 			errx(1, "%s: Filesystem not supported by kernel",
 			    argv[1]);
 		else
-			err(1, argv[1]);
+			err(1, "%s", argv[1]);
 	}
 	exit(0);
 }
diff --git a/sbin/mount_umap/mount_umap.c b/sbin/mount_umap/mount_umap.c
index b34c03e1e64..168b40c46e0 100644
--- a/sbin/mount_umap/mount_umap.c
+++ b/sbin/mount_umap/mount_umap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_umap.c,v 1.6 1997/08/20 05:10:27 millert Exp $	*/
+/*	$OpenBSD: mount_umap.c,v 1.7 1997/08/24 08:07:20 downsj Exp $	*/
 /*	$NetBSD: mount_umap.c,v 1.5 1996/04/13 01:32:05 jtc Exp $	*/
 
 /*
@@ -47,7 +47,7 @@ char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mount_umap.c	8.3 (Berkeley) 3/27/94";
 #else
-static char rcsid[] = "$OpenBSD: mount_umap.c,v 1.6 1997/08/20 05:10:27 millert Exp $";
+static char rcsid[] = "$OpenBSD: mount_umap.c,v 1.7 1997/08/24 08:07:20 downsj Exp $";
 #endif
 #endif /* not lint */
 
@@ -236,7 +236,7 @@ main(argc, argv)
 			errx(1, "%s: Filesystem not supported by kernel",
 			    argv[1]);
 		else
-			err(1, argv[1]);
+			err(1, "%s", argv[1]);
 	}
 	exit(0);
 }
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index 4355ec4b0ed..fb0c022a09d 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tape.c,v 1.10 1997/07/25 19:13:13 mickey Exp $	*/
+/*	$OpenBSD: tape.c,v 1.11 1997/08/24 08:07:23 downsj Exp $	*/
 /*	$NetBSD: tape.c,v 1.26 1997/04/15 07:12:25 lukem Exp $	*/
 
 /*
@@ -189,7 +189,7 @@ setup()
 	else
 		mt = open(magtape, O_RDONLY, 0);
 	if (mt < 0)
-		err(1, magtape);
+		err(1, "%s", magtape);
 	volno = 1;
 	setdumpnum();
 	FLUSHTAPEBUF();
diff --git a/sbin/restore/utilities.c b/sbin/restore/utilities.c
index 9ec0bc1d0b5..3fadb401fb7 100644
--- a/sbin/restore/utilities.c
+++ b/sbin/restore/utilities.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: utilities.c,v 1.4 1997/07/25 19:13:12 mickey Exp $	*/
+/*	$OpenBSD: utilities.c,v 1.5 1997/08/24 08:07:25 downsj Exp $	*/
 /*	$NetBSD: utilities.c,v 1.11 1997/03/19 08:42:56 lukem Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)utilities.c	8.4 (Berkeley) 10/18/94";
 #else
-static char rcsid[] = "$OpenBSD: utilities.c,v 1.4 1997/07/25 19:13:12 mickey Exp $";
+static char rcsid[] = "$OpenBSD: utilities.c,v 1.5 1997/08/24 08:07:25 downsj Exp $";
 #endif
 #endif /* not lint */
 
@@ -153,7 +153,7 @@ newnode(np)
 	cp = myname(np);
 	if (!Nflag && mkdir(cp, 0777) < 0) {
 		np->e_flags |= EXISTED;
-		warn(cp);
+		warn("%s", cp);
 		return;
 	}
 	Vprintf(stdout, "Make node %s\n", cp);
@@ -176,7 +176,7 @@ removenode(ep)
 	ep->e_flags &= ~TMPNAME;
 	cp = myname(ep);
 	if (!Nflag && rmdir(cp) < 0) {
-		warn(cp);
+		warn("%s", cp);
 		return;
 	}
 	Vprintf(stdout, "Remove node %s\n", cp);
@@ -197,7 +197,7 @@ removeleaf(ep)
 	ep->e_flags &= ~TMPNAME;
 	cp = myname(ep);
 	if (!Nflag && unlink(cp) < 0) {
-		warn(cp);
+		warn("%s", cp);
 		return;
 	}
 	Vprintf(stdout, "Remove leaf %s\n", cp);