Merge branch 'busybox' into mergeFRP

3 files changed, 86 insertions, 21 deletions

diff --git a/archival/gzip.c b/archival/gzip.c
index bc1f9c60b..42b2f0b2e 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -62,14 +62,27 @@ aa:      85.1% -- replaced with aa.gz
 //config:         1: larger buffers, larger hash-tables
 //config:         2: larger buffers, largest hash-tables
 //config:         Larger models may give slightly better compression
+//config:
+//config:config FEATURE_GZIP_LEVELS
+//config:       bool "Enable compression levels"
+//config:       default n
+//config:       depends on GZIP
+//config:       help
+//config:         Enable support for compression levels 4-9. The default level
+//config:         is 6. If levels 1-3 are specified, 4 is used.
+//config:         If this option is not selected, -N options are ignored and -9
+//config:         is used.
 
 //applet:IF_GZIP(APPLET(gzip, BB_DIR_BIN, BB_SUID_DROP))
 //kbuild:lib-$(CONFIG_GZIP) += gzip.o
 
 //usage:#define gzip_trivial_usage
-//usage:       "[-cfd] [FILE]..."
+//usage:       "[-cfd" IF_FEATURE_GZIP_LEVELS("123456789") "] [FILE]..."
 //usage:#define gzip_full_usage "\n\n"
 //usage:       "Compress FILEs (or stdin)\n"
+//usage:        IF_FEATURE_GZIP_LEVELS(
+//usage:     "\n        -1..9   Compression level"
+//usage:        )
 //usage:     "\n        -d      Decompress"
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
@@ -252,6 +265,8 @@ enum {
  * input file length plus MIN_LOOKAHEAD.
  */
 
+#ifndef ENABLE_FEATURE_GZIP_LEVELS
+
         max_chain_length = 4096,
 /* To speed up deflation, hash chains are never searched beyond this length.
  * A higher limit improves compression ratio but degrades the speed.
@@ -283,11 +298,23 @@ enum {
  * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
  * meaning.
  */
+#endif /* ENABLE_FEATURE_GZIP_LEVELS */
 };
 
 
 struct globals {
 
+#ifdef ENABLE_FEATURE_GZIP_LEVELS
+        unsigned max_chain_length;
+        unsigned max_lazy_match;
+        unsigned good_match;
+        unsigned nice_match;
+#define max_chain_length (G1.max_chain_length)
+#define max_lazy_match   (G1.max_lazy_match)
+#define good_match       (G1.good_match)
+#define nice_match       (G1.nice_match)
+#endif
+
         lng block_start;
 
 /* window position at the beginning of the current output block. Gets
@@ -2161,24 +2188,48 @@ int gzip_main(int argc UNUSED_PARAM, char **argv)
 #endif
 {
         unsigned opt;
+#ifdef ENABLE_FEATURE_GZIP_LEVELS
+        static const struct {
+                uint8_t good;
+                uint8_t chain_shift;
+                uint8_t lazy2;
+                uint8_t nice2;
+        } gzip_level_config[6] = {
+                {4,   4,   4/2,  16/2}, /* Level 4 */
+                {8,   5,  16/2,  32/2}, /* Level 5 */
+                {8,   7,  16/2, 128/2}, /* Level 6 */
+                {8,   8,  32/2, 128/2}, /* Level 7 */
+                {32, 10, 128/2, 258/2}, /* Level 8 */
+                {32, 12, 258/2, 258/2}, /* Level 9 */
+        };
+#endif
+
+        SET_PTR_TO_GLOBALS((char *)xzalloc(sizeof(struct globals)+sizeof(struct globals2))
+                        + sizeof(struct globals));
 
 #if ENABLE_FEATURE_GZIP_LONG_OPTIONS
         applet_long_options = gzip_longopts;
 #endif
         /* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */
-        opt = getopt32(argv, "cfv" IF_GUNZIP("dt") "q123456789n");
+        opt = getopt32(argv, "cfv" IF_GUNZIP("dt") "qn123456789");
 #if ENABLE_GUNZIP /* gunzip_main may not be visible... */
         if (opt & 0x18) // -d and/or -t
                 return gunzip_main(argc, argv);
 #endif
