From 395a4557a1fc4b73bec0ba74f9a1be3b2d95f20a Mon Sep 17 00:00:00 2001
From: jkh <jkh@FreeBSD.org>
Date: Fri, 18 Jun 1999 12:05:02 +0000
Subject: This lets you specify "gemdosfs", "shortnames", "longnames", and
 "nowin95" as arguments to the "-o" flag, as alternatives to "-G", "-s", "-l",
 and "-9"; when running "mount_msdos" by hand, that doesn't let you do
 anything you couldn't already do, but if you're letting "mount" run it, it
 lets you specify those options, which is especially useful if, for example,
 you have an entry in "/etc/fstab" for some file system, with "noauto" set, so
 you can conveniently mount a DOS partition from a removable drive and force
 it to treat the file system as VFAT rather than boring old FAT.

Submitted by:	Guy Harris <guy@netapp.com>
---
 sbin/i386/mount_msdos/mount_msdos.8 | 11 +++++++++--
 sbin/i386/mount_msdos/mount_msdos.c | 14 ++++++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

(limited to 'sbin/i386')

diff --git a/sbin/i386/mount_msdos/mount_msdos.8 b/sbin/i386/mount_msdos/mount_msdos.8
index 2088285..60a489e 100644
--- a/sbin/i386/mount_msdos/mount_msdos.8
+++ b/sbin/i386/mount_msdos/mount_msdos.8
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: mount_msdos.8,v 1.14 1998/06/30 06:23:41 charnier Exp $
+.\"	$Id: mount_msdos.8,v 1.15 1999/01/11 18:35:14 dt Exp $
 .\"
 .Dd April 7, 1994
 .Dt MOUNT_MSDOS 8
@@ -72,7 +72,14 @@ The options are as follows:
 Use the specified mount
 .Ar options ,
 as described in
-.Xr mount 8 .
+.Xr mount 8 ,
+or one of the MSDOS filesystem-specific options
+.Ar shortnames ,
+.Ar longnames
+or
+.Ar nowin95 ,
+all of which can be used to affect Windows name translation in the
+underlying filesystem.
 .It Fl u Ar uid
 Set the owner of the files in the file system to
 .Ar uid .
diff --git a/sbin/i386/mount_msdos/mount_msdos.c b/sbin/i386/mount_msdos/mount_msdos.c
index 3536b68..a9e5454 100644
--- a/sbin/i386/mount_msdos/mount_msdos.c
+++ b/sbin/i386/mount_msdos/mount_msdos.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: mount_msdos.c,v 1.14 1998/02/23 16:49:16 ache Exp $";
+	"$Id: mount_msdos.c,v 1.15 1998/06/30 06:23:42 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -54,11 +54,21 @@ static const char rcsid[] =
 
 #include "mntopts.h"
 
+/*
+ * XXX - no way to specify "foo=<bar>"-type options; that's what we'd
+ * want for "-u", "-g", "-m", "-L", and "-W".
+ */
 static struct mntopt mopts[] = {
 	MOPT_STDOPTS,
 	MOPT_FORCE,
 	MOPT_SYNC,
 	MOPT_UPDATE,
+#ifdef MSDOSFSMNT_GEMDOSFS
+	{ "gemdosfs", 0, MSDOSFSMNT_GEMDOSFS, 1 },
+#endif
+	{ "shortnames", 0, MSDOSFSMNT_SHORTNAME, 1 },
+	{ "longnames", 0, MSDOSFSMNT_LONGNAME, 1 },
+	{ "nowin95", 0, MSDOSFSMNT_NOWIN95, 1 },
 	{ NULL }
 };
 
@@ -121,7 +131,7 @@ main(argc, argv)
 			args.flags |= MSDOSFSMNT_U2WTABLE;
 			break;
 		case 'o':
-			getmntopts(optarg, mopts, &mntflags, 0);
+			getmntopts(optarg, mopts, &mntflags, &args.flags);
 			break;
 		case '?':
 		default:
-- 
cgit v1.1