summaryrefslogtreecommitdiffstats
path: root/sys/fs/cd9660
diff options
context:
space:
mode:
authortrasz <trasz@FreeBSD.org>2008-10-03 23:17:22 +0000
committertrasz <trasz@FreeBSD.org>2008-10-03 23:17:22 +0000
commit36e419b05d2a5c719d4e8905761674da354eef64 (patch)
treed15a4695ea7e7e2dd82b5640c13cc693adcc28be /sys/fs/cd9660
parentc790c4de6495137d1e6a38e27265ad34aeb5d0a8 (diff)
downloadFreeBSD-src-36e419b05d2a5c719d4e8905761674da354eef64.zip
FreeBSD-src-36e419b05d2a5c719d4e8905761674da354eef64.tar.gz
Fix Vflags abuse in cd9660. There should be no functional changes.
Approved by: rwatson (mentor)
Diffstat (limited to 'sys/fs/cd9660')
-rw-r--r--sys/fs/cd9660/cd9660_node.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c
index 9f9f1b6..bc852ae 100644
--- a/sys/fs/cd9660/cd9660_node.c
+++ b/sys/fs/cd9660/cd9660_node.c
@@ -156,24 +156,24 @@ cd9660_defattr(isodir, inop, bp, ftype)
if (isonum_711(ap->version) == 1) {
if (!(ap->perm[0]&0x40))
- inop->inode.iso_mode |= VEXEC >> 6;
+ inop->inode.iso_mode |= S_IXOTH;
if (!(ap->perm[0]&0x10))
- inop->inode.iso_mode |= VREAD >> 6;
+ inop->inode.iso_mode |= S_IROTH;
if (!(ap->perm[0]&4))
- inop->inode.iso_mode |= VEXEC >> 3;
+ inop->inode.iso_mode |= S_IXGRP;
if (!(ap->perm[0]&1))
- inop->inode.iso_mode |= VREAD >> 3;
+ inop->inode.iso_mode |= S_IRGRP;
if (!(ap->perm[1]&0x40))
- inop->inode.iso_mode |= VEXEC;
+ inop->inode.iso_mode |= S_IXUSR;
if (!(ap->perm[1]&0x10))
- inop->inode.iso_mode |= VREAD;
+ inop->inode.iso_mode |= S_IRUSR;
inop->inode.iso_uid = isonum_723(ap->owner); /* what about 0? */
inop->inode.iso_gid = isonum_723(ap->group); /* what about 0? */
} else
ap = NULL;
}
if (!ap) {
- inop->inode.iso_mode |= VREAD|VEXEC|(VREAD|VEXEC)>>3|(VREAD|VEXEC)>>6;
+ inop->inode.iso_mode |= S_IRUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH;
inop->inode.iso_uid = (uid_t)0;
inop->inode.iso_gid = (gid_t)0;
}
OpenPOWER on IntegriCloud