BSD 4_4_Lite1 release

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

diff --git a/usr/src/sbin/mount_union/mount_union.c b/usr/src/sbin/mount_union/mount_union.c
index 3c7ef70..90d075b 100644 (file)
--- a/usr/src/sbin/mount_union/mount_union.c
+++ b/usr/src/sbin/mount_union/mount_union.c
@@ -5,23 +5,65 @@
  * This code is derived from software donated to Berkeley by
  * Jan-Simon Pendry.
  *
  * This code is derived from software donated to Berkeley by
  * Jan-Simon Pendry.
  *

- * %sccs.include.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_union.c       8.3 (Berkeley) %G%
+ * 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_union.c      8.5 (Berkeley) 3/27/94";
+#endif /* not lint */
+

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

+

 #include <miscfs/union/union.h>
 
 #include <miscfs/union/union.h>
 

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

 #include <stdio.h>
 #include <stdio.h>

-#include <unistd.h>

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

+#include <unistd.h>

 
 

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

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


@@ -31,81 +73,48 @@ main(argc, argv)
        struct union_args args;
        int ch, mntflags;
        char target[MAXPATHLEN];
        struct union_args args;
        int ch, mntflags;
        char target[MAXPATHLEN];

-       int error = 0;

 
        mntflags = 0;
        args.mntflags = UNMNT_ABOVE;
 
        mntflags = 0;
        args.mntflags = UNMNT_ABOVE;

-
-       while ((ch = getopt(argc, argv, "F:a:b:r:")) != EOF) {
-               switch(ch) {
-               case 'F':
-                       mntflags = atoi(optarg);
-                       break;
-               case 'a':
-                       if (strcmp(optarg, "bove") == 0) {
-                               args.mntflags &= ~UNMNT_OPMASK;
-                               args.mntflags |= UNMNT_ABOVE;
-                       } else {
-                               error = 1;
-                       }
-                       break;
-
+       while ((ch = getopt(argc, argv, "bo:r")) != EOF)
+               switch (ch) {

                case 'b':
                case 'b':

-                       if (strcmp(optarg, "elow") == 0) {
-                               args.mntflags &= ~UNMNT_OPMASK;
-                               args.mntflags |= UNMNT_BELOW;
-                       } else {
-                               error = 1;
-                       }
+                       args.mntflags &= ~UNMNT_OPMASK;
+                       args.mntflags |= UNMNT_BELOW;
+                       break;
+               case 'o':
+                       getmntopts(optarg, mopts, &mntflags);

                        break;
                        break;

-

                case 'r':
                case 'r':

-                       if (strcmp(optarg, "eplace") == 0) {
-                               args.mntflags &= ~UNMNT_OPMASK;
-                               args.mntflags |= UNMNT_REPLACE;
-                       } else {
-                               error = 1;
-                       }
+                       args.mntflags &= ~UNMNT_OPMASK;
+                       args.mntflags |= UNMNT_REPLACE;

                        break;
                        break;

-

                case '?':
                default:
                case '?':
                default:

-                       error = 1;
-                       break;
+                       usage();
+                       /* NOTREACHED */

                }
                }

-       }

        argc -= optind;
        argv += optind;
 
        if (argc != 2)
        argc -= optind;
        argv += optind;
 
        if (argc != 2)

-               error = 1;
-
-       if (error)

                usage();
 
                usage();
 

-       if (realpath(argv[0], target) == 0) {
-               (void)fprintf(stderr, "mount_union: %s: %s\n",
-                               target, strerror(errno));
-               exit(1);
-       }
+       if (realpath(argv[0], target) == 0)
+               err(1, "%s", target);

 
 

-       if (subdir(target, argv[1]) || subdir(argv[1], target)) {
-               (void)fprintf(stderr,
-                       "mount_union: %s (%s) and %s are not distinct paths\n",
-                               argv[0], target, argv[1]);
-               exit(1);
-       }
+       if (subdir(target, argv[1]) || subdir(argv[1], target))
+               errx(1, "%s (%s) and %s are not distinct paths",
+                   argv[0], target, argv[1]);

 
        args.target = target;
 
 
        args.target = target;
 

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

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

-static int
+int

 subdir(p, dir)
        const char *p;
        const char *dir;
 subdir(p, dir)
        const char *p;
        const char *dir;


@@ -126,6 +135,6 @@ void
 usage()
 {
        (void)fprintf(stderr,
 usage()
 {
        (void)fprintf(stderr,

-           "usage: mount_union [ -F fsoptions ] target_fs mount_point\n");
+               "usage: mount_union [-br] [-o options] target_fs mount_point\n");

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