Get rid of the last vestiges of the old MOUNT_* constants in the

mount_* programs.  While we're at it, collapse the four now-identical
mount programs for devfs, fdesc, kernfs, and procfs into links to
a new mount_std(8) which can mount any really generic filesystem
such as these when called with the appropriate argv[0].

Also, convert the mount programs to use sysexits.h.

1 files changed, 11 insertions, 4 deletions

diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index 8ceaec0..463b660 100644
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -45,7 +45,11 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
+/*
 static char sccsid[] = "@(#)mount_cd9660.c	8.4 (Berkeley) 3/27/94";
+*/
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -56,6 +60,7 @@ static char sccsid[] = "@(#)mount_cd9660.c	8.4 (Berkeley) 3/27/94";
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <sysexits.h>
 #include <unistd.h>
 
 #include "mntopts.h"
@@ -124,14 +129,16 @@ main(argc, argv)
 	vfc = getvfsbyname("cd9660");
 	if(!vfc && vfsisloadable("cd9660")) {
 		if(vfsload("cd9660")) {
-			err(1, "vfsload(cd9660)");
+			err(EX_OSERR, "vfsload(cd9660)");
 		}
 		endvfsent();	/* flush cache */
 		vfc = getvfsbyname("cd9660");
 	}
+	if (!vfc)
+		errx(EX_OSERR, "cd9660 filesystem not available");
 
-	if (mount(vfc ? vfc->vfc_index : MOUNT_CD9660, dir, mntflags, &args) < 0)
-		err(1, "%s", dev);
+	if (mount(vfc->vfc_index, dir, mntflags, &args) < 0)
+		err(EX_OSERR, "%s", dev);
 	exit(0);
 }
 
@@ -140,5 +147,5 @@ usage()
 {
 	(void)fprintf(stderr,
 		"usage: mount_cd9660 [-egrt] [-o options] special node\n");
-	exit(1);
+	exit(EX_USAGE);
 }