Merge branch 'busybox' into merge

5 files changed, 99 insertions, 47 deletions

diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index f77ac8383..9d1cd9485 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -132,7 +132,10 @@ int FAST_FUNC bbunpack(char **argv,
 
                 if (filename) {
                         char *del = new_name;
+
                         if (status >= 0) {
+                                unsigned new_name_len;
+
                                 /* TODO: restore other things? */
                                 if (aux.mtime != 0) {
                                         struct timeval times[2];
@@ -146,24 +149,31 @@ int FAST_FUNC bbunpack(char **argv,
                                         utimes(new_name, times); /* ignoring errors */
                                 }
 
-                                /* Delete _compressed_ file */
+                                if (ENABLE_DESKTOP)
+                                        new_name_len = strlen(new_name);
+                                /* Restore source filename (unless tgz -> tar case) */
+                                if (new_name == filename) {
+                                        new_name_len = strlen(filename);
+                                        filename[new_name_len] = '.';
+                                }
+                                /* Extreme bloat for gunzip compat */
+                                /* Some users do want this info... */
+                                if (ENABLE_DESKTOP && (option_mask32 & OPT_VERBOSE)) {
+                                        unsigned percent = status
+                                                ? ((uoff_t)stat_buf.st_size * 100u / (unsigned long long)status)
+                                                : 0;
+                                        fprintf(stderr, "%s: %u%% - replaced with %.*s\n",
+                                                filename,
+                                                100u - percent,
+                                                new_name_len, new_name
+                                        );
+                                }
+                                /* Delete _source_ file */
                                 del = filename;
-                                /* restore extension (unless tgz -> tar case) */
-                                if (new_name == filename)
-                                        filename[strlen(filename)] = '.';
                         }
                         if (ENABLE_PLATFORM_MINGW32)
                                 xclose(STDIN_FILENO);
                         xunlink(del);
-
-#if 0 /* Currently buggy - wrong name: "a.gz: 261% - replaced with a.gz" */
-                        /* Extreme bloat for gunzip compat */
-                        if (ENABLE_DESKTOP && (option_mask32 & OPT_VERBOSE) && status >= 0) {
-                                fprintf(stderr, "%s: %u%% - replaced with %s\n",
-                                        filename, (unsigned)(stat_buf.st_size*100 / (status+1)), new_name);
-                        }
-#endif
-
  free_name:
                         if (new_name != filename)
                                 free(new_name);
diff --git a/archival/libarchive/Kbuild.src b/archival/libarchive/Kbuild.src
index 58457fc22..968fdf8ab 100644
--- a/archival/libarchive/Kbuild.src
+++ b/archival/libarchive/Kbuild.src
@@ -38,31 +38,45 @@ DPKG_FILES:= \
 
 INSERT
 
-lib-$(CONFIG_AR)                        += get_header_ar.o unpack_ar_archive.o
-lib-$(CONFIG_BUNZIP2)                   += decompress_bunzip2.o
-lib-$(CONFIG_UNLZMA)                    += decompress_unlzma.o
-lib-$(CONFIG_UNXZ)                      += decompress_unxz.o
-lib-$(CONFIG_CPIO)                      += get_header_cpio.o
 lib-$(CONFIG_DPKG)                      += $(DPKG_FILES)
 lib-$(CONFIG_DPKG_DEB)                  += $(DPKG_FILES)
-lib-$(CONFIG_GUNZIP)                    += open_transformer.o decompress_gunzip.o
-lib-$(CONFIG_RPM2CPIO)                  += decompress_gunzip.o get_header_cpio.o
-lib-$(CONFIG_RPM)                       += open_transformer.o decompress_gunzip.o get_header_cpio.o
+
+lib-$(CONFIG_AR)                        += get_header_ar.o unpack_ar_archive.o
+lib-$(CONFIG_CPIO)                      += get_header_cpio.o
 lib-$(CONFIG_TAR)                       += get_header_tar.o
-lib-$(CONFIG_UNCOMPRESS)                += decompress_uncompress.o
-lib-$(CONFIG_UNZIP)                     += decompress_gunzip.o
+lib-$(CONFIG_FEATURE_TAR_TO_COMMAND)    += data_extract_to_command.o
 lib-$(CONFIG_LZOP)                      += lzo1x_1.o lzo1x_1o.o lzo1x_d.o
 lib-$(CONFIG_LZOP_COMPR_HIGH)           += lzo1x_9x.o
+lib-$(CONFIG_BUNZIP2)                   += open_transformer.o decompress_bunzip2.o
+lib-$(CONFIG_UNLZMA)                    += open_transformer.o decompress_unlzma.o
+lib-$(CONFIG_UNXZ)                      += open_transformer.o decompress_unxz.o
+lib-$(CONFIG_GUNZIP)                    += open_transformer.o decompress_gunzip.o
+lib-$(CONFIG_UNCOMPRESS)                += open_transformer.o decompress_uncompress.o
+lib-$(CONFIG_UNZIP)                     += open_transformer.o decompress_gunzip.o
+lib-$(CONFIG_RPM2CPIO)                  += open_transformer.o decompress_gunzip.o get_header_cpio.o
+lib-$(CONFIG_RPM)                       += open_transformer.o decompress_gunzip.o get_header_cpio.o
+
+lib-$(CONFIG_GZIP)                      += open_transformer.o
+lib-$(CONFIG_BZIP2)                     += open_transformer.o
+lib-$(CONFIG_LZOP)                      += open_transformer.o
+lib-$(CONFIG_MAN)                       += open_transformer.o
+lib-$(CONFIG_SETFONT)                   += open_transformer.o
+lib-$(CONFIG_FEATURE_2_4_MODULES)       += open_transformer.o
 lib-$(CONFIG_MODINFO)                   += open_transformer.o
 lib-$(CONFIG_INSMOD)                    += open_transformer.o
+lib-$(CONFIG_DEPMOD)                    += open_transformer.o
+lib-$(CONFIG_RMMOD)                     += open_transformer.o
+lib-$(CONFIG_LSMOD)                     += open_transformer.o
+lib-$(CONFIG_MODPROBE)                  += open_transformer.o
+lib-$(CONFIG_MODPROBE_SMALL)            += open_transformer.o
+
 lib-$(CONFIG_FEATURE_SEAMLESS_Z)        += open_transformer.o decompress_uncompress.o
 lib-$(CONFIG_FEATURE_SEAMLESS_GZ)       += open_transformer.o decompress_gunzip.o
 lib-$(CONFIG_FEATURE_SEAMLESS_BZ2)      += open_transformer.o decompress_bunzip2.o
 lib-$(CONFIG_FEATURE_SEAMLESS_LZMA)     += open_transformer.o decompress_unlzma.o
 lib-$(CONFIG_FEATURE_SEAMLESS_XZ)       += open_transformer.o decompress_unxz.o
 lib-$(CONFIG_FEATURE_COMPRESS_USAGE)    += open_transformer.o decompress_bunzip2.o
-lib-$(CONFIG_FEATURE_COMPRESS_BBCONFIG) += decompress_bunzip2.o
-lib-$(CONFIG_FEATURE_TAR_TO_COMMAND)    += data_extract_to_command.o
+lib-$(CONFIG_FEATURE_COMPRESS_BBCONFIG) += open_transformer.o decompress_bunzip2.o
 
 ifneq ($(lib-y),)
 lib-y += $(COMMON_FILES)
diff --git a/archival/libarchive/data_extract_to_command.c b/archival/libarchive/data_extract_to_command.c
index a2ce33b51..5b32c2ec8 100644
--- a/archival/libarchive/data_extract_to_command.c
+++ b/archival/libarchive/data_extract_to_command.c
@@ -103,7 +103,7 @@ void FAST_FUNC data_extract_to_command(archive_handle_t *archive_handle)
                                 archive_handle->tar__to_command_shell,
                                 "-c",
                                 archive_handle->tar__to_command,
-                                NULL);
+                                (char *)0);
                         bb_perror_msg_and_die("can't execute '%s'", archive_handle->tar__to_command_shell);
                 }
                 close(p[0]);
