make parsemode() generic

use for uudecode and chmod

Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
This commit is contained in:
Hiltjo Posthuma
2014-04-09 15:17:20 +02:00
committed by sin
parent ff474a8cbc
commit 560340341f
5 changed files with 84 additions and 104 deletions

75
chmod.c
View File

@@ -7,10 +7,9 @@
#include "util.h"
static void chmodr(const char *);
static void parsemode(const char *);
static bool rflag = false;
static char oper = '=';
static int oper = '=';
static mode_t mode = 0;
static void
@@ -46,7 +45,7 @@ main(int argc, char *argv[])
}
done:
parsemode(argv[0]);
parsemode(argv[0], &mode, &oper);
argv++;
argc--;
@@ -82,73 +81,3 @@ chmodr(const char *path)
if(rflag)
recurse(path, chmodr);
}
void
parsemode(const char *str)
{
char *end;
const char *p;
int octal;
mode_t mask = 0;
octal = strtol(str, &end, 8);
if(*end == '\0') {
if( octal < 0 || octal > 07777) eprintf("invalid mode\n");
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;
}
for(p = str; *p; p++)
switch(*p) {
/* masks */
case 'u':
mask |= S_IRWXU;
break;
case 'g':
mask |= S_IRWXG;
break;
case 'o':
mask |= S_IRWXO;
break;
case 'a':
mask |= S_IRWXU|S_IRWXG|S_IRWXO;
break;
/* opers */
case '+':
case '-':
case '=':
oper = *p;
break;
/* modes */
case 'r':
mode |= S_IRUSR|S_IRGRP|S_IROTH;
break;
case 'w':
mode |= S_IWUSR|S_IWGRP|S_IWOTH;
break;
case 'x':
mode |= S_IXUSR|S_IXGRP|S_IXOTH;
break;
case 's':
mode |= S_ISUID|S_ISGID;
break;
case 't':
mode |= S_ISVTX;
break;
/* error */
default:
eprintf("%s: invalid mode\n", str);
}
if(mask)
mode &= mask;
}