02112d8ae
Natanael Copa
2012-05-28
Subject
unzip: ignore chmod errors
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
archival/unzip.c+1 -1
| @@ -596,7 +596,7 @@ int unzip_main(int argc, char **argv) | |
| printf(" creating: %s\n", dst_fn); | |
| } | |
| unzip_create_leading_dirs(dst_fn); | |
| - | if (bb_make_directory(dst_fn, dir_mode, 0)) { |
| + | if (bb_make_directory(dst_fn, dir_mode, FILEUTILS_IGNORE_CHMOD_ERR)) { |
| xfunc_die(); | |
| } | |
| } else { | |
include/libbb.h+1 -0
| @@ -333,6 +333,7 @@ enum { /* DO NOT CHANGE THESE VALUES! cp.c, mv.c, install.c depend on them. */ | |
| FILEUTILS_PRESERVE_SECURITY_CONTEXT = 1 << 9, /* -c */ | |
| FILEUTILS_SET_SECURITY_CONTEXT = 1 << 10, | |
| #endif | |
| + | FILEUTILS_IGNORE_CHMOD_ERR = 1 << 11, |
| }; | |
| #define FILEUTILS_CP_OPTSTR "pdRfilsLH" IF_SELINUX("c") | |
| extern int remove_file(const char *path, int flags) FAST_FUNC; | |
libbb/make_directory.c+6 -1
| @@ -107,6 +107,10 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags) | |
| * 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; |
| + | } |
| break; | |
| } | |
| goto ret0; | |
| @@ -116,8 +120,9 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags) | |
| *s = c; | |
| } /* while (1) */ | |
| - | bb_perror_msg("can't %s directory '%s'", fail_msg, path); |
| flags = -1; | |
| + | print_err: |
| + | bb_perror_msg("can't %s directory '%s'", fail_msg, path); |
| goto ret; | |
| ret0: | |
| flags = 0; | |