diff --git a/archival/tar.c b/archival/tar.c
index 648d1256d..3129781d2 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -569,7 +569,7 @@ static void NOINLINE vfork_compressor(int tar_fd, int gzip)
                 xmove_fd(gzipDataPipe.rd, 0);
                 xmove_fd(tar_fd, 1);
                 /* exec gzip/bzip2 program/applet */
-                BB_EXECLP(zip_exec, zip_exec, "-f", NULL);
+                BB_EXECLP(zip_exec, zip_exec, "-f", (char *)0);
                 vfork_exec_errno = errno;
                 _exit(EXIT_FAILURE);
         }
@@ -681,14 +681,12 @@ static llist_t *append_file_list_to_list(llist_t *list)
                         char *cp = last_char_is(line, '/');
                         if (cp > line)
                                 *cp = '\0';
-                        llist_add_to(&newlist, line);
+                        llist_add_to_end(&newlist, line);
                 }
                 fclose(src_stream);
         }
         return newlist;
 }
-#else
-# define append_file_list_to_list(x) 0
 #endif
 
 //usage:#define tar_trivial_usage
diff --git a/archival/unzip.c b/archival/unzip.c
index e4c824850..673e5fe08 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -163,7 +163,17 @@ enum { zip_fd = 3 };
 
 #if ENABLE_DESKTOP
 
-#define PEEK_FROM_END 16384
+/* Seen in the wild:
+ * Self-extracting PRO2K3XP_32.exe contains 19078464 byte zip archive,
+ * where CDE was nearly 48 kbytes before EOF.
+ * (Surprisingly, it also apparently has *another* CDE structure
+ * closer to the end, with bogus cdf_offset).
+ * To make extraction work, bumped PEEK_FROM_END from 16k to 64k.
+ */
+#define PEEK_FROM_END (64*1024)
+
+/* This value means that we failed to find CDF */
+#define BAD_CDF_OFFSET ((uint32_t)0xffffffff)
 
 /* NB: does not preserve file position! */
 static uint32_t find_cdf_offset(void)
