Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/archival/unzip.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/archival/unzip.c (modified) (10 diffs)

branches/3.2/mindi-busybox/archival/unzip.c

@@ -20 +20 @@
  */
 
+//usage:#define unzip_trivial_usage
+//usage:       "[-lnopq] FILE[.zip] [FILE]... [-x FILE...] [-d DIR]"
+//usage:#define unzip_full_usage "\n\n"
+//usage:       "Extract FILEs from ZIP archive\n"
+//usage:     "\n    -l  List contents (with -q for short form)"
+//usage:     "\n    -n  Never overwrite files (default: ask)"
+//usage:     "\n    -o  Overwrite"
+//usage:     "\n    -p  Print to stdout"
+//usage:     "\n    -q  Quiet"
+//usage:     "\n    -x FILE Exclude FILEs"
+//usage:     "\n    -d DIR  Extract into DIR"
+
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 enum {
@@ -224 +236 @@
     char *name = xstrdup(fn);
     if (bb_make_directory(dirname(name), 0777, FILEUTILS_RECUR)) {
-        bb_error_msg_and_die("exiting"); /* bb_make_directory is noisy */
+        xfunc_die(); /* bb_make_directory is noisy */
     }
     free(name);
@@ -238 +250 @@
     } else {
         /* Method 8 - inflate */
-        inflate_unzip_result res;
-        if (inflate_unzip(&res, zip_header->formatted.cmpsize, zip_fd, dst_fd) < 0)
+        transformer_aux_data_t aux;
+        init_transformer_aux_data(&aux);
+        aux.bytes_in = zip_header->formatted.cmpsize;
+        if (inflate_unzip(&aux, zip_fd, dst_fd) < 0)
             bb_error_msg_and_die("inflate error");
         /* Validate decompression - crc */
-        if (zip_header->formatted.crc32 != (res.crc ^ 0xffffffffL)) {
+        if (zip_header->formatted.crc32 != (aux.crc32 ^ 0xffffffffL)) {
             bb_error_msg_and_die("crc error");
         }
         /* Validate decompression - size */
-        if (zip_header->formatted.ucmpsize != res.bytes_out) {
+        if (zip_header->formatted.ucmpsize != aux.bytes_out) {
             /* Don't die. Who knows, maybe len calculation
              * was botched somewhere. After all, crc matched! */
@@ -264 +278 @@
     smallint listing = 0;
     smallint overwrite = O_PROMPT;
+    smallint x_opt_seen;
 #if ENABLE_DESKTOP
     uint32_t cdf_offset;
@@ -277 +292 @@
     char *base_dir = NULL;
     int i, opt;
-    int opt_range = 0;
     char key_buf[80];
     struct stat stat_buf;
@@ -322 +336 @@
  */
 
+    x_opt_seen = 0;
     /* '-' makes getopt return 1 for non-options */
     while ((opt = getopt(argc, argv, "-d:lnopqxv")) != -1) {
-        switch (opt_range) {
-        case 0: /* Options */
-            switch (opt) {
-            case 'l': /* List */
-                listing = 1;
-                break;
-
-            case 'n': /* Never overwrite existing files */
-                overwrite = O_NEVER;
-                break;
-
-            case 'o': /* Always overwrite existing files */
-                overwrite = O_ALWAYS;
-                break;
-
-            case 'p': /* Extract files to stdout and fall through to set verbosity */
-                dst_fd = STDOUT_FILENO;
-
-            case 'q': /* Be quiet */
-                quiet++;
-                break;
-
-            case 'v': /* Verbose list */
-                IF_DESKTOP(verbose++;)
-                listing = 1;
-                break;
-
-            case 1: /* The zip file */
+        switch (opt) {
+        case 'd':  /* Extract to base directory */
+            base_dir = optarg;
+            break;
+
+        case 'l': /* List */
+            listing = 1;
+            break;
+
+        case 'n': /* Never overwrite existing files */
+            overwrite = O_NEVER;
+            break;
+
+        case 'o': /* Always overwrite existing files */
+            overwrite = O_ALWAYS;
+            break;
+
+        case 'p': /* Extract files to stdout and fall through to set verbosity */
+            dst_fd = STDOUT_FILENO;
+
+        case 'q': /* Be quiet */
+            quiet++;
+            break;
+
+        case 'v': /* Verbose list */
+            IF_DESKTOP(verbose++;)
+            listing = 1;
+            break;
+
+        case 'x':
+            x_opt_seen = 1;
+            break;
+
+        case 1:
+            if (!src_fn) {
+                /* The zip file */
                 /* +5: space for ".zip" and NUL */
                 src_fn = xmalloc(strlen(optarg) + 5);
                 strcpy(src_fn, optarg);
-                opt_range++;
-                break;
-
-            default:
-                bb_show_usage();
+            } else if (!x_opt_seen) {
+                /* Include files */
+                llist_add_to(&zaccept, optarg);
+            } else {
+                /* Exclude files */
+                llist_add_to(&zreject, optarg);
             }
             break;
-
-        case 1: /* Include files */
-            if (opt == 1) {
-                llist_add_to(&zaccept, optarg);
-                break;
-            }
-            if (opt == 'd') {
-                base_dir = optarg;
-                opt_range += 2;
-                break;
-            }
-            if (opt == 'x') {
-                opt_range++;
-                break;
-            }
-            bb_show_usage();
-
-        case 2 : /* Exclude files */
-            if (opt == 1) {
-                llist_add_to(&zreject, optarg);
-                break;
-            }
-            if (opt == 'd') { /* Extract to base directory */
-                base_dir = optarg;
-                opt_range++;
-                break;
-            }
-            /* fall through */
 
         default:
@@ -396 +392 @@
     }
 
-    if (src_fn == NULL) {
+#ifndef __GLIBC__
+    /*
+     * This code is needed for non-GNU getopt
+     * which doesn't understand "-" in option string.
+     * The -x option won't work properly in this case:
+     * "unzip a.zip q -x w e" will be interpreted as
+     * "unzip a.zip q w e -x" = "unzip a.zip q w e"
+     */
+    argv += optind;
+    if (argv[0]) {
+        /* +5: space for ".zip" and NUL */
+        src_fn = xmalloc(strlen(argv[0]) + 5);
+        strcpy(src_fn, argv[0]);
+        while (*++argv)
+            llist_add_to(&zaccept, *argv);
+    }
+#endif
+
+    if (!src_fn) {
         bb_show_usage();
     }
@@ -407 +421 @@
             overwrite = O_NEVER;
     } else {
-        static const char extn[][5] = {"", ".zip", ".ZIP"};
-        int orig_src_fn_len = strlen(src_fn);
-        int src_fd = -1;
-
-        for (i = 0; (i < 3) && (src_fd == -1); i++) {
-            strcpy(src_fn + orig_src_fn_len, extn[i]);
+        static const char extn[][5] = { ".zip", ".ZIP" };
+        char *ext = src_fn + strlen(src_fn);
+        int src_fd;
+
+        i = 0;
+        for (;;) {
             src_fd = open(src_fn, O_RDONLY);
-        }
-        if (src_fd == -1) {
-            src_fn[orig_src_fn_len] = '\0';
-            bb_error_msg_and_die("can't open %s, %s.zip, %s.ZIP", src_fn, src_fn, src_fn);
+            if (src_fd >= 0)
+                break;
+            if (++i > 2) {
+                *ext = '\0';
+                bb_error_msg_and_die("can't open %s[.zip]", src_fn);
+            }
+            strcpy(ext, extn[i - 1]);
         }
         xmove_fd(src_fd, zip_fd);
@@ -583 +600 @@
                     }
                     unzip_create_leading_dirs(dst_fn);
-                    if (bb_make_directory(dst_fn, dir_mode, 0)) {
-                        bb_error_msg_and_die("exiting");
+                    if (bb_make_directory(dst_fn, dir_mode, FILEUTILS_IGNORE_CHMOD_ERR)) {
+                        xfunc_die();
                     }
                 } else {
@@ -608 +625 @@
                         } else {
                             printf("replace %s? [y]es, [n]o, [A]ll, [N]one, [r]ename: ", dst_fn);
+                            fflush_all();
                             if (!fgets(key_buf, sizeof(key_buf), stdin)) {
                                 bb_perror_msg_and_die("can't read input");