diff options
| -rw-r--r-- | archival/unzip.c | 4 | ||||
| -rw-r--r-- | libbb/make_directory.c | 16 |
2 files changed, 13 insertions, 7 deletions
diff --git a/archival/unzip.c b/archival/unzip.c index 653fdd10f..da4b2a544 100644 --- a/archival/unzip.c +++ b/archival/unzip.c @@ -336,7 +336,9 @@ static void unzip_create_leading_dirs(const char *fn) { /* Create all leading directories */ char *name = xstrdup(fn); - if (bb_make_directory(dirname(name), 0777, FILEUTILS_RECUR)) { + + /* mode of -1: set mode according to umask */ + if (bb_make_directory(dirname(name), -1, FILEUTILS_RECUR)) { xfunc_die(); /* bb_make_directory is noisy */ } free(name); diff --git a/libbb/make_directory.c b/libbb/make_directory.c index b9916d165..64736efbe 100644 --- a/libbb/make_directory.c +++ b/libbb/make_directory.c @@ -92,6 +92,7 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags) } } + //bb_error_msg("mkdir '%s'", path); if (mkdir(path, 0777) < 0) { /* If we failed for any other reason than the directory * already exists, output a diagnostic and return -1 */ @@ -118,13 +119,16 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags) /* Done. If necessary, update perms on the newly * created directory. Failure to update here _is_ * an error. */ - if ((mode != -1) && (chmod(path, mode) < 0)) { - fail_msg = "set permissions of"; - if (flags & FILEUTILS_IGNORE_CHMOD_ERR) { - flags = 0; - goto print_err; + if (mode != -1) { + //bb_error_msg("chmod 0%03lo mkdir '%s'", mode, path); + if (chmod(path, mode) < 0)) { + fail_msg = "set permissions of"; + if (flags & FILEUTILS_IGNORE_CHMOD_ERR) { + flags = 0; + goto print_err; + } + break; } - break; } goto ret0; } |