-        option_mask32 &= 0x7; /* ignore -q, -0..9 */
-        //if (opt & 0x1) // -c
-        //if (opt & 0x2) // -f
-        //if (opt & 0x4) // -v
-        argv += optind;
-
-        SET_PTR_TO_GLOBALS((char *)xzalloc(sizeof(struct globals)+sizeof(struct globals2))
-                        + sizeof(struct globals));
+#ifdef ENABLE_FEATURE_GZIP_LEVELS
+        opt >>= ENABLE_GUNZIP ? 7 : 5; /* drop cfv[dt]qn bits */
+        if (opt == 0)
+                opt = 1 << 6; /* default: 6 */
+        /* Map 1..3 to 4 */
+        if (opt & 0x7)
+                opt |= 1 << 4;
+        opt = ffs(opt >> 3);
+        max_chain_length = 1 << gzip_level_config[opt].chain_shift;
+        good_match       = gzip_level_config[opt].good;
+        max_lazy_match   = gzip_level_config[opt].lazy2 * 2;
+        nice_match       = gzip_level_config[opt].nice2 * 2;
+#endif
+        option_mask32 &= 0x7; /* retain only -cfv */
 
         /* Allocate all global buffers (for DYN_ALLOC option) */
         ALLOC(uch, G1.l_buf, INBUFSIZ);
@@ -2190,5 +2241,6 @@ int gzip_main(int argc UNUSED_PARAM, char **argv)
         /* Initialize the CRC32 table */
         global_crc32_table = crc32_filltable(NULL, 0);
 
+        argv += optind;
         return bbunpack(argv, pack_gzip, append_ext, "gz");
 }
diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index 2dbcdb50c..fb68673b9 100644
--- a/archival/libarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -350,7 +350,14 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
         case '6':
                 file_header->mode |= S_IFIFO;
                 goto size0;
+        case 'g':       /* pax global header */
+        case 'x': {     /* pax extended header */
+                if ((uoff_t)file_header->size > 0xfffff) /* paranoia */
+                        goto skip_ext_hdr;
+                process_pax_hdr(archive_handle, file_header->size, (tar.typeflag == 'g'));
+                goto again_after_align;
 #if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
+/* See http://www.gnu.org/software/tar/manual/html_node/Extensions.html */
         case 'L':
                 /* free: paranoia: tar with several consecutive longnames */
                 free(p_longname);
@@ -370,18 +377,17 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
                 archive_handle->offset += file_header->size;
                 /* return get_header_tar(archive_handle); */
                 goto again;
-        case 'D':       /* GNU dump dir */
-        case 'M':       /* Continuation of multi volume archive */
-        case 'N':       /* Old GNU for names > 100 characters */
-        case 'S':       /* Sparse file */
-        case 'V':       /* Volume header */
+/*
+ *      case 'S':       // Sparse file
+ * Was seen in the wild. Not supported (yet?).
+ * See https://www.gnu.org/software/tar/manual/html_section/tar_92.html
+ * for the format. (An "Old GNU Format" was seen, not PAX formats).
+ */
+//      case 'D':       /* GNU dump dir */
+//      case 'M':       /* Continuation of multi volume archive */
+//      case 'N':       /* Old GNU for names > 100 characters */
+//      case 'V':       /* Volume header */
 #endif
-        case 'g':       /* pax global header */
-        case 'x': {     /* pax extended header */
-                if ((uoff_t)file_header->size > 0xfffff) /* paranoia */
-                        goto skip_ext_hdr;
-                process_pax_hdr(archive_handle, file_header->size, (tar.typeflag == 'g'));
-                goto again_after_align;
         }
  skip_ext_hdr:
         {
diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index 0a8c657b7..1c5c185d0 100644
--- a/archival/libarchive/open_transformer.c
+++ b/archival/libarchive/open_transformer.c
@@ -183,6 +183,13 @@ static transformer_state_t *setup_transformer_on_fd(int fd, int fail_if_not_comp
                 USE_FOR_NOMMU(xstate->xformer_prog = "gunzip";)
                 goto found_magic;
         }
+        if (ENABLE_FEATURE_SEAMLESS_Z
+         && magic.b16[0] == COMPRESS_MAGIC
+        ) {
+                xstate->xformer = unpack_Z_stream;
+                USE_FOR_NOMMU(xstate->xformer_prog = "uncompress";)
+                goto found_magic;
+        }
         if (ENABLE_FEATURE_SEAMLESS_BZ2
          && magic.b16[0] == BZIP2_MAGIC
         ) {