Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/archival/gzip.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/gzip.c (modified) (9 diffs)

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

@@ -40 +40 @@
 */
 
+//usage:#define gzip_trivial_usage
+//usage:       "[-cfd] [FILE]..."
+//usage:#define gzip_full_usage "\n\n"
+//usage:       "Compress FILEs (or stdin)\n"
+//usage:     "\n    -d  Decompress"
+//usage:     "\n    -c  Write to stdout"
+//usage:     "\n    -f  Force"
+//usage:
+//usage:#define gzip_example_usage
+//usage:       "$ ls -la /tmp/busybox*\n"
+//usage:       "-rw-rw-r--    1 andersen andersen  1761280 Apr 14 17:47 /tmp/busybox.tar\n"
+//usage:       "$ gzip /tmp/busybox.tar\n"
+//usage:       "$ ls -la /tmp/busybox*\n"
+//usage:       "-rw-rw-r--    1 andersen andersen   554058 Apr 14 17:49 /tmp/busybox.tar.gz\n"
+
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 
@@ -67 +82 @@
 /* ===========================================================================
  */
-#define SMALL_MEM
+#if   CONFIG_GZIP_FAST == 0
+# define SMALL_MEM
+#elif CONFIG_GZIP_FAST == 1
+# define MEDIUM_MEM
+#elif CONFIG_GZIP_FAST == 2
+# define BIG_MEM
+#else
+# error "Invalid CONFIG_GZIP_FAST value"
+#endif
 
 #ifndef INBUFSIZ
@@ -1157 +1180 @@
      */
     Assert(code + G2.bl_count[MAX_BITS] - 1 == (1 << MAX_BITS) - 1,
-           "inconsistent bit counts");
+            "inconsistent bit counts");
     Tracev((stderr, "\ngen_codes: max_code %d ", max_code));
 
@@ -1505 +1528 @@
         out_length >>= 3;
         Trace((stderr,
-               "\nlast_lit %u, last_dist %u, in %ld, out ~%ld(%ld%%) ",
-               G2.last_lit, G2.last_dist, in_length, out_length,
-               100L - out_length * 100L / in_length));
+                "\nlast_lit %u, last_dist %u, in %ld, out ~%ld(%ld%%) ",
+                G2.last_lit, G2.last_dist, in_length, out_length,
+                100L - out_length * 100L / in_length));
         if (G2.last_dist < G2.last_lit / 2 && out_length < in_length / 2)
             return 1;
@@ -1599 +1622 @@
 
     Trace((stderr,
-           "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u dist %u ",
-           opt_lenb, G2.opt_len, static_lenb, G2.static_len, stored_len,
-           G2.last_lit, G2.last_dist));
+            "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u dist %u ",
+            opt_lenb, G2.opt_len, static_lenb, G2.static_len, stored_len,
+            G2.last_lit, G2.last_dist));
 
     if (static_lenb <= opt_lenb)
@@ -1639 +1662 @@
         send_bits((DYN_TREES << 1) + eof, 3);
         send_all_trees(G2.l_desc.max_code + 1, G2.d_desc.max_code + 1,
-                       max_blindex + 1);
+                    max_blindex + 1);
         compress_block((ct_data *) G2.dyn_ltree, (ct_data *) G2.dyn_dtree);
         G2.compressed_len += 3 + G2.opt_len;
@@ -1659 +1682 @@
 /* ===========================================================================
  * Update a hash value with the given input byte
- * IN  assertion: all calls to to UPDATE_HASH are made with consecutive
+ * IN  assertion: all calls to UPDATE_HASH are made with consecutive
  *    input characters, so that a running hash key can be computed from the
  *    previous key instead of complete recalculation each time.
@@ -1690 +1713 @@
  * of the hash chain (the most recent string with same hash key). Return
  * the previous length of the hash chain.
- * IN  assertion: all calls to to INSERT_STRING are made with consecutive
+ * IN  assertion: all calls to INSERT_STRING are made with consecutive
  *    input characters and the first MIN_MATCH bytes of s are valid
  *    (except for the last MIN_MATCH-1 bytes of the input file). */
@@ -1993 +2016 @@
 /* ======================================================================== */
 static
-IF_DESKTOP(long long) int FAST_FUNC pack_gzip(unpack_info_t *info UNUSED_PARAM)
+IF_DESKTOP(long long) int FAST_FUNC pack_gzip(transformer_aux_data_t *aux UNUSED_PARAM)
 {
     struct stat s;