Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-5]: src/sbin/mount_cd9660 update from trunk (approved by thorpej):



details:   https://anonhg.NetBSD.org/src/rev/1ec09ec89c42
branches:  netbsd-1-5
changeset: 488531:1ec09ec89c42
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Sat Jul 15 14:02:42 2000 +0000

description:
update from trunk (approved by thorpej):
add extatt, gens, nojoliet, norrip options - names taken from FreeBSD
add nrr as an alias for norrip, for compatibility with Solaris
retire -e, -g, -j, -r: they are still recognized and handled, but are
        not listed in mount_cd9660's SYNOPSIS and are documented as
        obsolete in mount_cd9660(8)
update history for joliet support and nomaplcase option

diffstat:

 sbin/mount_cd9660/mount_cd9660.8 |  64 +++++++++++++++++++++++++++++----------
 sbin/mount_cd9660/mount_cd9660.c |  19 ++++++++++-
 2 files changed, 63 insertions(+), 20 deletions(-)

diffs (184 lines):

diff -r 1e52e076bb6a -r 1ec09ec89c42 sbin/mount_cd9660/mount_cd9660.8
--- a/sbin/mount_cd9660/mount_cd9660.8  Sat Jul 15 08:52:28 2000 +0000
+++ b/sbin/mount_cd9660/mount_cd9660.8  Sat Jul 15 14:02:42 2000 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: mount_cd9660.8,v 1.10 2000/06/14 06:49:14 cgd Exp $
+.\" $NetBSD: mount_cd9660.8,v 1.10.2.1 2000/07/15 14:02:42 jdolecek Exp $
 .\"
 .\" Copyright (c) 1993, 1994
 .\"     The Regents of the University of California.  All rights reserved.
@@ -36,15 +36,14 @@
 .\"
 .\"     @(#)mount_cd9660.8     8.3 (Berkeley) 3/27/94
 .\"
-.Dd March 27, 1994
+.Dd July 15, 2000
 .Dt MOUNT_CD9660 8
-.Os BSD 4
+.Os NetBSD 1.5
 .Sh NAME
 .Nm mount_cd9660
 .Nd mount an ISO-9660 filesystem
 .Sh SYNOPSIS
 .Nm ""
-.Op Fl egjr
 .Op Fl o Ar options
 .Ar special node
 .Sh DESCRIPTION
@@ -60,9 +59,17 @@
 .Pp
 The options are as follows:
 .Bl -tag -width indent
-.It Fl e
+.It Fl o
+Options are specified with a
+.Fl o
+flag followed by a comma separated string of options.
+Besides options mentioned in
+.Xr mount 8
+man page, following cd9660-specific options are supported:
+.Bl -tag -width indent
+.It Cm extatt
 Enable the use of extended attributes.
