diff --git a/sbin/i386/mount_msdos/mount_msdos.8 b/sbin/i386/mount_msdos/mount_msdos.8 index 2088285cc68c..60a489e2941a 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 3536b68171dd..a9e545480a5f 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 @@ -54,11 +54,21 @@ static const char rcsid[] = #include "mntopts.h" +/* + * XXX - no way to specify "foo="-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: diff --git a/sbin/mount_msdos/mount_msdos.8 b/sbin/mount_msdos/mount_msdos.8 index 2088285cc68c..60a489e2941a 100644 --- a/sbin/mount_msdos/mount_msdos.8 +++ b/sbin/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/mount_msdos/mount_msdos.c b/sbin/mount_msdos/mount_msdos.c index 3536b68171dd..a9e545480a5f 100644 --- a/sbin/mount_msdos/mount_msdos.c +++ b/sbin/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 @@ -54,11 +54,21 @@ static const char rcsid[] = #include "mntopts.h" +/* + * XXX - no way to specify "foo="-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: diff --git a/sbin/mount_msdosfs/mount_msdosfs.8 b/sbin/mount_msdosfs/mount_msdosfs.8 index 2088285cc68c..60a489e2941a 100644 --- a/sbin/mount_msdosfs/mount_msdosfs.8 +++ b/sbin/mount_msdosfs/mount_msdosfs.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/mount_msdosfs/mount_msdosfs.c b/sbin/mount_msdosfs/mount_msdosfs.c index 3536b68171dd..a9e545480a5f 100644 --- a/sbin/mount_msdosfs/mount_msdosfs.c +++ b/sbin/mount_msdosfs/mount_msdosfs.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 @@ -54,11 +54,21 @@ static const char rcsid[] = #include "mntopts.h" +/* + * XXX - no way to specify "foo="-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: