summaryrefslogtreecommitdiffstats
path: root/sbin/mount_ext2fs
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1996-07-23 19:29:27 +0000
committerpeter <peter@FreeBSD.org>1996-07-23 19:29:27 +0000
commit8159e5ab86dc5a3682820a316bdbc83bdecc418a (patch)
tree6f16304341db71dad27bacbd571b015849f10b48 /sbin/mount_ext2fs
parent7737f5d2e9b626352e2fee6a5c198a3ca15a8ba4 (diff)
downloadFreeBSD-src-8159e5ab86dc5a3682820a316bdbc83bdecc418a.zip
FreeBSD-src-8159e5ab86dc5a3682820a316bdbc83bdecc418a.tar.gz
mount_ext2fs somehow got a stray mntopts.h, which was out of sync with
the real ../mount/getmntopts.c and ../mount/mntopts.h Closes PR#1419 Submitted by: rhh@stealth.ct.picker.com (Randall Hopper)
Diffstat (limited to 'sbin/mount_ext2fs')
-rw-r--r--sbin/mount_ext2fs/mntopts.h72
-rw-r--r--sbin/mount_ext2fs/mount_ext2fs.c4
2 files changed, 2 insertions, 74 deletions
diff --git a/sbin/mount_ext2fs/mntopts.h b/sbin/mount_ext2fs/mntopts.h
deleted file mode 100644
index a89f63d..0000000
--- a/sbin/mount_ext2fs/mntopts.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * Copyright (c) 1994
- * The Regents of the University of California. All rights reserved.
- *
- * 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.
- *
- * 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.
- *
- * @(#)mntopts.h 8.3 (Berkeley) 3/27/94
- */
-
-struct mntopt {
- const char *m_option; /* option name */
- int m_inverse; /* if a negative option, eg "dev" */
- int m_flag; /* bit to set, eg. MNT_RDONLY */
-};
-
-/* User-visible MNT_ flags. */
-#define MOPT_ASYNC { "async", 0, MNT_ASYNC }
-#define MOPT_NODEV { "dev", 1, MNT_NODEV }
-#define MOPT_NOEXEC { "exec", 1, MNT_NOEXEC }
-#define MOPT_NOSUID { "suid", 1, MNT_NOSUID }
-#define MOPT_RDONLY { "rdonly", 0, MNT_RDONLY }
-#define MOPT_SYNC { "sync", 0, MNT_SYNCHRONOUS }
-#define MOPT_UNION { "union", 0, MNT_UNION }
-
-/* Control flags. */
-#define MOPT_FORCE { "force", 1, MNT_FORCE }
-#define MOPT_UPDATE { "update", 0, MNT_UPDATE }
-
-/* Support for old-style "ro", "rw" flags. */
-#define MOPT_RO { "ro", 0, MNT_RDONLY }
-#define MOPT_RW { "rw", 1, MNT_RDONLY }
-
-#define MOPT_FSTAB_COMPAT \
- MOPT_RO, \
- MOPT_RW
-
-/* Standard options which all mounts can understand. */
-#define MOPT_STDOPTS \
- MOPT_FSTAB_COMPAT, \
- MOPT_NODEV, \
- MOPT_NOEXEC, \
- MOPT_NOSUID, \
- MOPT_RDONLY, \
- MOPT_UNION
-
-void getmntopts __P((const char *, const struct mntopt *, int *));
diff --git a/sbin/mount_ext2fs/mount_ext2fs.c b/sbin/mount_ext2fs/mount_ext2fs.c
index 96143a8..79e53dc 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.c
+++ b/sbin/mount_ext2fs/mount_ext2fs.c
@@ -42,7 +42,7 @@ static char copyright[] =
static char sccsid[] = "@(#)mount_lfs.c 8.3 (Berkeley) 3/27/94";
*/
static const char rcsid[] =
- "$Id";
+ "$Id$";
#endif /* not lint */
#include <sys/param.h>
@@ -80,7 +80,7 @@ main(argc, argv)
while ((ch = getopt(argc, argv, "o:")) != EOF)
switch (ch) {
case 'o':
- getmntopts(optarg, mopts, &mntflags);
+ getmntopts(optarg, mopts, &mntflags, 0);
break;
case '?':
default:
OpenPOWER on IntegriCloud