-.It Fl g
+.It Cm gens
 Do not strip version numbers on files and leave the case of the filename
 alone.
 (By default, uppercase characters are translated to lowercase,
@@ -73,32 +80,49 @@
 version number, in which case you get the last one, or by explicitly
 stating a version number (albeit it's quite difficult to know it, if
 you are not using the
-.Fl g
+.Cm gens
 option), in which case you get the specified version.
-.It Fl j
+.It Cm nojoliet
 Do not make use of Joliet extensions for long filenames which
 may be present in the filesystem.
 .Pp
 Interpretation of Joliet extensions is enabled by default, but
 currently does not support Unicode characters present in some
 Joliet filesystems.
-.It Fl o
-Options are specified with a
-.Fl o
-flag followed by a comma separated string of options.
-Besides options mentioned in
-.Xr mount 8
-man page, following cd9660-specific options are supported:
-.Bl -tag -width indent
 .It Cm nomaplcase
 File names on cd9660 cdrom without Rock Ridge extension present
 should be uppercase only. By default, cd9660 recodes file
 names read from a non-Rock Ridge disk to all lowercase characters.
 .Cm nomaplcase
 turns off this mapping.
+.It Cm norrip
+Do not use any Rockridge extensions included in the filesystem.
+.It Cm nrr
+Same as
+.Cm norrip .
+For compatibility with Solaris only.
 .El
+.El
+
+For compatibility with previous releases, following obsolete flags are
+recognized:
+.Bl -tag -width indent
+.It Fl e
+Same as
+.Fl o
+.Cm extatt .
+.It Fl j
+Same as
+.Fl o
+.Cm nojoliet .
+.It Fl g
+Same as
+.Fl o
+.Cm gens .
 .It Fl r
-Do not use any Rockridge extensions included in the filesystem.
+Same as
+.Fl o
+.Cm norrip .
 .El
 .Sh SEE ALSO
 .Xr mount 2 ,
@@ -121,3 +145,9 @@
 .Nm
 utility first appeared
 .Bx 4.4 .
+Support for Joliet filesystem appeared in
+.Nx 1.4 .
+Option
+.Cm nomaplcase
+was added in
+.Nx 1.5 .
diff -r 1e52e076bb6a -r 1ec09ec89c42 sbin/mount_cd9660/mount_cd9660.c
--- a/sbin/mount_cd9660/mount_cd9660.c  Sat Jul 15 08:52:28 2000 +0000
+++ b/sbin/mount_cd9660/mount_cd9660.c  Sat Jul 15 14:02:42 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mount_cd9660.c,v 1.11 2000/05/27 16:32:08 jdolecek Exp $       */
+/*     $NetBSD: mount_cd9660.c,v 1.11.2.1 2000/07/15 14:02:42 jdolecek Exp $   */
 
 /*
  * Copyright (c) 1992, 1993, 1994
@@ -50,7 +50,7 @@
 #if 0
 static char sccsid[] = "@(#)mount_cd9660.c     8.7 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: mount_cd9660.c,v 1.11 2000/05/27 16:32:08 jdolecek Exp $");
+__RCSID("$NetBSD: mount_cd9660.c,v 1.11.2.1 2000/07/15 14:02:42 jdolecek Exp $");
 #endif
 #endif /* not lint */
 
@@ -70,7 +70,12 @@
 const struct mntopt mopts[] = {
        MOPT_STDOPTS,
        MOPT_UPDATE,
+       { "extatt", 0, ISOFSMNT_EXTATT, 1 },
+       { "gens", 0, ISOFSMNT_GENS, 1 },
        { "maplcase", 1, ISOFSMNT_NOCASETRANS, 1 },
+       { "nrr", 0, ISOFSMNT_NORRIP, 1 },
+       { "rrip", 1, ISOFSMNT_NORRIP, 1 },
+       { "joliet", 1, ISOFSMNT_NOJOLIET, 1 },
        { NULL }
 };
 
@@ -90,18 +95,26 @@
        while ((ch = getopt(argc, argv, "egijo:r")) != -1)
                switch (ch) {
                case 'e':
+                       /* obsolete, retained for compatibility only, use
+                        * -o extatt */
                        opts |= ISOFSMNT_EXTATT;
                        break;
                case 'g':
+                       /* obsolete, retained for compatibility only, use
+                        * -o gens */
                        opts |= ISOFSMNT_GENS;
                        break;
                case 'j':
+                       /* obsolete, retained fo compatibility only, use
+                        * -o nojoliet */
                        opts |= ISOFSMNT_NOJOLIET;
                        break;
                case 'o':
                        getmntopts(optarg, mopts, &mntflags, &opts);
                        break;
                case 'r':
+                       /* obsolete, retained for compatibility only, use
+                        * -o norrip */
                        opts |= ISOFSMNT_NORRIP;
                        break;
                case '?':
@@ -136,6 +149,6 @@
 usage()
 {
        (void)fprintf(stderr,
-               "usage: mount_cd9660 [-egijr] [-o options] special node\n");
+               "usage: mount_cd9660 [-o options] special node\n");
        exit(1);
 }



Home | Main Index | Thread Index | Old Index