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

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

@@ -15 +15 @@
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
@@ -26 +26 @@
 */
 
+//usage:#define lzop_trivial_usage
+//usage:       "[-cfvd123456789CF] [FILE]..."
+//usage:#define lzop_full_usage "\n\n"
+//usage:       "    -1..9   Compression level"
+//usage:     "\n    -d  Decompress"
+//usage:     "\n    -c  Write to stdout"
+//usage:     "\n    -f  Force"
+//usage:     "\n    -v  Verbose"
+//usage:     "\n    -F  Don't store or verify checksum"
+//usage:     "\n    -C  Also write checksum of compressed block"
+//usage:
+//usage:#define lzopcat_trivial_usage
+//usage:       "[-vCF] [FILE]..."
+//usage:#define lzopcat_full_usage "\n\n"
+//usage:       "    -v  Verbose"
+//usage:     "\n    -F  Don't store or verify checksum"
+//usage:
+//usage:#define unlzop_trivial_usage
+//usage:       "[-cfvCF] [FILE]..."
+//usage:#define unlzop_full_usage "\n\n"
+//usage:       "    -c  Write to stdout"
+//usage:     "\n    -f  Force"
+//usage:     "\n    -v  Verbose"
+//usage:     "\n    -F  Don't store or verify checksum"
+
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 #include "liblzo_interface.h"
 
@@ -92 +117 @@
     unsigned long o_m1_a = 0, o_m1_b = 0, o_m2 = 0, o_m3_a = 0, o_m3_b = 0;
 
-//    LZO_UNUSED(wrkmem);
+//  LZO_UNUSED(wrkmem);
 
     *out_len = 0;
@@ -177 +202 @@
                     *litp &= ~3;
                     /* copy over the 2 literals that replace the match */
-                    copy2(ip-3+1,m_pos,pd(op,m_pos));
+                    copy2(ip-3+1, m_pos, pd(op, m_pos));
                     /* move literals 1 byte ahead */
                     litp += 2;
@@ -187 +212 @@
 
                     o_m1_b++;
-                    *op++ = *m_pos++; *op++ = *m_pos++;
+                    *op++ = *m_pos++;
+                    *op++ = *m_pos++;
                     goto copy_literal_run;
                 }
@@ -216 +242 @@
                         t = *ip++;
                         /* copy over the 3 literals that replace the match */
-                        copy3(ip-1-2,m_pos,pd(op,m_pos));
+                        copy3(ip-1-2, m_pos, pd(op, m_pos));
                         /* set new length of previous literal run */
                         lit += 3 + t + 3;
@@ -265 +291 @@
                         *litp = (unsigned char)((*litp & ~3) | lit);
                         /* copy over the 3 literals that replace the match */
-                        copy3(ip-3,m_pos,pd(op,m_pos));
+                        copy3(ip-3, m_pos, pd(op, m_pos));
                         o_m3_a++;
                     }
@@ -276 +302 @@
                         *litp &= ~3;
                         /* copy over the 3 literals that replace the match */
-                        copy3(ip-4+1,m_pos,pd(op,m_pos));
+                        copy3(ip-4+1, m_pos, pd(op, m_pos));
                         /* move literals 1 byte ahead */
                         litp += 2;
@@ -321 +347 @@
 
  eof_found:
-//    LZO_UNUSED(o_m1_a); LZO_UNUSED(o_m1_b); LZO_UNUSED(o_m2);
-//    LZO_UNUSED(o_m3_a); LZO_UNUSED(o_m3_b);
+//  LZO_UNUSED(o_m1_a); LZO_UNUSED(o_m1_b); LZO_UNUSED(o_m2);
+//  LZO_UNUSED(o_m3_a); LZO_UNUSED(o_m3_b);
     *out_len = pd(op, out);
     return (ip == ip_end ? LZO_E_OK :
-           (ip < ip_end  ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
+        (ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
 }
 
@@ -402 +428 @@
 //#define G (*ptr_to_globals)
 //#define INIT_G() do {
-//        SET_PTR_TO_GLOBALS(xzalloc(sizeof(G)));
+//  SET_PTR_TO_GLOBALS(xzalloc(sizeof(G)));
 //} while (0)
 
@@ -1052 +1078 @@
 }
 
-static IF_DESKTOP(long long) int FAST_FUNC pack_lzop(unpack_info_t *info UNUSED_PARAM)
+static IF_DESKTOP(long long) int FAST_FUNC pack_lzop(transformer_aux_data_t *aux UNUSED_PARAM)
 {
     if (option_mask32 & OPT_DECOMPRESS)