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

libutil/mode: Remove unnecessary octal-to-mode conversion

Browse Source 
The values of the file mode macros are specified explicitly by POSIX,
so we can just use the octal value directly.
This commit is contained in:
Michael Forney 2019-11-01 19:07:10 -07:00
parent b29fc0b05f
commit c5c8c7ff86
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libutil/mode.c
View File

@ -26,20 +26,7 @@ parsemode(const char *str, mode_t mode, mode_t mask)
if (*end == '\0') { if (*end == '\0') {
if (octal < 0 || octal > 07777) if (octal < 0 || octal > 07777)
eprintf("%s: invalid mode\n", str); eprintf("%s: invalid mode\n", str);
mode = 0; return octal;
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: next:
/* first, determine which bits we will be modifying */ /* first, determine which bits we will be modifying */