From 63cd8d1f1bc5828ef41d385622f516f43c11e76b Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Tue, 28 Oct 1997 10:29:55 +0000
Subject: Fixed style bugs in open() fix.

---
 sys/kern/vfs_extattr.c  | 9 +++++----
 sys/kern/vfs_syscalls.c | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index cafe82d..6273cc6 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.77 1997/10/22 07:28:51 joerg Exp $
+ * $Id: vfs_syscalls.c,v 1.78 1997/10/23 09:29:09 kato Exp $
  */
 
 /*
@@ -864,15 +864,16 @@ open(p, uap, retval)
 	register struct filedesc *fdp = p->p_fd;
 	register struct file *fp;
 	register struct vnode *vp;
-	int flags, cmode;
+	int cmode, flags, oflags;
 	struct file *nfp;
 	int type, indx, error;
 	struct flock lf;
 	struct nameidata nd;
 
-	flags = FFLAGS(SCARG(uap, flags));
-	if ((flags & FREAD + FWRITE) == 0)
+	oflags = SCARG(uap, flags);
+	if ((oflags & O_ACCMODE) == O_ACCMODE)
 		return (EINVAL);
+	flags = FFLAGS(oflags);
 	error = falloc(p, &nfp, &indx);
 	if (error)
 		return (error);
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index cafe82d..6273cc6 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.77 1997/10/22 07:28:51 joerg Exp $
+ * $Id: vfs_syscalls.c,v 1.78 1997/10/23 09:29:09 kato Exp $
  */
 
 /*
@@ -864,15 +864,16 @@ open(p, uap, retval)
 	register struct filedesc *fdp = p->p_fd;
 	register struct file *fp;
 	register struct vnode *vp;
-	int flags, cmode;
+	int cmode, flags, oflags;
 	struct file *nfp;
 	int type, indx, error;
 	struct flock lf;
 	struct nameidata nd;
 
-	flags = FFLAGS(SCARG(uap, flags));
-	if ((flags & FREAD + FWRITE) == 0)
+	oflags = SCARG(uap, flags);
+	if ((oflags & O_ACCMODE) == O_ACCMODE)
 		return (EINVAL);
+	flags = FFLAGS(oflags);
 	error = falloc(p, &nfp, &indx);
 	if (error)
 		return (error);
-- 
cgit v1.1