diff options
| author | rodrigc <rodrigc@FreeBSD.org> | 2005-11-19 16:38:39 +0000 |
|---|---|---|
| committer | rodrigc <rodrigc@FreeBSD.org> | 2005-11-19 16:38:39 +0000 |
| commit | 736e6b710d329cffb76d1bc5d4830af5150cd560 (patch) | |
| tree | e857bc35f9d0ff46cbf5eca65133cd35702f363c /sys/fs/msdosfs/msdosfs_vfsops.c | |
| parent | 4dd5f1433a33b475b924b4c2415a876fba2b0d72 (diff) | |
| download | FreeBSD-src-736e6b710d329cffb76d1bc5d4830af5150cd560.zip FreeBSD-src-736e6b710d329cffb76d1bc5d4830af5150cd560.tar.gz | |
Properly parse the nowin95 mount option.
Tested 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.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index fdb1544..93a58fc 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", "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; |
