summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorNatanael Copa2012-05-22 17:11:46 +0200
committerDenys Vlasenko2012-05-28 01:29:15 +0200
commit02112d8ae3d0c07214fb2b132e0eacb4ff39d167 (patch)
tree8cc41e1af5cdea68c393190b27f902f3a0a195fd /libbb
parentdfc2473b9ed88039697ac89ee2a4301cdaefcf84 (diff)
downloadbusybox-02112d8ae3d0c07214fb2b132e0eacb4ff39d167.zip
busybox-02112d8ae3d0c07214fb2b132e0eacb4ff39d167.tar.gz
unzip: ignore chmod errors
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>
Diffstat (limited to 'libbb')
-rw-r--r--libbb/make_directory.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libbb/make_directory.c b/libbb/make_directory.c
index 72303e7..7826b90 100644
--- a/libbb/make_directory.c
+++ b/libbb/make_directory.c
@@ -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;