replace -r (disable Rockridge extensions) with -R ..

"-r" for all "mount*" is reserved for read-only flag.

diff --git a/sbin/mount_cd9660/mount_cd9660.8 b/sbin/mount_cd9660/mount_cd9660.8
index 6d67cb5..3ce1a40 100644 (file)
--- a/sbin/mount_cd9660/mount_cd9660.8
+++ b/sbin/mount_cd9660/mount_cd9660.8
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: mount_cd9660.8,v 1.2 1996/06/23 14:31:16 deraadt Exp $
+.\"    $OpenBSD: mount_cd9660.8,v 1.3 1997/04/19 20:07:24 flipk Exp $
 .\"    $NetBSD: mount_cd9660.8,v 1.3 1995/04/23 10:33:13 cgd Exp $
 .\"
 .\" Copyright (c) 1993, 1994
@@ -45,7 +45,7 @@
 .Nd mount an ISO-9660 filesystem
 .Sh SYNOPSIS
 .Nm mount_cd9660
-.Op Fl egr
+.Op Fl egR
 .Op Fl o Ar options
 .Ar special | node
 .Sh DESCRIPTION
@@ -76,7 +76,7 @@ flag followed by a comma separated string of options.
 See the
 .Xr mount 8
 man page for possible options and their meanings.
-.It Fl r
+.It Fl R
 Do not use any Rockridge extensions included in the filesystem.
 .El
 .Sh SEE ALSO

diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index 63ec598..a53dc4d 100644 (file)
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mount_cd9660.c,v 1.4 1997/01/15 23:41:17 millert Exp $        */
+/*     $OpenBSD: mount_cd9660.c,v 1.5 1997/04/19 20:07:24 flipk Exp $  */
 /*     $NetBSD: mount_cd9660.c,v 1.3 1996/04/13 01:31:08 jtc Exp $     */
 
 /*
@@ -49,7 +49,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mount_cd9660.c     8.4 (Berkeley) 3/27/94";
 #else
-static char rcsid[] = "$OpenBSD: mount_cd9660.c,v 1.4 1997/01/15 23:41:17 millert Exp $";
+static char rcsid[] = "$OpenBSD: mount_cd9660.c,v 1.5 1997/04/19 20:07:24 flipk Exp $";
 #endif
 #endif /* not lint */
 
@@ -83,7 +83,7 @@ main(argc, argv)
        char *dev, *dir;
 
        mntflags = opts = 0;
-       while ((ch = getopt(argc, argv, "ego:r")) != -1)
+       while ((ch = getopt(argc, argv, "ego:R")) != -1)
                switch (ch) {
                case 'e':
                        opts |= ISOFSMNT_EXTATT;
@@ -94,7 +94,7 @@ main(argc, argv)
                case 'o':
                        getmntopts(optarg, mopts, &mntflags);
                        break;
-               case 'r':
+               case 'R':
                        opts |= ISOFSMNT_NORRIP;
                        break;
                case '?':