emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unzip: ignore chmod errors

Browse Source 
This makes unzip to FAT filesystems not exit with error.
This is similar to how the "normal" unzip works.

Signed-off-by: Natanael Copa <natanael.copa@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Natanael Copa 2012-05-22 17:11:46 +02:00 committed by Denys Vlasenko
parent dfc2473b9e
commit 02112d8ae3
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archival/unzip.c
View File

@ -596,7 +596,7 @@ int unzip_main(int argc, char **argv)
printf(" creating: %s\n", dst_fn); printf(" creating: %s\n", dst_fn);
} }
unzip_create_leading_dirs(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(); xfunc_die();
} }
} else { } else {

1
include/libbb.h
View File

@ -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_PRESERVE_SECURITY_CONTEXT = 1 << 9, /* -c */
FILEUTILS_SET_SECURITY_CONTEXT = 1 << 10, FILEUTILS_SET_SECURITY_CONTEXT = 1 << 10,
#endif #endif
FILEUTILS_IGNORE_CHMOD_ERR = 1 << 11,
}; };
#define FILEUTILS_CP_OPTSTR "pdRfilsLH" IF_SELINUX("c") #define FILEUTILS_CP_OPTSTR "pdRfilsLH" IF_SELINUX("c")
extern int remove_file(const char *path, int flags) FAST_FUNC; extern int remove_file(const char *path, int flags) FAST_FUNC;

7
libbb/make_directory.c
View File

@ -107,6 +107,10 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
* an error. */ * an error. */
if ((mode != -1) && (chmod(path, mode) < 0)) { if ((mode != -1) && (chmod(path, mode) < 0)) {
fail_msg = "set permissions of"; fail_msg = "set permissions of";
if (flags & FILEUTILS_IGNORE_CHMOD_ERR) {
flags = 0;
goto print_err;
}
break; break;
} }
goto ret0; goto ret0;
@ -116,8 +120,9 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
*s = c; *s = c;
} /* while (1) */ } /* while (1) */
bb_perror_msg("can't %s directory '%s'", fail_msg, path);
flags = -1; flags = -1;
print_err:
bb_perror_msg("can't %s directory '%s'", fail_msg, path);
goto ret; goto ret;
ret0: ret0:
flags = 0; flags = 0;