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

mkdir: Fix created directory permissions

Browse Source 
Previously, with -p, the specified directory and all of its parents
would be 0777&~filemask (regardless of the -m flag). POSIX says parent
directories must created as (0300|~filemask)&0777, and of course if -m
is set, the specified directory should be created with those
permissions.

Additionally, POSIX says that for symbolic_mode strings, + and - should
be interpretted relative to a default mode of 0777 (not 0).

Without -p, previously the directory would be created first with
0777&~filemask (before a chmod), but POSIX says that the directory shall
at no point in time have permissions less restrictive than the -m mode
argument.

Rather than dealing with mkdir removing the filemask bits by calling
chmod afterward, just clear the umask and remove the bits manually.
This commit is contained in:
Michael Forney
2016-12-14 19:40:06 -08:00
committed by Anselm R Garbe
parent 6ac5f01cc9
commit 529e50a7ad
4 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mkdir.c
View File

@@ -15,17 +15,18 @@ usage(void)
int
main(int argc, char *argv[])
{
mode_t mode = 0, mask;
int pflag = 0, mflag = 0, ret = 0;
mode_t mode, mask;
int pflag = 0, ret = 0;
mask = umask(0);
mode = 0777 & ~mask;
ARGBEGIN {
case 'p':
pflag = 1;
break;
case 'm':
mflag = 1;
mask = getumask();
mode = parsemode(EARGF(usage()), mode, mask);
mode = parsemode(EARGF(usage()), 0777, mask);
break;
default:
usage();
@@ -36,16 +37,12 @@ main(int argc, char *argv[])
for (; *argv; argc--, argv++) {
if (pflag) {
if (mkdirp(*argv) < 0)
if (mkdirp(*argv, mode, 0777 & (~mask | 0300)) < 0)
ret = 1;
} else if (mkdir(*argv, S_IRWXU | S_IRWXG | S_IRWXO) < 0) {
} else if (mkdir(*argv, mode) < 0) {
weprintf("mkdir %s:", *argv);
ret = 1;
}
if (mflag && chmod(*argv, mode) < 0) {
weprintf("chmod %s:", *argv);
ret = 1;
}
}
return ret;