@@ -180,6 +190,7 @@ static uint32_t find_cdf_offset(void)
         xlseek(zip_fd, end, SEEK_SET);
         full_read(zip_fd, buf, PEEK_FROM_END);
 
+        cde_header.formatted.cdf_offset = BAD_CDF_OFFSET;
         p = buf;
         while (p <= buf + PEEK_FROM_END - CDE_HEADER_LEN - 4) {
                 if (*p != 'P') {
@@ -195,11 +206,17 @@ static uint32_t find_cdf_offset(void)
                 /* we found CDE! */
                 memcpy(cde_header.raw, p + 1, CDE_HEADER_LEN);
                 FIX_ENDIANNESS_CDE(cde_header);
-                free(buf);
-                return cde_header.formatted.cdf_offset;
+                /*
+                 * I've seen .ZIP files with seemingly valid CDEs
+                 * where cdf_offset points past EOF - ??
+                 * Ignore such CDEs:
+                 */
+                if (cde_header.formatted.cdf_offset < end + (p - buf))
+                        break;
+                cde_header.formatted.cdf_offset = BAD_CDF_OFFSET;
         }
-        //free(buf);
-        bb_error_msg_and_die("can't find file table");
+        free(buf);
+        return cde_header.formatted.cdf_offset;
 };
 
 static uint32_t read_next_cdf(uint32_t cdf_offset, cdf_header_t *cdf_ptr)
@@ -211,13 +228,15 @@ static uint32_t read_next_cdf(uint32_t cdf_offset, cdf_header_t *cdf_ptr)
         if (!cdf_offset)
                 cdf_offset = find_cdf_offset();
 
-        xlseek(zip_fd, cdf_offset + 4, SEEK_SET);
-        xread(zip_fd, cdf_ptr->raw, CDF_HEADER_LEN);
-        FIX_ENDIANNESS_CDF(*cdf_ptr);
-        cdf_offset += 4 + CDF_HEADER_LEN
-                + cdf_ptr->formatted.file_name_length
-                + cdf_ptr->formatted.extra_field_length
-                + cdf_ptr->formatted.file_comment_length;
+        if (cdf_offset != BAD_CDF_OFFSET) {
+                xlseek(zip_fd, cdf_offset + 4, SEEK_SET);
+                xread(zip_fd, cdf_ptr->raw, CDF_HEADER_LEN);
+                FIX_ENDIANNESS_CDF(*cdf_ptr);
+                cdf_offset += 4 + CDF_HEADER_LEN
+                        + cdf_ptr->formatted.file_name_length
+                        + cdf_ptr->formatted.extra_field_length
+                        + cdf_ptr->formatted.file_comment_length;
+        }
 
         xlseek(zip_fd, org, SEEK_SET);
         return cdf_offset;
@@ -226,8 +245,9 @@ static uint32_t read_next_cdf(uint32_t cdf_offset, cdf_header_t *cdf_ptr)
 
 static void unzip_skip(off_t skip)
 {
-        if (lseek(zip_fd, skip, SEEK_CUR) == (off_t)-1)
-                bb_copyfd_exact_size(zip_fd, -1, skip);
+        if (skip != 0)
+                if (lseek(zip_fd, skip, SEEK_CUR) == (off_t)-1)
+                        bb_copyfd_exact_size(zip_fd, -1, skip);
 }
 
 static void unzip_create_leading_dirs(const char *fn)
@@ -528,21 +548,31 @@ int unzip_main(int argc, char **argv)
                         bb_error_msg_and_die("zip flag 1 (encryption) is not supported");
                 }
 
-                {
+                if (cdf_offset != BAD_CDF_OFFSET) {
                         cdf_header_t cdf_header;
                         cdf_offset = read_next_cdf(cdf_offset, &cdf_header);
+                        /*
+                         * Note: cdf_offset can become BAD_CDF_OFFSET after the above call.
+                         */
                         if (zip_header.formatted.zip_flags & SWAP_LE16(0x0008)) {
                                 /* 0x0008 - streaming. [u]cmpsize can be reliably gotten
-                                 * only from Central Directory. See unzip_doc.txt */
+                                 * only from Central Directory. See unzip_doc.txt
+                                 */
                                 zip_header.formatted.crc32    = cdf_header.formatted.crc32;
                                 zip_header.formatted.cmpsize  = cdf_header.formatted.cmpsize;
                                 zip_header.formatted.ucmpsize = cdf_header.formatted.ucmpsize;
                         }
                         if ((cdf_header.formatted.version_made_by >> 8) == 3) {
-                                /* this archive is created on Unix */
+                                /* This archive is created on Unix */
                                 dir_mode = file_mode = (cdf_header.formatted.external_file_attributes >> 16);
                         }
                 }
+                if (cdf_offset == BAD_CDF_OFFSET
+                 && (zip_header.formatted.zip_flags & SWAP_LE16(0x0008))
+                ) {
+                        /* If it's a streaming zip, we _require_ CDF */
+                        bb_error_msg_and_die("can't find file table");
+                }
 #endif
 
                 /* Read filename */