BSD 4_4_Lite1 release

[unix-history] / usr / src / sbin / mount_kernfs / mount_kernfs.c

diff --git a/usr/src/sbin/mount_kernfs/mount_kernfs.c b/usr/src/sbin/mount_kernfs/mount_kernfs.c
index c6a3761..33a6b5e 100644 (file)
--- a/usr/src/sbin/mount_kernfs/mount_kernfs.c
+++ b/usr/src/sbin/mount_kernfs/mount_kernfs.c
@@ -1,26 +1,67 @@
 /*
  * Copyright (c) 1990, 1992 Jan-Simon Pendry
 /*
  * Copyright (c) 1990, 1992 Jan-Simon Pendry

- * Copyright (c) 1992, 1993
+ * Copyright (c) 1992, 1993, 1994

  *     The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry.
  *
  *     The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry.
  *

- * %sccs.redist.c.%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 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
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)mount_kernfs.c      8.1 (Berkeley) 6/5/93
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
  */
 

+#ifndef lint
+char copyright[] =
+"@(#) Copyright (c) 1992, 1993, 1994\n\
+       The Regents of the University of California.  All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)mount_kernfs.c     8.2 (Berkeley) 3/27/94";
+#endif /* not lint */
+

 #include <sys/param.h>
 #include <sys/mount.h>
 
 #include <sys/param.h>
 #include <sys/mount.h>
 

-#include <errno.h>
+#include <err.h>

 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

-void usage __P((void));
+#include "mntopts.h"
+
+struct mntopt mopts[] = {
+       MOPT_STDOPTS,
+       { NULL }
+};
+
+void   usage __P((void));

 
 int
 main(argc, argv)
 
 int
 main(argc, argv)


@@ -30,10 +71,10 @@ main(argc, argv)
        int ch, mntflags;
 
        mntflags = 0;
        int ch, mntflags;
 
        mntflags = 0;

-       while ((ch = getopt(argc, argv, "F:")) != EOF)
-               switch(ch) {
-               case 'F':
-                       mntflags = atoi(optarg);
+       while ((ch = getopt(argc, argv, "o:")) != EOF)
+               switch (ch) {
+               case 'o':
+                       getmntopts(optarg, mopts, &mntflags);

                        break;
                case '?':
                default:
                        break;
                case '?':
                default:


@@ -45,10 +86,8 @@ main(argc, argv)
        if (argc != 2)
                usage();
 
        if (argc != 2)
                usage();
 

-       if (mount(MOUNT_KERNFS, argv[1], mntflags, NULL)) {
-               (void)fprintf(stderr, "mount_kernfs: %s\n", strerror(errno));
-               exit(1);
-       }
+       if (mount(MOUNT_KERNFS, argv[1], mntflags, NULL))
+               err(1, NULL);

        exit(0);
 }
 
        exit(0);
 }
 


@@ -56,6 +95,6 @@ void
 usage()
 {
        (void)fprintf(stderr,
 usage()
 {
        (void)fprintf(stderr,

-           "usage: mount_kernfs [ -F fsoptions ] /kern mount_point\n");
+               "usage: mount_kernfs [-o options] /kern mount_point\n");

        exit(1);
 }
        exit(1);
 }