JehanneOS/jehanne
JehanneOS
/
jehanne
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

libc: improve access(AWRITE) and access(AEXEC) on directories

This commit is contained in:
Giacomo Tesio 2017-08-28 02:09:56 +02:00
parent b78613615d
commit 59e881c04d
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sys/src/lib/c/9sys/access.c
View File

@ -22,8 +22,9 @@
int int
jehanne_access(const char *name, int mode) jehanne_access(const char *name, int mode)
{ {
int fd; int tmp, reqmode;
Dir *db; Dir *db;
char *user;
static char omode[] = { static char omode[] = {
OSTAT, OSTAT,
@ -36,16 +37,38 @@ jehanne_access(const char *name, int mode)
ORDWR /* 7=4+2+1 READ|WRITE|EXEC, ignore EXEC */ ORDWR /* 7=4+2+1 READ|WRITE|EXEC, ignore EXEC */
}; };
fd = open(name, omode[mode&AMASK]); reqmode = omode[mode&AMASK];
if(fd >= 0){ tmp = open(name, reqmode);
close(fd); if(tmp >= 0){
close(tmp);
return 0; return 0;
} }
db = jehanne_dirstat(name); db = jehanne_dirstat(name);
if(db != nil){ if(db != nil){
fd = db->mode & omode[mode&AMASK]; if(db->mode & DMDIR){
/* check other first */
tmp = db->mode & reqmode;
if(tmp != reqmode){
/* TODO: make something better */
user = jehanne_getuser();
if(jehanne_strcmp(user, db->gid) == 0){
/* check group */
tmp = db->mode & (reqmode << 3);
tmp = tmp >> 3;
if(tmp != reqmode && jehanne_strcmp(user, db->uid)== 0){
/* check user */
tmp = db->mode & (reqmode << 6);
tmp = tmp >> 6;
}
} else if (jehanne_strcmp(user, db->uid)== 0){
/* check user */
tmp = db->mode & (reqmode << 6);
tmp = tmp >> 6;
}
}
}
jehanne_free(db); jehanne_free(db);
if(fd) if(tmp == reqmode)
return 0; return 0;
} }
return -1; return -1;