diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2013-04-12 20:48:55 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2013-04-12 20:48:55 +0000 |
| commit | 69e6d7b75e96c406d072cb83ffc9b26fbf1a86fb (patch) | |
| tree | 54038c9ac32a45f8741dcc23fb9a8ffc0e15ff89 /sbin/mount_cd9660 | |
| parent | 51048477bcc79bcc8753121ec91c150648df3d1b (diff) | |
| parent | 8818042ff2ecd155adb5c248a22de2dbe5d9c2a9 (diff) | |
| download | src-test-69e6d7b75e96c406d072cb83ffc9b26fbf1a86fb.tar.gz src-test-69e6d7b75e96c406d072cb83ffc9b26fbf1a86fb.zip | |
sync from head
Notes
Notes:
svn path=/projects/bmake/; revision=249429
Diffstat (limited to 'sbin/mount_cd9660')
| -rw-r--r-- | sbin/mount_cd9660/mount_cd9660.8 | 6 | ||||
| -rw-r--r-- | sbin/mount_cd9660/mount_cd9660.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sbin/mount_cd9660/mount_cd9660.8 b/sbin/mount_cd9660/mount_cd9660.8 index 909af4019cdfc..b4716862bfd32 100644 --- a/sbin/mount_cd9660/mount_cd9660.8 +++ b/sbin/mount_cd9660/mount_cd9660.8 @@ -32,7 +32,7 @@ .\" @(#)mount_cd9660.8 8.3 (Berkeley) 3/27/94 .\" $FreeBSD$ .\" -.Dd October 3, 2005 +.Dd March 5, 2013 .Dt MOUNT_CD9660 8 .Os .Sh NAME @@ -80,7 +80,7 @@ See the man page for possible options and their meanings. The following cd9660 specific options are available: .Pp -.Bl -tag -width "nostrictjoliet" -compact +.Bl -tag -width "brokenjoliet" -compact .It Cm extatt Same as .Fl e . @@ -93,7 +93,7 @@ Same as .It Cm norrip Same as .Fl r . -.It Cm nostrictjoliet +.It Cm brokenjoliet Same as .Fl b . .El diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c index 22159661db7a9..7ea606439ef2d 100644 --- a/sbin/mount_cd9660/mount_cd9660.c +++ b/sbin/mount_cd9660/mount_cd9660.c @@ -83,7 +83,7 @@ main(int argc, char **argv) { struct iovec *iov; int iovlen; - int ch, mntflags, opts; + int ch, mntflags; char *dev, *dir, *p, *val, mntpath[MAXPATHLEN]; int verbose; int ssector; /* starting sector, 0 for 1st session */ @@ -91,7 +91,7 @@ main(int argc, char **argv) iov = NULL; iovlen = 0; - mntflags = opts = verbose = 0; + mntflags = verbose = 0; ssector = -1; while ((ch = getopt(argc, argv, "begjo:rs:vC:")) != -1) @@ -109,7 +109,7 @@ main(int argc, char **argv) build_iovec(&iov, &iovlen, "nojoliet", NULL, (size_t)-1); break; case 'o': - getmntopts(optarg, mopts, &mntflags, &opts); + getmntopts(optarg, mopts, &mntflags, NULL); p = strchr(optarg, '='); val = NULL; if (p != NULL) { |