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>

diff --git a/archival/unzip.c b/archival/unzip.c
index 3c76cdafcf624d6da32131f73ac66a829750e6ea..c1b945a4444001fa99f8f5884c3b154ac23c2c96 100644 (file)
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -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 {

diff --git a/include/libbb.h b/include/libbb.h
index f12800f5340eb5093ca7c6f47ff2fba16e5c813d..5e5c8c7e89bfd9a13991fa47cb938929cecd1b03 100644 (file)
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -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;

diff --git a/libbb/make_directory.c b/libbb/make_directory.c
index 72303e7a30e8abf48be39a9f503aee42573dd162..7826b90f5f0ae67160f137d1476ef9cd328136ca 100644 (file)
--- 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;