* update for WARNS=1

* getopt returns -1 not EOF
* fix .Nm usage

Author: lukem

sbin/mount_umap/mount_umap.8

@@ -1,4 +1,4 @@
-.\"	$NetBSD: mount_umap.8,v 1.5 1997/05/29 01:48:38 cgd Exp $
+.\"	$NetBSD: mount_umap.8,v 1.6 1997/09/15 06:10:23 lukem Exp $
 .\"
 .\" Copyright (c) 1992, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -44,7 +44,7 @@
 .Nm mount_umap
 .Nd sample file system layer
 .Sh SYNOPSIS
-.Nm mount_umap
+.Nm
 .Op Fl o Ar options
 -u
 .Ar uid-mapfile
@@ -54,7 +54,7 @@
 .Ar mount-point
 .Sh DESCRIPTION
 The
-.Nm mount_umap
+.Nm
 command is used to mount a sub-tree of an existing file system
 that uses a different set of uids and gids than the local system.
 Such a file system could be mounted from a remote site via NFS or
@@ -73,13 +73,13 @@ man page for possible options and their meanings.
 .El
 .Pp
 The
-.Nm mount_umap
+.Nm
 command uses a set of files provided by the user to make correspondences
 between uids and gids in the sub-tree's original environment and
 some other set of ids in the local environment.  For instance, user
 smith might have uid 1000 in the original environment, while having
 uid 2000 in the local environment.  The
-.Nm mount_umap
+.Nm
 command allows the subtree from smith's original environment to be
 mapped in such a way that all files with owning uid 1000 look like
 they are actually owned by uid 2000.  
@@ -115,13 +115,13 @@ at most 16 groups can be mapped by a given subtree.
 .Pp
 The mapfiles can be located anywhere in the file hierarchy, but they
 must be owned by root, and they must be writable only by root.  
-.Nm mount_umap
+.Nm
 will refuse to map the sub-tree if the ownership or permissions on
 these files are improper.  It will also balk if the count of mappings
 in the first line of the map files is not correct.
 .Pp
 The layer created by the
-.Nm mount_umap
+.Nm
 command is meant to serve as a simple example of file system layering.
 It is not meant for production use.  The implementation is not very
 sophisticated.
@@ -130,5 +130,5 @@ sophisticated.
 .Xr mount_null 8
 .Sh HISTORY
 The
-.Nm mount_umap
+.Nm
 utility first appeared in 4.4BSD.

sbin/mount_umap/mount_umap.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_umap.c,v 1.5 1996/04/13 01:32:05 jtc Exp $	*/
+/*	$NetBSD: mount_umap.c,v 1.6 1997/09/15 06:10:24 lukem Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1994
@@ -36,17 +36,17 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1992, 1993, 1994\n\
-	The Regents of the University of California.  All rights reserved.\n";
+__COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\n\
+	The Regents of the University of California.  All rights reserved.\n");
 #endif /* not lint */
 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)mount_umap.c	8.3 (Berkeley) 3/27/94";
 #else
-static char rcsid[] = "$NetBSD: mount_umap.c,v 1.5 1996/04/13 01:32:05 jtc Exp $";
+__RCSID("$NetBSD: mount_umap.c,v 1.6 1997/09/15 06:10:24 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -87,6 +87,7 @@ const struct mntopt mopts[] = {
 	{ NULL }
 };
 
+int	main __P((int, char *[]));
 void	usage __P((void));
 
 int
@@ -106,7 +107,7 @@ main(argc, argv)
 
 	mntflags = 0;
 	mapfile = gmapfile = NULL;
-	while ((ch = getopt(argc, argv, "g:o:u:")) != EOF)
+	while ((ch = getopt(argc, argv, "g:o:u:")) != -1)
 		switch (ch) {
 		case 'g':
 			gmapfile = optarg;
@@ -199,7 +200,7 @@ main(argc, argv)
 #endif /* MAPSECURITY */
 
 	if ((fscanf(gfp, "%d\n", &gnentries)) != 1)
-		errx(1, "nentries not found%s", gmapfile, not);
+		errx(1, "nentries not found%s", not);
 	if (gnentries > MAPFILEENTRIES)
 		errx(1,
 		    "maximum number of entries is %d%s", GMAPFILEENTRIES, not);
@@ -230,7 +231,7 @@ main(argc, argv)
 	args.gmapdata = gmapdata;
 
 	if (mount(MOUNT_UMAP, argv[1], mntflags, &args))
-		err(1, NULL);
+		err(1, "%s", "");
 	exit(0);
 }
 

sbin/mount_union/mount_union.8

@@ -1,4 +1,4 @@
-.\"	$NetBSD: mount_union.8,v 1.6 1997/06/30 20:06:39 phil Exp $
+.\"	$NetBSD: mount_union.8,v 1.7 1997/09/15 06:13:38 lukem Exp $
 .\"
 .\" Copyright (c) 1994
 .\" The Regents of the University of California.  All rights reserved.
@@ -43,14 +43,14 @@
 .Nm mount_union
 .Nd mount union filesystems
 .Sh SYNOPSIS
-.Nm mount_union
+.Nm
 .Op Fl br
 .Op Fl o Ar options
 .Ar directory
 .Ar uniondir
 .Sh DESCRIPTION
 The
-.Nm mount_union
+.Nm
 command
 attaches
 .Ar directory
@@ -204,6 +204,6 @@ over a union tree has the side-effect of creating
 a tree of shadow directories in the upper layer.
 .Sh HISTORY
 The
-.Nm mount_union
+.Nm
 command first appeared in
 .Bx 4.4 .

sbin/mount_union/mount_union.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_union.c,v 1.3 1996/04/13 01:32:11 jtc Exp $	*/
+/*	$NetBSD: mount_union.c,v 1.4 1997/09/15 06:13:40 lukem Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1994
@@ -36,17 +36,17 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1992, 1993, 1994\n\
-	The Regents of the University of California.  All rights reserved.\n";
+__COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\n\
+	The Regents of the University of California.  All rights reserved.\n");
 #endif /* not lint */
 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)mount_union.c	8.5 (Berkeley) 3/27/94";
 #else
-static char rcsid[] = "$NetBSD: mount_union.c,v 1.3 1996/04/13 01:32:11 jtc Exp $";
+__RCSID("$NetBSD: mount_union.c,v 1.4 1997/09/15 06:13:40 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -68,6 +68,7 @@ const struct mntopt mopts[] = {
 	{ NULL }
 };
 
+int	main __P((int, char *[]));
 int	subdir __P((const char *, const char *));
 void	usage __P((void));
 
@@ -82,7 +83,7 @@ main(argc, argv)
 
 	mntflags = 0;
 	args.mntflags = UNMNT_ABOVE;
-	while ((ch = getopt(argc, argv, "bo:r")) != EOF)
+	while ((ch = getopt(argc, argv, "bo:r")) != -1)
 		switch (ch) {
 		case 'b':
 			args.mntflags &= ~UNMNT_OPMASK;
@@ -116,7 +117,7 @@ main(argc, argv)
 	args.target = target;
 
 	if (mount(MOUNT_UNION, argv[1], mntflags, &args))
-		err(1, NULL);
+		err(1, "%s", "");
 	exit(0);
 }