From 4ab125739b2dbc8bbee54724e5ed4786dff8ea9a Mon Sep 17 00:00:00 2001 From: Craig Rodrigues Date: Fri, 18 Nov 2005 22:34:31 +0000 Subject: [PATCH] Add "shortnames" and "longnames" mount options which are synonyms for "shortname" and "longname" mount options. The old (before nmount()) mount_msdosfs program accepted "shortnames" and "longnames", but the kernel nmount() checked for "shortname" and "longname". So, make the kernel accept "shortnames", "longnames", "shortname", "longname" for forwards and backwarsd compatibility. Discovered by: Rainer Hurling --- sys/fs/msdosfs/msdosfs_vfsops.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index fcb136dcef5..fdb15440c8f 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -81,7 +81,7 @@ static const char *msdosfs_opts[] = { "from", "export", "uid", "gid", "mask", "dirmask", - "shortname", "longname", "win95", + "shortname", "shortnames", "longname", "longnames", "win95", "kiconv", "cs_win", "cs_dos", "cs_local", NULL }; @@ -163,8 +163,12 @@ update_mp(mp, td) pmp->pm_dirmask = v & ALLPERMS; vfs_flagopt(mp->mnt_optnew, "shortname", &pmp->pm_flags, MSDOSFSMNT_SHORTNAME); + vfs_flagopt(mp->mnt_optnew, "shortnames", + &pmp->pm_flags, MSDOSFSMNT_SHORTNAME); vfs_flagopt(mp->mnt_optnew, "longname", &pmp->pm_flags, MSDOSFSMNT_LONGNAME); + vfs_flagopt(mp->mnt_optnew, "longnames", + &pmp->pm_flags, MSDOSFSMNT_LONGNAME); vfs_flagopt(mp->mnt_optnew, "kiconv", &pmp->pm_flags, MSDOSFSMNT_KICONV);