Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/archival/lzop.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/archival/lzop.c (modified) (15 diffs)

branches/3.3/mindi-busybox/archival/lzop.c

@@ -25 +25 @@
    "Minimalized" for busybox by Alain Knaff
 */
+
+//config:config LZOP
+//config:   bool "lzop"
+//config:   default y
+//config:   help
+//config:     Lzop compression/decompresion.
+//config:
+//config:config LZOP_COMPR_HIGH
+//config:   bool "lzop compression levels 7,8,9 (not very useful)"
+//config:   default n
+//config:   depends on LZOP
+//config:   help
+//config:     High levels (7,8,9) of lzop compression. These levels
+//config:     are actually slower than gzip at equivalent compression ratios
+//config:     and take up 3.2K of code.
+
+//applet:IF_LZOP(APPLET(lzop, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_LZOP(APPLET_ODDNAME(lzopcat, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, lzopcat))
+//applet:IF_LZOP(APPLET_ODDNAME(unlzop, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, unlzop))
+//kbuild:lib-$(CONFIG_LZOP) += lzop.o
 
 //usage:#define lzop_trivial_usage
@@ -52 +72 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include "bb_archive.h"
 #include "liblzo_interface.h"
@@ -424 +445 @@
     chksum_t chksum_out;
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
-#define INIT_G() do { } while (0)
+#define G (*(struct globals*)bb_common_bufsiz1)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 //#define G (*ptr_to_globals)
 //#define INIT_G() do {
@@ -437 +458 @@
 //#define LZOP_VERSION_DATE       "Apr 27th 2003"
 
-#define OPTION_STRING "cfvdt123456789CF"
-
+#define OPTION_STRING "cfvqdt123456789CF"
+
+/* Note: must be kept in sync with archival/bbunzip.c */
 enum {
     OPT_STDOUT      = (1 << 0),
     OPT_FORCE       = (1 << 1),
     OPT_VERBOSE     = (1 << 2),
-    OPT_DECOMPRESS  = (1 << 3),
-    OPT_TEST        = (1 << 4),
-    OPT_1           = (1 << 5),
-    OPT_2           = (1 << 6),
-    OPT_3           = (1 << 7),
-    OPT_4           = (1 << 8),
-    OPT_5           = (1 << 9),
-    OPT_6           = (1 << 10),
-    OPT_789         = (7 << 11),
-    OPT_7           = (1 << 11),
-    OPT_8           = (1 << 12),
-    OPT_C           = (1 << 14),
-    OPT_F           = (1 << 15),
+    OPT_QUIET       = (1 << 3),
+    OPT_DECOMPRESS  = (1 << 4),
+    OPT_TEST        = (1 << 5),
+    OPT_1           = (1 << 6),
+    OPT_2           = (1 << 7),
+    OPT_3           = (1 << 8),
+    OPT_4           = (1 << 9),
+    OPT_5           = (1 << 10),
+    OPT_6           = (1 << 11),
+    OPT_789         = (7 << 12),
+    OPT_7           = (1 << 13),
+    OPT_8           = (1 << 14),
+    OPT_C           = (1 << 15),
+    OPT_F           = (1 << 16),
 };
 
@@ -619 +642 @@
 // compress a file
 /**********************************************************************/
-static NOINLINE smallint lzo_compress(const header_t *h)
+static NOINLINE int lzo_compress(const header_t *h)
 {
     unsigned block_size = LZO_BLOCK_SIZE;
@@ -629 +652 @@
     uint32_t d_crc32 = CRC32_INIT_VALUE;
     int l;
-    smallint ok = 1;
     uint8_t *wrk_mem = NULL;
 
@@ -711 +733 @@
     free(b1);
     free(b2);
-    return ok;
+    return 1;
 }
 
@@ -732 +754 @@
 // decompress a file
 /**********************************************************************/
-static NOINLINE smallint lzo_decompress(const header_t *h)
+static NOINLINE int lzo_decompress(const header_t *h)
 {
     unsigned block_size = LZO_BLOCK_SIZE;
@@ -740 +762 @@
     uint32_t d_adler32 = ADLER32_INIT_VALUE;
     uint32_t c_crc32 = CRC32_INIT_VALUE, d_crc32 = CRC32_INIT_VALUE;
-    smallint ok = 1;
     uint8_t *b1;
     uint32_t mcs_block_size = MAX_COMPRESSED_SIZE(block_size);
@@ -844 +865 @@
 
     free(b2);
-    return ok;
+    return 1;
 }
 
@@ -876 +897 @@
  * The rest is identical.
 */
-static const unsigned char lzop_magic[9] = {
+static const unsigned char lzop_magic[9] ALIGN1 = {
     0x89, 0x4c, 0x5a, 0x4f, 0x00, 0x0d, 0x0a, 0x1a, 0x0a
 };
@@ -1029 +1050 @@
 }
 
-static smallint do_lzo_compress(void)
+static int do_lzo_compress(void)
 {
     header_t header;
@@ -1057 +1078 @@
 // decompress
 /**********************************************************************/
-static smallint do_lzo_decompress(void)
+static int do_lzo_decompress(void)
 {
     header_t header;
@@ -1078 +1099 @@
 }
 
-static IF_DESKTOP(long long) int FAST_FUNC pack_lzop(transformer_aux_data_t *aux UNUSED_PARAM)
+static IF_DESKTOP(long long) int FAST_FUNC pack_lzop(transformer_state_t *xstate UNUSED_PARAM)
 {
     if (option_mask32 & OPT_DECOMPRESS)
@@ -1094 +1115 @@
         option_mask32 |= (OPT_STDOUT | OPT_DECOMPRESS);
     /* unlzop? */
-    if (applet_name[0] == 'u')
+    if (applet_name[4] == 'o')
         option_mask32 |= OPT_DECOMPRESS;