Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/archival/gzip.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/archival/gzip.c (modified) (15 diffs)

branches/2.2.9/mindi-busybox/archival/gzip.c

@@ -14 +14 @@
  * command line handling.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -41 +41 @@
 
 #include "libbb.h"
+#include "archive.h"
 
 
@@ -68 +69 @@
 #define SMALL_MEM
 
-#ifndef INBUFSIZ
+#ifndef INBUFSIZ
 #  ifdef SMALL_MEM
 #    define INBUFSIZ  0x2000    /* input buffer size */
@@ -76 +77 @@
 #endif
 
-#ifndef OUTBUFSIZ
+#ifndef OUTBUFSIZ
 #  ifdef SMALL_MEM
 #    define OUTBUFSIZ   8192    /* output buffer size */
@@ -267 +268 @@
     type * array
 #define ALLOC(type, array, size) \
-    array = xzalloc((size_t)(((size)+1L)/2) * 2*sizeof(type));
+    array = xzalloc((size_t)(((size)+1L)/2) * 2*sizeof(type))
 #define FREE(array) \
     do { free(array); array = NULL; } while (0)
@@ -340 +341 @@
 #endif
 
-    uint32_t *crc_32_tab;
+    /*uint32_t *crc_32_tab;*/
     uint32_t crc;   /* shift register contents */
 };
@@ -389 +390 @@
 
 /* ===========================================================================
- * Clear input and output buffers
- */
-static void clear_bufs(void)
-{
-    G1.outcnt = 0;
-#ifdef DEBUG
-    G1.insize = 0;
-#endif
-    G1.isize = 0;
-}
-
-
-/* ===========================================================================
  * Run a set of bytes through the crc shift register.  If s is a NULL
  * pointer, then initialize the crc shift register contents instead.
  * Return the current crc in either case.
  */
