aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorlandley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-01-20 18:28:50 +0000
committerlandley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-01-20 18:28:50 +0000
commitcf9cc891b601b9a27f14a4d1b97d57e3eb5f7fbf (patch)
tree5e3796c33b995720bcd69f2b969e409e85bff119 /include
parent3a92934f04fb736a84db01fc5c5d0de67e45f167 (diff)
downloadbusybox-w32-cf9cc891b601b9a27f14a4d1b97d57e3eb5f7fbf.tar.gz
busybox-w32-cf9cc891b601b9a27f14a4d1b97d57e3eb5f7fbf.tar.bz2
busybox-w32-cf9cc891b601b9a27f14a4d1b97d57e3eb5f7fbf.zip
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
Diffstat (limited to 'include')
-rw-r--r--include/applets.h6
-rw-r--r--include/unarchive.h2
-rw-r--r--include/usage.h21
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 @@
408#ifdef CONFIG_LSMOD 408#ifdef CONFIG_LSMOD
409 APPLET(lsmod, lsmod_main, _BB_DIR_SBIN, _BB_SUID_NEVER) 409 APPLET(lsmod, lsmod_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
410#endif 410#endif
411#ifdef CONFIG_UNLZMA
412 APPLET(lzmacat, unlzma_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
413#endif
411#ifdef CONFIG_MAKEDEVS 414#ifdef CONFIG_MAKEDEVS
412 APPLET(makedevs, makedevs_main, _BB_DIR_SBIN, _BB_SUID_NEVER) 415 APPLET(makedevs, makedevs_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
413#endif 416#endif
@@ -712,6 +715,9 @@
712#ifdef CONFIG_UNIX2DOS 715#ifdef CONFIG_UNIX2DOS
713 APPLET(unix2dos, dos2unix_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) 716 APPLET(unix2dos, dos2unix_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
714#endif 717#endif
718#ifdef CONFIG_UNLZMA
719 APPLET(unlzma, unlzma_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
720#endif
715#ifdef CONFIG_UNZIP 721#ifdef CONFIG_UNZIP
716 APPLET(unzip, unzip_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) 722 APPLET(unzip, unzip_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
717#endif 723#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);
87extern char get_header_cpio(archive_handle_t *archive_handle); 87extern char get_header_cpio(archive_handle_t *archive_handle);
88extern char get_header_tar(archive_handle_t *archive_handle); 88extern char get_header_tar(archive_handle_t *archive_handle);
89extern char get_header_tar_bz2(archive_handle_t *archive_handle); 89extern char get_header_tar_bz2(archive_handle_t *archive_handle);
90extern char get_header_tar_lzma(archive_handle_t *archive_handle);
90extern char get_header_tar_gz(archive_handle_t *archive_handle); 91extern char get_header_tar_gz(archive_handle_t *archive_handle);
91 92
92extern void seek_by_jump(const archive_handle_t *archive_handle, const unsigned int amount); 93extern 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);
103extern void inflate_cleanup(void); 104extern void inflate_cleanup(void);
104extern int inflate_unzip(int in, int out); 105extern int inflate_unzip(int in, int out);
105extern int inflate_gunzip(int in, int out); 106extern int inflate_gunzip(int in, int out);
107extern int unlzma(int src_fd, int dst_fd);
106 108
107extern int open_transformer(int src_fd, int (*transformer)(int src_fd, int dst_fd)); 109extern int open_transformer(int src_fd, int (*transformer)(int src_fd, int dst_fd));
108 110
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 @@
102#define bzcat_full_usage \ 102#define bzcat_full_usage \
103 "Uncompress to stdout." 103 "Uncompress to stdout."
104 104
105#define unlzma_trivial_usage \
106 "[OPTION]... [FILE]"
107#define unlzma_full_usage \
108 "Uncompress FILE (or standard input if FILE is '-' or omitted).\n\n" \
109 "Options:\n" \
110 "\t-c\tWrite output to standard output\n" \
111 "\t-f\tForce"
112
113#define lzmacat_trivial_usage \
114 "FILE"
115#define lzmacat_full_usage \
116 "Uncompress to stdout."
117
105#define cal_trivial_usage \ 118#define cal_trivial_usage \
106 "[-jy] [[month] year]" 119 "[-jy] [[month] year]"
107#define cal_full_usage \ 120#define cal_full_usage \
@@ -2964,6 +2977,11 @@
2964#else 2977#else
2965# define USAGE_TAR_BZIP2(a) 2978# define USAGE_TAR_BZIP2(a)
2966#endif 2979#endif
2980#ifdef CONFIG_FEATURE_TAR_LZMA
2981# define USAGE_TAR_LZMA(a) a
2982#else
2983# define USAGE_TAR_LZMA(a)
2984#endif
2967#ifdef CONFIG_FEATURE_TAR_COMPRESS 2985#ifdef CONFIG_FEATURE_TAR_COMPRESS
2968# define USAGE_TAR_COMPRESS(a) a 2986# define USAGE_TAR_COMPRESS(a) a
2969#else 2987#else
@@ -2971,7 +2989,7 @@
2971#endif 2989#endif
2972 2990
2973#define tar_trivial_usage \ 2991#define tar_trivial_usage \
2974 "-[" USAGE_TAR_CREATE("c") USAGE_TAR_GZIP("z") USAGE_TAR_BZIP2("j") USAGE_TAR_COMPRESS("Z") "xtvO] " \ 2992 "-[" USAGE_TAR_CREATE("c") USAGE_TAR_GZIP("z") USAGE_TAR_BZIP2("j") USAGE_TAR_LZMA("a") USAGE_TAR_COMPRESS("Z") "xtvO] " \
2975 USAGE_TAR_EXCLUDE("[-X FILE]") \ 2993 USAGE_TAR_EXCLUDE("[-X FILE]") \
2976 "[-f TARFILE] [-C DIR] [FILE(s)] ..." 2994 "[-f TARFILE] [-C DIR] [FILE(s)] ..."
2977#define tar_full_usage \ 2995#define tar_full_usage \
@@ -2983,6 +3001,7 @@
2983 "\nArchive format selection:\n" \ 3001 "\nArchive format selection:\n" \
2984 USAGE_TAR_GZIP("\tz\t\tFilter the archive through gzip\n") \ 3002 USAGE_TAR_GZIP("\tz\t\tFilter the archive through gzip\n") \
2985 USAGE_TAR_BZIP2("\tj\t\tFilter the archive through bzip2\n") \ 3003 USAGE_TAR_BZIP2("\tj\t\tFilter the archive through bzip2\n") \
3004 USAGE_TAR_LZMA("\ta\t\tFilter the archive through lzma\n") \
2986 USAGE_TAR_COMPRESS("\tZ\t\tFilter the archive through compress\n") \ 3005 USAGE_TAR_COMPRESS("\tZ\t\tFilter the archive through compress\n") \
2987 "\nFile selection:\n" \ 3006 "\nFile selection:\n" \
2988 "\tf\t\tname of TARFILE or \"-\" for stdin\n" \ 3007 "\tf\t\tname of TARFILE or \"-\" for stdin\n" \
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-29 07:21:48 +0000