Patch from Aurelien Jacobs to add unlzma. (A new decompression type,

see www.7-zip.org)


git-svn-id: svn://busybox.net/trunk/busybox@13454 69ca8d6d-28ef-0310-b511-8ec308f3f277

3 files changed, 28 insertions, 1 deletions

diff --git a/include/applets.h b/include/applets.h
index 47376c624..c6f54e157 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -408,6 +408,9 @@
 #ifdef CONFIG_LSMOD
         APPLET(lsmod, lsmod_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
 #endif
+#ifdef CONFIG_UNLZMA
+        APPLET(lzmacat, unlzma_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
+#endif
 #ifdef CONFIG_MAKEDEVS
         APPLET(makedevs, makedevs_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
 #endif
@@ -712,6 +715,9 @@
 #ifdef CONFIG_UNIX2DOS
         APPLET(unix2dos, dos2unix_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
 #endif
+#ifdef CONFIG_UNLZMA
+        APPLET(unlzma, unlzma_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
+#endif
 #ifdef CONFIG_UNZIP
         APPLET(unzip, unzip_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
 #endif
diff --git a/include/unarchive.h b/include/unarchive.h
index 72a803f16..2075ca2ac 100644
--- a/include/unarchive.h
+++ b/include/unarchive.h
@@ -87,6 +87,7 @@ extern char get_header_ar(archive_handle_t *archive_handle);
 extern char get_header_cpio(archive_handle_t *archive_handle);
 extern char get_header_tar(archive_handle_t *archive_handle);
 extern char get_header_tar_bz2(archive_handle_t *archive_handle);
+extern char get_header_tar_lzma(archive_handle_t *archive_handle);
 extern char get_header_tar_gz(archive_handle_t *archive_handle);
 
 extern void seek_by_jump(const archive_handle_t *archive_handle, const unsigned int amount);
@@ -103,6 +104,7 @@ extern void inflate_init(unsigned int bufsize);
 extern void inflate_cleanup(void);
 extern int inflate_unzip(int in, int out);
 extern int inflate_gunzip(int in, int out);
+extern int unlzma(int src_fd, int dst_fd);
 
 extern int open_transformer(int src_fd, int (*transformer)(int src_fd, int dst_fd));
 
diff --git a/include/usage.h b/include/usage.h
index e6287c8a3..8982f8dd2 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -102,6 +102,19 @@
 #define bzcat_full_usage \
         "Uncompress to stdout."
 
+#define unlzma_trivial_usage \
+        "[OPTION]... [FILE]"
+#define unlzma_full_usage \
+        "Uncompress FILE (or standard input if FILE is '-' or omitted).\n\n" \
+        "Options:\n" \
+        "\t-c\tWrite output to standard output\n" \
+        "\t-f\tForce"
+
+#define lzmacat_trivial_usage \
+        "FILE"
+#define lzmacat_full_usage \
+        "Uncompress to stdout."
+
 #define cal_trivial_usage \
         "[-jy] [[month] year]"
 #define cal_full_usage \
@@ -2964,6 +2977,11 @@
 #else
 #  define USAGE_TAR_BZIP2(a)
 #endif
+#ifdef CONFIG_FEATURE_TAR_LZMA
+#  define USAGE_TAR_LZMA(a) a
+#else
+#  define USAGE_TAR_LZMA(a)
+#endif
 #ifdef CONFIG_FEATURE_TAR_COMPRESS
 #  define USAGE_TAR_COMPRESS(a) a
 #else
@@ -2971,7 +2989,7 @@
 #endif
 
 #define tar_trivial_usage \
-        "-[" USAGE_TAR_CREATE("c") USAGE_TAR_GZIP("z") USAGE_TAR_BZIP2("j") USAGE_TAR_COMPRESS("Z") "xtvO] " \
+        "-[" USAGE_TAR_CREATE("c") USAGE_TAR_GZIP("z") USAGE_TAR_BZIP2("j") USAGE_TAR_LZMA("a") USAGE_TAR_COMPRESS("Z") "xtvO] " \
         USAGE_TAR_EXCLUDE("[-X FILE]") \
         "[-f TARFILE] [-C DIR] [FILE(s)] ..."
 #define tar_full_usage \
@@ -2983,6 +3001,7 @@
         "\nArchive format selection:\n" \
         USAGE_TAR_GZIP("\tz\t\tFilter the archive through gzip\n") \
         USAGE_TAR_BZIP2("\tj\t\tFilter the archive through bzip2\n") \
+        USAGE_TAR_LZMA("\ta\t\tFilter the archive through lzma\n") \
         USAGE_TAR_COMPRESS("\tZ\t\tFilter the archive through compress\n") \
         "\nFile selection:\n" \
         "\tf\t\tname of TARFILE or \"-\" for stdin\n" \