diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/applets.h | 3 | ||||
| -rw-r--r-- | include/unarchive.h | 1 | ||||
| -rw-r--r-- | include/usage.h | 22 |
3 files changed, 26 insertions, 0 deletions
diff --git a/include/applets.h b/include/applets.h index a171c54..d8a706b 100644 --- a/include/applets.h +++ b/include/applets.h @@ -419,6 +419,7 @@ IF_UNCOMPRESS(APPLET(uncompress, _BB_DIR_BIN, _BB_SUID_DROP)) IF_UNEXPAND(APPLET_ODDNAME(unexpand, expand, _BB_DIR_USR_BIN, _BB_SUID_DROP, unexpand)) IF_UNIQ(APPLET(uniq, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_UNIX2DOS(APPLET_ODDNAME(unix2dos, dos2unix, _BB_DIR_USR_BIN, _BB_SUID_DROP, unix2dos)) +IF_UNXZ(APPLET(unxz, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_UNLZMA(APPLET(unlzma, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_LZOP(APPLET_ODDNAME(unlzop, lzop, _BB_DIR_USR_BIN, _BB_SUID_DROP, unlzop)) IF_UNZIP(APPLET(unzip, _BB_DIR_USR_BIN, _BB_SUID_DROP)) @@ -439,6 +440,8 @@ IF_WHICH(APPLET(which, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_WHO(APPLET(who, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_WHOAMI(APPLET_NOFORK(whoami, whoami, _BB_DIR_USR_BIN, _BB_SUID_DROP, whoami)) IF_XARGS(APPLET_NOEXEC(xargs, xargs, _BB_DIR_USR_BIN, _BB_SUID_DROP, xargs)) +IF_UNXZ(APPLET_ODDNAME(xzcat, unxz, _BB_DIR_USR_BIN, _BB_SUID_DROP, xzcat)) +IF_XZ(APPLET_ODDNAME(xz, unxz, _BB_DIR_USR_BIN, _BB_SUID_DROP, xz)) IF_YES(APPLET_NOFORK(yes, yes, _BB_DIR_USR_BIN, _BB_SUID_DROP, yes)) IF_GUNZIP(APPLET_ODDNAME(zcat, gunzip, _BB_DIR_BIN, _BB_SUID_DROP, zcat)) IF_ZCIP(APPLET(zcip, _BB_DIR_SBIN, _BB_SUID_DROP)) diff --git a/include/unarchive.h b/include/unarchive.h index a834816..14cd98e 100644 --- a/include/unarchive.h +++ b/include/unarchive.h @@ -143,6 +143,7 @@ typedef struct inflate_unzip_result { } inflate_unzip_result; IF_DESKTOP(long long) int inflate_unzip(inflate_unzip_result *res, off_t compr_size, int src_fd, int dst_fd) FAST_FUNC; +IF_DESKTOP(long long) int unpack_xz_stream_stdin(void) FAST_FUNC; /* lzma unpacker takes .lzma stream from offset 0 */ IF_DESKTOP(long long) int unpack_lzma_stream(int src_fd, int dst_fd) FAST_FUNC; /* the rest wants 2 first bytes already skipped by the caller */ diff --git a/include/usage.h b/include/usage.h index 3aa980c..a9c4c42 100644 --- a/include/usage.h +++ b/include/usage.h @@ -269,6 +269,28 @@ #define lzcat_full_usage "\n\n" \ "Decompress to stdout" +#define unxz_trivial_usage \ + "[OPTIONS] [FILE]..." +#define unxz_full_usage "\n\n" \ + "Decompress FILE (or stdin)\n" \ + "\nOptions:" \ + "\n -c Write to stdout" \ + "\n -f Force" \ + +#define xz_trivial_usage \ + "-d [OPTIONS] [FILE]..." +#define xz_full_usage "\n\n" \ + "Decompress FILE (or stdin)\n" \ + "\nOptions:" \ + "\n -d Decompress" \ + "\n -c Write to stdout" \ + "\n -f Force" \ + +#define xzcat_trivial_usage \ + "FILE" +#define xzcat_full_usage "\n\n" \ + "Decompress to stdout" + #define cal_trivial_usage \ "[-jy] [[MONTH] YEAR]" #define cal_full_usage "\n\n" \ |