Merge branch busybox (up to "ash: comment out free(p) just before...")

2 files changed, 5 insertions, 8 deletions

diff --git a/archival/cpio.c b/archival/cpio.c
index 3b1550720..540218cb2 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -23,7 +23,7 @@
 //config:         cpio has 110 bytes of overheads for every stored file.
 //config:
 //config:         This implementation of cpio can extract cpio archives created in the
-//config:         "newc" or "crc" format, it cannot create or modify them.
+//config:         "newc" or "crc" format.
 //config:
 //config:         Unless you have a specific application which requires cpio, you
 //config:         should probably say N here.
@@ -51,10 +51,10 @@
 //usage:       " [-ti"IF_FEATURE_CPIO_O("o")"]" IF_FEATURE_CPIO_P(" [-p DIR]")
 //usage:       " [EXTR_FILE]..."
 //usage:#define cpio_full_usage "\n\n"
-//usage:       "Extract or list files from a cpio archive"
+//usage:       "Extract (-i) or list (-t) files from a cpio archive"
 //usage:        IF_FEATURE_CPIO_O(", or"
-//usage:     "\ncreate an archive" IF_FEATURE_CPIO_P(" (-o) or copy files (-p)")
-//usage:                " using file list on stdin"
+//usage:     "\ntake file list from stdin and create an archive (-o)"
+//usage:                IF_FEATURE_CPIO_P(" or copy files (-p)")
 //usage:        )
 //usage:     "\n"
 //usage:     "\nMain operation mode:"
diff --git a/archival/gzip.c b/archival/gzip.c
index 8f1e4ff29..9e0bee815 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -2220,10 +2220,7 @@ int gzip_main(int argc UNUSED_PARAM, char **argv)
         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);
+        opt = ffs(opt >> 4); /* Maps -1..-4 to [0], -5 to [1] ... -9 to [5] */
         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;