From owner-p4-projects@FreeBSD.ORG Wed Mar 7 01:23:41 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0EDB16A402; Wed, 7 Mar 2007 01:23:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A0D5316A400 for ; Wed, 7 Mar 2007 01:23:40 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9227C13C48E for ; Wed, 7 Mar 2007 01:23:40 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l271NeT9088910 for ; Wed, 7 Mar 2007 01:23:40 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l271Ne9A088906 for perforce@freebsd.org; Wed, 7 Mar 2007 01:23:40 GMT (envelope-from jkim@freebsd.org) Date: Wed, 7 Mar 2007 01:23:40 GMT Message-Id: <200703070123.l271Ne9A088906@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 115451 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Mar 2007 01:23:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=115451 Change 115451 by jkim@jkim_hammer on 2007/03/07 01:23:36 Add access mask for open(3). Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#25 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#15 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux.h#21 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#25 (text+ko) ==== @@ -531,6 +531,7 @@ #define LINUX_O_RDONLY 00000000 #define LINUX_O_WRONLY 00000001 #define LINUX_O_RDWR 00000002 +#define LINUX_O_ACCMODE 00000003 #define LINUX_O_CREAT 00000100 #define LINUX_O_EXCL 00000200 #define LINUX_O_NOCTTY 00000400 ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#15 (text+ko) ==== @@ -96,12 +96,16 @@ int bsd_flags, error; bsd_flags = 0; - if (l_flags & LINUX_O_RDONLY) - bsd_flags |= O_RDONLY; - if (l_flags & LINUX_O_WRONLY) + switch (l_flags & LINUX_O_ACCMODE) { + case LINUX_O_WRONLY: bsd_flags |= O_WRONLY; - if (l_flags & LINUX_O_RDWR) + break; + case LINUX_O_RDWR: bsd_flags |= O_RDWR; + break; + default: + bsd_flags |= O_RDONLY; + } if (l_flags & LINUX_O_NDELAY) bsd_flags |= O_NONBLOCK; if (l_flags & LINUX_O_APPEND) ==== //depot/projects/linuxolator/src/sys/i386/linux/linux.h#21 (text+ko) ==== @@ -502,6 +502,7 @@ #define LINUX_O_RDONLY 00000000 #define LINUX_O_WRONLY 00000001 #define LINUX_O_RDWR 00000002 +#define LINUX_O_ACCMODE 00000003 #define LINUX_O_CREAT 00000100 #define LINUX_O_EXCL 00000200 #define LINUX_O_NOCTTY 00000400