oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Explicit conversion from O_ACCMODE to minix [RW]_BIT is clearer

Browse Source 
and catches bogus values (such as 3).
This commit is contained in:
Ben Gras 2006-11-01 14:17:47 +00:00
parent 0c1d433f60
commit 86303b3024
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
servers/vfs/open.c
View File

@ -33,8 +33,6 @@
#define offset m2_l1 #define offset m2_l1
PRIVATE char mode_map[] = {R_BIT, W_BIT, R_BIT|W_BIT, 0};
FORWARD _PROTOTYPE( int common_open, (int oflags, mode_t omode) ); FORWARD _PROTOTYPE( int common_open, (int oflags, mode_t omode) );
FORWARD _PROTOTYPE( int pipe_open, (struct vnode *vp,mode_t bits,int oflags)); FORWARD _PROTOTYPE( int pipe_open, (struct vnode *vp,mode_t bits,int oflags));
@ -90,6 +88,7 @@ PRIVATE int common_open(register int oflags, mode_t omode)
struct vnode *vp, *vp2; struct vnode *vp, *vp2;
struct vmnt *vmp; struct vmnt *vmp;
char lastc[NAME_MAX]; char lastc[NAME_MAX];
int m;
/* Request and response structures */ /* Request and response structures */
struct lookup_req lookup_req; struct lookup_req lookup_req;
@ -97,7 +96,13 @@ PRIVATE int common_open(register int oflags, mode_t omode)
struct node_details res; struct node_details res;
/* Remap the bottom two bits of oflags. */ /* Remap the bottom two bits of oflags. */
bits = (mode_t) mode_map[oflags & O_ACCMODE]; m = oflags & O_ACCMODE;
switch(m) {
case O_RDONLY: bits = R_BIT; break;
case O_WRONLY: bits = W_BIT; break;
case O_RDWR: bits = R_BIT | W_BIT; break;
default: return EINVAL;
}
/* See if file descriptor and filp slots are available. */ /* See if file descriptor and filp slots are available. */
if ((r = get_fd(0, bits, &m_in.fd, &fil_ptr)) != OK) return(r); if ((r = get_fd(0, bits, &m_in.fd, &fil_ptr)) != OK) return(r);