summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorDavid Leonard <d@cvs.openbsd.org>1999-07-01 02:20:23 +0000
committerDavid Leonard <d@cvs.openbsd.org>1999-07-01 02:20:23 +0000
commit4a0933d3bc42e7aedf2c0ba12283a8db5f7801e5 (patch)
treeb484402501920197cd128a5365c2405ed0f3603d /sbin
parent9cf4982800ba13916203ff0ff831a35b22c28522 (diff)
Add support for Joliet extensions. From FreeBSD
Diffstat (limited to 'sbin')
-rw-r--r--sbin/mount_cd9660/mount_cd9660.86
-rw-r--r--sbin/mount_cd9660/mount_cd9660.c11
2 files changed, 11 insertions, 6 deletions
diff --git a/sbin/mount_cd9660/mount_cd9660.8 b/sbin/mount_cd9660/mount_cd9660.8
index 55d3b2df92c..2e4b6ef4e36 100644
--- a/sbin/mount_cd9660/mount_cd9660.8
+++ b/sbin/mount_cd9660/mount_cd9660.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mount_cd9660.8,v 1.8 1999/05/23 14:11:13 aaron Exp $
+.\" $OpenBSD: mount_cd9660.8,v 1.9 1999/07/01 02:20:22 d 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 egjR
.Op Fl o Ar options
.Ar special node
.Sh DESCRIPTION
@@ -69,6 +69,8 @@ Do not strip version numbers on files.
only the last one will be listed.)
In either case, files may be opened without explicitly stating a
version number.
+.It Fl j
+Do not use any Joliet extensions included in the filesystem.
.It Fl o
Options are specified with a
.Fl o
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index 0a339e277e2..c62733d1461 100644
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount_cd9660.c,v 1.9 1998/01/30 17:31:52 weingart Exp $ */
+/* $OpenBSD: mount_cd9660.c,v 1.10 1999/07/01 02:20:22 d 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.9 1998/01/30 17:31:52 weingart Exp $";
+static char rcsid[] = "$OpenBSD: mount_cd9660.c,v 1.10 1999/07/01 02:20:22 d Exp $";
#endif
#endif /* not lint */
@@ -84,7 +84,7 @@ main(argc, argv)
char *dev, *dir;
mntflags = opts = 0;
- while ((ch = getopt(argc, argv, "ego:R")) != -1)
+ while ((ch = getopt(argc, argv, "egjo:R")) != -1)
switch (ch) {
case 'e':
opts |= ISOFSMNT_EXTATT;
@@ -92,6 +92,9 @@ main(argc, argv)
case 'g':
opts |= ISOFSMNT_GENS;
break;
+ case 'j':
+ opts |= ISOFSMNT_NOJOLIET;
+ break;
case 'o':
getmntopts(optarg, mopts, &mntflags);
break;
@@ -137,6 +140,6 @@ void
usage()
{
(void)fprintf(stderr,
- "usage: mount_cd9660 [-egrt] [-o options] special node\n");
+ "usage: mount_cd9660 [-egjrt] [-o options] special node\n");
exit(1);
}