d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly parse the nowin95 mount option.

Browse Source 
Tested by:	Rainer Hurling <rhurlin at gwdg dot de>
This commit is contained in:
rodrigc 2005-11-19 16:38:39 +00:00
parent 4dd5f1433a
commit 736e6b710d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/fs/msdosfs/msdosfs_vfsops.c
View File

@ -81,7 +81,7 @@ static const char *msdosfs_opts[] = {
"from",
"export",
"uid", "gid", "mask", "dirmask",
"shortname", "shortnames", "longname", "longnames", "win95",
"shortname", "shortnames", "longname", "longnames", "nowin95", "win95",
"kiconv", "cs_win", "cs_dos", "cs_local",
NULL
};
@ -172,11 +172,10 @@ update_mp(mp, td)
vfs_flagopt(mp->mnt_optnew, "kiconv",
&pmp->pm_flags, MSDOSFSMNT_KICONV);
/* XXX: Can't use flagopt due to negative option */
if (!vfs_getopt(mp->mnt_optnew, "win95", NULL, NULL))
pmp->pm_flags &= ~MSDOSFSMNT_NOWIN95;
else
if (vfs_getopt(mp->mnt_optnew, "nowin95", NULL, NULL) == 0)
pmp->pm_flags |= MSDOSFSMNT_NOWIN95;
else
pmp->pm_flags &= ~MSDOSFSMNT_NOWIN95;
if (pmp->pm_flags & MSDOSFSMNT_NOWIN95)
pmp->pm_flags |= MSDOSFSMNT_SHORTNAME;