-static uint32_t updcrc(uch * s, unsigned n)
-{
-    uint32_t c = G1.crc;
-    while (n) {
-        c = G1.crc_32_tab[(uch)(c ^ *s++)] ^ (c >> 8);
-        n--;
-    }
-    G1.crc = c;
-    return c;
+static void updcrc(uch * s, unsigned n)
+{
+    G1.crc = crc32_block_endian0(G1.crc, s, n, global_crc32_table /*G1.crc_32_tab*/);
 }
 
@@ -633 +615 @@
          * or if the match length is less than 2:
          */
-        if (match[best_len] != scan_end ||
-            match[best_len - 1] != scan_end1 ||
-            *match != *scan || *++match != scan[1])
+        if (match[best_len] != scan_end
+         || match[best_len - 1] != scan_end1
+         || *match != *scan || *++match != scan[1]
+        ) {
             continue;
+        }
 
         /* The check at best_len-1 can be removed because it will be made
@@ -687 +671 @@
         bb_error_msg("\\[%d,%d]", start - match, length);
         do {
-            putc(G1.window[start++], stderr);
+            bb_putchar_stderr(G1.window[start++]);
         } while (--length != 0);
     }
@@ -975 +959 @@
 #  define SEND_CODE(c, tree) \
 { \
-    if (verbose > 1) bb_error_msg("\ncd %3d ",(c)); \
+    if (verbose > 1) bb_error_msg("\ncd %3d ", (c)); \
     send_bits(tree[c].Code, tree[c].Len); \
 }
@@ -1186 +1170 @@
         Tracec(tree != G2.static_ltree,
                (stderr, "\nn %3d %c l %2d c %4x (%x) ", n,
-                (isgraph(n) ? n : ' '), len, tree[n].Code,
+                (n > ' ' ? n : ' '), len, tree[n].Code,
                 next_code[len] - 1));
     }
@@ -1554 +1538 @@
         if ((flag & 1) == 0) {
             SEND_CODE(lc, ltree);   /* send a literal byte */
-            Tracecv(isgraph(lc), (stderr, " '%c' ", lc));
+            Tracecv(lc > ' ', (stderr, " '%c' ", lc));
         } else {
             /* Here, lc is the match length - MIN_MATCH */
@@ -2009 +1993 @@
 /* ======================================================================== */
 static
-char* make_new_name_gzip(char *filename)
-{
-    return xasprintf("%s.gz", filename);
-}
-
-static
-USE_DESKTOP(long long) int pack_gzip(void)
+IF_DESKTOP(long long) int FAST_FUNC pack_gzip(unpack_info_t *info UNUSED_PARAM)
 {
     struct stat s;
 
-    clear_bufs();
-    s.st_ctime = 0;
-    fstat(STDIN_FILENO, &s);
-    zip(s.st_ctime);
-    return 0;
-}
-
-int gzip_main(int argc, char **argv);
-int gzip_main(int argc, char **argv)
-{
-    unsigned opt;
-
-    /* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */
-    opt = getopt32(argv, "cfv" USE_GUNZIP("d") "q123456789" );
-    option_mask32 &= 0x7; /* Clear -d, ignore -q, -0..9 */
-    //if (opt & 0x1) // -c
-    //if (opt & 0x2) // -f
-    //if (opt & 0x4) // -v
-#if ENABLE_GUNZIP /* gunzip_main may not be visible... */
-    if (opt & 0x8) { // -d
-        return gunzip_main(argc, argv);
-    }
-#endif
-    argv += optind;
-
-    PTR_TO_GLOBALS = xzalloc(sizeof(struct globals) + sizeof(struct globals2))
-            + sizeof(struct globals);
-    G2.l_desc.dyn_tree    = G2.dyn_ltree;
-    G2.l_desc.static_tree = G2.static_ltree;
-    G2.l_desc.extra_bits  = extra_lbits;
-    G2.l_desc.extra_base  = LITERALS + 1;
-    G2.l_desc.elems       = L_CODES;
-    G2.l_desc.max_length  = MAX_BITS;
-    //G2.l_desc.max_code    = 0;
-
-    G2.d_desc.dyn_tree    = G2.dyn_dtree;
-    G2.d_desc.static_tree = G2.static_dtree;
-    G2.d_desc.extra_bits  = extra_dbits;
-    //G2.d_desc.extra_base  = 0;
-    G2.d_desc.elems       = D_CODES;
-    G2.d_desc.max_length  = MAX_BITS;
-    //G2.d_desc.max_code    = 0;
-
+    /* Clear input and output buffers */
+    G1.outcnt = 0;
+#ifdef DEBUG
+    G1.insize = 0;
+#endif
+    G1.isize = 0;
+
+    /* Reinit G2.xxx */
+    memset(&G2, 0, sizeof(G2));
+    G2.l_desc.dyn_tree     = G2.dyn_ltree;
+    G2.l_desc.static_tree  = G2.static_ltree;
+    G2.l_desc.extra_bits   = extra_lbits;
+    G2.l_desc.extra_base   = LITERALS + 1;
+    G2.l_desc.elems        = L_CODES;
+    G2.l_desc.max_length   = MAX_BITS;
+    //G2.l_desc.max_code     = 0;
+    G2.d_desc.dyn_tree     = G2.dyn_dtree;
+    G2.d_desc.static_tree  = G2.static_dtree;
+    G2.d_desc.extra_bits   = extra_dbits;
+    //G2.d_desc.extra_base   = 0;
+    G2.d_desc.elems        = D_CODES;
+    G2.d_desc.max_length   = MAX_BITS;
+    //G2.d_desc.max_code     = 0;
     G2.bl_desc.dyn_tree    = G2.bl_tree;
     //G2.bl_desc.static_tree = NULL;
@@ -2070 +2028 @@
     //G2.bl_desc.max_code    = 0;
 
+    s.st_ctime = 0;
+    fstat(STDIN_FILENO, &s);
+    zip(s.st_ctime);
+    return 0;
+}
+
+#if ENABLE_FEATURE_GZIP_LONG_OPTIONS
+static const char gzip_longopts[] ALIGN1 =
+    "stdout\0"              No_argument       "c"
+    "to-stdout\0"           No_argument       "c"
+    "force\0"               No_argument       "f"
+    "verbose\0"             No_argument       "v"
+#if ENABLE_GUNZIP
+    "decompress\0"          No_argument       "d"
+    "uncompress\0"          No_argument       "d"
+    "test\0"                No_argument       "t"
+#endif
+    "quiet\0"               No_argument       "q"
+    "fast\0"                No_argument       "1"
+    "best\0"                No_argument       "9"
+    ;
+#endif
+
+/*
+ * Linux kernel build uses gzip -d -n. We accept and ignore -n.
+ * Man page says:
+ * -n --no-name
+ * gzip: do not save the original file name and time stamp.
+ * (The original name is always saved if the name had to be truncated.)
+ * gunzip: do not restore the original file name/time even if present
+ * (remove only the gzip suffix from the compressed file name).
+ * This option is the default when decompressing.
+ * -N --name
+ * gzip: always save the original file name and time stamp (this is the default)
+ * gunzip: restore the original file name and time stamp if present.
+ */
+
+int gzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+#if ENABLE_GUNZIP
+int gzip_main(int argc, char **argv)
+#else
+int gzip_main(int argc UNUSED_PARAM, char **argv)
+#endif
+{
+    unsigned opt;
+
+#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");
+#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));
+
     /* Allocate all global buffers (for DYN_ALLOC option) */
     ALLOC(uch, G1.l_buf, INBUFSIZ);
@@ -2077 +2099 @@
     ALLOC(ush, G1.prev, 1L << BITS);
 
-    /* Initialise the CRC32 table */
-    G1.crc_32_tab = crc32_filltable(NULL, 0);
-
-    return bbunpack(argv, make_new_name_gzip, pack_gzip);
-}
+    /* Initialize the CRC32 table */
+    global_crc32_table = crc32_filltable(NULL, 0);
+
+    return bbunpack(argv, pack_gzip, append_ext, "gz");
+}