From 06ca211c355e6fc268494c70e2f1e6d664ddaf5a Mon Sep 17 00:00:00 2001 From: Keith Bostic Date: Wed, 4 Nov 1992 22:48:02 -0800 Subject: [PATCH] access() is supposed to return 0 if all of the desired access modes would be granted. SCCS-vsn: sys/ufs/ffs/ufs_vnops.c 7.110 SCCS-vsn: sys/ufs/ufs/ufs_vnops.c 7.110 --- usr/src/sys/ufs/ffs/ufs_vnops.c | 6 ++---- usr/src/sys/ufs/ufs/ufs_vnops.c | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c index a1818b5d2e..b0e2db5ca1 100644 --- a/usr/src/sys/ufs/ffs/ufs_vnops.c +++ b/usr/src/sys/ufs/ffs/ufs_vnops.c @@ -4,7 +4,7 @@ * * %sccs.include.redist.c% * - * @(#)ufs_vnops.c 7.109 (Berkeley) %G% + * @(#)ufs_vnops.c 7.110 (Berkeley) %G% */ #include @@ -216,9 +216,7 @@ ufs_access(ap) found: ; } - if ((ip->i_mode & mode) != 0) - return (0); - return (EACCES); + return ((ip->i_mode & mode) == mode ? 0 : EACCES); } /* ARGSUSED */ diff --git a/usr/src/sys/ufs/ufs/ufs_vnops.c b/usr/src/sys/ufs/ufs/ufs_vnops.c index a1818b5d2e..b0e2db5ca1 100644 --- a/usr/src/sys/ufs/ufs/ufs_vnops.c +++ b/usr/src/sys/ufs/ufs/ufs_vnops.c @@ -4,7 +4,7 @@ * * %sccs.include.redist.c% * - * @(#)ufs_vnops.c 7.109 (Berkeley) %G% + * @(#)ufs_vnops.c 7.110 (Berkeley) %G% */ #include @@ -216,9 +216,7 @@ ufs_access(ap) found: ; } - if ((ip->i_mode & mode) != 0) - return (0); - return (EACCES); + return ((ip->i_mode & mode) == mode ? 0 : EACCES); } /* ARGSUSED */ -- 2.20.1