summaryrefslogtreecommitdiffstats
path: root/sys/fs/msdosfs/msdosfs_vfsops.c
diff options
context:
space:
mode:
authorrodrigc <rodrigc@FreeBSD.org>2005-11-18 22:34:31 +0000
committerrodrigc <rodrigc@FreeBSD.org>2005-11-18 22:34:31 +0000
commit666e602c465a2f1c8965ed92a47086e3d5e98ecf (patch)
tree56cd7ea4b58560a7bc06830a53056f19030c8496 /sys/fs/msdosfs/msdosfs_vfsops.c
parent7df37188b73a4ac255a7d21458a0c5777685f12b (diff)
downloadFreeBSD-src-666e602c465a2f1c8965ed92a47086e3d5e98ecf.zip
FreeBSD-src-666e602c465a2f1c8965ed92a47086e3d5e98ecf.tar.gz
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 <rhurlin at gwdg dot de>
Diffstat (limited to 'sys/fs/msdosfs/msdosfs_vfsops.c')
-rw-r--r--sys/fs/msdosfs/msdosfs_vfsops.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c
index fcb136d..fdb1544 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);
OpenPOWER on IntegriCloud