fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sort includes and more cleanup and fixes in util/

Browse Source
This commit is contained in:
FRIGN
2014-11-13 19:54:28 +01:00
committed by sin
parent 0810c61154
commit 7d2683ddf2
48 changed files with 181 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
util/mode.c
View File

@@ -1,7 +1,8 @@
#include <unistd.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <unistd.h>
#include "../util.h"
mode_t
@@ -21,30 +22,30 @@ parsemode(const char *str, mode_t mode, mode_t mask)
mode_t who, perm, clear;
octal = strtol(str, &end, 8);
if(*end == '\0') {
if(octal < 0 || octal > 07777) {
if (*end == '\0') {
if (octal < 0 || octal > 07777) {
eprintf("%s: invalid mode\n", str);
return -1;
}
mode = 0;
if(octal & 04000) mode |= S_ISUID;
if(octal & 02000) mode |= S_ISGID;
if(octal & 01000) mode |= S_ISVTX;
if(octal & 00400) mode |= S_IRUSR;
if(octal & 00200) mode |= S_IWUSR;
if(octal & 00100) mode |= S_IXUSR;
if(octal & 00040) mode |= S_IRGRP;
if(octal & 00020) mode |= S_IWGRP;
if(octal & 00010) mode |= S_IXGRP;
if(octal & 00004) mode |= S_IROTH;
if(octal & 00002) mode |= S_IWOTH;
if(octal & 00001) mode |= S_IXOTH;
if (octal & 04000) mode |= S_ISUID;
if (octal & 02000) mode |= S_ISGID;
if (octal & 01000) mode |= S_ISVTX;
if (octal & 00400) mode |= S_IRUSR;
if (octal & 00200) mode |= S_IWUSR;
if (octal & 00100) mode |= S_IXUSR;
if (octal & 00040) mode |= S_IRGRP;
if (octal & 00020) mode |= S_IWGRP;
if (octal & 00010) mode |= S_IXGRP;
if (octal & 00004) mode |= S_IROTH;
if (octal & 00002) mode |= S_IWOTH;
if (octal & 00001) mode |= S_IXOTH;
return mode;
}
next:
/* first, determine which bits we will be modifying */
for(who = 0; *p; p++) {
switch(*p) {
for (who = 0; *p; p++) {
switch (*p) {
/* masks */
case 'u':
who |= S_IRWXU|S_ISUID;
@@ -61,14 +62,14 @@ next:
}
break;
}
if(who) {
if (who) {
clear = who;
} else {
clear = S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO;
who = ~mask;
}
while(*p) {
switch(*p) {
while (*p) {
switch (*p) {
/* opers */
case '=':
case '+':
@@ -81,42 +82,42 @@ next:
}
perm = 0;
switch(*++p) {
switch (*++p) {
/* copy */
case 'u':
if(mode & S_IRUSR)
if (mode & S_IRUSR)
perm |= S_IRUSR|S_IRGRP|S_IROTH;
if(mode & S_IWUSR)
if (mode & S_IWUSR)
perm |= S_IWUSR|S_IWGRP|S_IWOTH;
if(mode & S_IXUSR)
if (mode & S_IXUSR)
perm |= S_IXUSR|S_IXGRP|S_IXOTH;
if(mode & S_ISUID)
if (mode & S_ISUID)
perm |= S_ISUID|S_ISGID;
p++;
break;
case 'g':
if(mode & S_IRGRP)
if (mode & S_IRGRP)
perm |= S_IRUSR|S_IRGRP|S_IROTH;
if(mode & S_IWGRP)
if (mode & S_IWGRP)
perm |= S_IWUSR|S_IWGRP|S_IWOTH;
if(mode & S_IXGRP)
if (mode & S_IXGRP)
perm |= S_IXUSR|S_IXGRP|S_IXOTH;
if(mode & S_ISGID)
if (mode & S_ISGID)
perm |= S_ISUID|S_ISGID;
p++;
break;
case 'o':
if(mode & S_IROTH)
if (mode & S_IROTH)
perm |= S_IRUSR|S_IRGRP|S_IROTH;
if(mode & S_IWOTH)
if (mode & S_IWOTH)
perm |= S_IWUSR|S_IWGRP|S_IWOTH;
if(mode & S_IXOTH)
if (mode & S_IXOTH)
perm |= S_IXUSR|S_IXGRP|S_IXOTH;
p++;
break;
default:
for(; *p; p++) {
switch(*p) {
for (; *p; p++) {
switch (*p) {
/* modes */
case 'r':
perm |= S_IRUSR|S_IRGRP|S_IROTH;
@@ -141,7 +142,7 @@ next:
apply:
/* apply */
switch(op) {
switch (op) {
case '=':
mode &= ~clear;
/* fallthrough */
@@ -153,7 +154,7 @@ next:
break;
}
/* if we hit a comma, move on to the next clause */
if(*p == ',') {
if (*p == ',') {
p++;
goto next;
}