5 files changed, 92 insertions, 42 deletions

diff --git a/include/applets.h b/include/applets.h
index ff8799c63..d8a706b44 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -157,6 +157,7 @@ IF_FBSPLASH(APPLET(fbsplash, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_FDFLUSH(APPLET_ODDNAME(fdflush, freeramdisk, _BB_DIR_BIN, _BB_SUID_DROP, fdflush))
 IF_FDFORMAT(APPLET(fdformat, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_FDISK(APPLET(fdisk, _BB_DIR_SBIN, _BB_SUID_DROP))
+IF_FGCONSOLE(APPLET(fgconsole, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_FEATURE_GREP_FGREP_ALIAS(APPLET_ODDNAME(fgrep, grep, _BB_DIR_BIN, _BB_SUID_DROP, fgrep))
 IF_FIND(APPLET_NOEXEC(find, find, _BB_DIR_USR_BIN, _BB_SUID_DROP, find))
 IF_FINDFS(APPLET(findfs, _BB_DIR_SBIN, _BB_SUID_MAYBE))
@@ -252,7 +253,8 @@ IF_LSMOD(APPLET(lsmod, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe))
 IF_LSPCI(APPLET(lspci, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_LSUSB(APPLET(lsusb, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_UNLZMA(APPLET_ODDNAME(lzmacat, unlzma, _BB_DIR_USR_BIN, _BB_SUID_DROP, lzmacat))
+IF_UNLZMA(APPLET_ODDNAME(lzcat, unlzma, _BB_DIR_USR_BIN, _BB_SUID_DROP, lzcat))
+IF_LZMA(APPLET_ODDNAME(lzma, unlzma, _BB_DIR_USR_BIN, _BB_SUID_DROP, lzma))
 IF_LZOP(APPLET(lzop, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_LZOP(APPLET_ODDNAME(lzopcat, lzop, _BB_DIR_USR_BIN, _BB_SUID_DROP, lzopcat))
 IF_MAKEDEVS(APPLET(makedevs, _BB_DIR_SBIN, _BB_SUID_DROP))
@@ -417,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))
@@ -437,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/libbb.h b/include/libbb.h
index 58a5968c5..c9b3ffaa0 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -669,7 +669,7 @@ extern void *xmalloc_open_read_close(const char *filename, size_t *maxsz_p) FAST
  || ENABLE_FEATURE_SEAMLESS_BZ2 \
  || ENABLE_FEATURE_SEAMLESS_GZ \
  /* || ENABLE_FEATURE_SEAMLESS_Z */
-extern int setup_unzip_on_fd(int fd /*, int fail_if_not_detected*/) FAST_FUNC;
+extern void setup_unzip_on_fd(int fd /*, int fail_if_not_detected*/) FAST_FUNC;
 #else
 # define setup_unzip_on_fd(...) ((void)0)
 #endif
diff --git a/include/unarchive.h b/include/unarchive.h
index a834816ba..aa7ecec55 100644
--- a/include/unarchive.h
+++ b/include/unarchive.h
@@ -143,19 +143,24 @@ 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;
+/* xz unpacker takes .xz stream from offset 0 */
+IF_DESKTOP(long long) int unpack_xz_stream(int src_fd, int dst_fd) 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 */
 IF_DESKTOP(long long) int unpack_bz2_stream(int src_fd, int dst_fd) FAST_FUNC;
 IF_DESKTOP(long long) int unpack_gz_stream(int src_fd, int dst_fd) FAST_FUNC;
 IF_DESKTOP(long long) int unpack_gz_stream_with_info(int src_fd, int dst_fd, unpack_info_t *info) FAST_FUNC;
-IF_DESKTOP(long long) int unpack_Z_stream(int fd_in, int fd_out) FAST_FUNC;
+IF_DESKTOP(long long) int unpack_Z_stream(int src_fd, int dst_fd) FAST_FUNC;
 /* wrapper which checks first two bytes to be "BZ" */
 IF_DESKTOP(long long) int unpack_bz2_stream_prime(int src_fd, int dst_fd) FAST_FUNC;
 
+char* append_ext(char *filename, const char *expected_ext) FAST_FUNC;
 int bbunpack(char **argv,
-             char* (*make_new_name)(char *filename),
-             IF_DESKTOP(long long) int (*unpacker)(unpack_info_t *info)) FAST_FUNC;
+            IF_DESKTOP(long long) int FAST_FUNC (*unpacker)(unpack_info_t *info),
+            char* FAST_FUNC (*make_new_name)(char *filename, const char *expected_ext),
+            const char *expected_ext
+) FAST_FUNC;
 
 #if BB_MMU
 void open_transformer(int fd,
diff --git a/include/unicode.h b/include/unicode.h
index eaf67c833..e9e2bd14a 100644
--- a/include/unicode.h
+++ b/include/unicode.h
@@ -23,7 +23,8 @@ enum {
 
 #if !ENABLE_UNICODE_SUPPORT
 
-# define unicode_strlen(string) strlen(string)
+# define unicode_strlen(string)   strlen(string)
+# define unicode_strwidth(string) strlen(string)
 # define unicode_status UNICODE_OFF
 # define init_unicode() ((void)0)
 
@@ -49,7 +50,10 @@ enum {
 #  define ENABLE_UNICODE_BIDI_SUPPORT 0
 # endif
 
+/* Number of unicode chars. Falls back to strlen() on invalid unicode */
 size_t FAST_FUNC unicode_strlen(const char *string);
+/* Width on terminal */
+size_t FAST_FUNC unicode_strwidth(const char *string);
 enum {
         UNI_FLAG_PAD = (1 << 0),
 };
diff --git a/include/usage.h b/include/usage.h
index d53b86731..a9c4c4294 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -156,6 +156,11 @@
      "\n        -r      Repetitions" \
      "\n        -n      Start new tone" \
 
+#define blkid_trivial_usage \
+       ""
+#define blkid_full_usage "\n\n" \
+       "Print UUIDs of all filesystems"
+
 #define bootchartd_trivial_usage \
        "start [PROG ARGS]|stop|init"
 #define bootchartd_full_usage "\n\n" \
@@ -189,23 +194,15 @@
      "\n        stp BRIDGE [1/yes/on|0/no/off]  STP on/off" \
         ) \
 
-#define bunzip2_trivial_usage \
-       "[OPTIONS] [FILE]..."
-#define bunzip2_full_usage "\n\n" \
-       "Uncompress FILEs (or stdin)\n" \
-     "\nOptions:" \
-     "\n        -c      Write to stdout" \
-     "\n        -f      Force" \
-
 #define bzip2_trivial_usage \
        "[OPTIONS] [FILE]..."
 #define bzip2_full_usage "\n\n" \
        "Compress FILEs (or stdin) with bzip2 algorithm\n" \
      "\nOptions:" \
-     "\n        -c      Write to stdout" \
+     "\n        -1..9   Compression level" \
      "\n        -d      Decompress" \
+     "\n        -c      Write to stdout" \
      "\n        -f      Force" \
-     "\n        -1..-9  Compression level" \
 
 #define busybox_notes_usage \
        "Hello world!\n"
@@ -213,13 +210,14 @@
 #define lzop_trivial_usage \
        "[-cfvd123456789CF] [FILE]..."
 #define lzop_full_usage "\n\n" \
-       "        -c      Write to stdout" \
+       "Options:" \
+     "\n        -1..9   Compression level" \
+     "\n        -d      Decompress" \
+     "\n        -c      Write to stdout" \
      "\n        -f      Force" \
      "\n        -v      Verbose" \
-     "\n        -d      Decompress" \
      "\n        -F      Don't store or verify checksum" \
      "\n        -C      Also write checksum of compressed block" \
-     "\n        -1..9   Compression level" \
 
 #define lzopcat_trivial_usage \
        "[-vCF] [FILE]..."
@@ -230,28 +228,68 @@
 #define unlzop_trivial_usage \
        "[-cfvCF] [FILE]..."
 #define unlzop_full_usage "\n\n" \
-       "        -c      Write to stdout" \
+       "Options:" \
+     "\n        -c      Write to stdout" \
      "\n        -f      Force" \
      "\n        -v      Verbose" \
      "\n        -F      Don't store or verify checksum" \
 
+#define bunzip2_trivial_usage \
+       "[OPTIONS] [FILE]..."
+#define bunzip2_full_usage "\n\n" \
+       "Decompress FILEs (or stdin)\n" \
+     "\nOptions:" \
+     "\n        -c      Write to stdout" \
+     "\n        -f      Force" \
+
 #define bzcat_trivial_usage \
        "FILE"
 #define bzcat_full_usage "\n\n" \
-       "Uncompress to stdout"
+       "Decompress to stdout"
 
 #define unlzma_trivial_usage \
        "[OPTIONS] [FILE]..."
 #define unlzma_full_usage "\n\n" \
-       "Uncompress FILE (or stdin)\n" \
+       "Decompress FILE (or stdin)\n" \
+     "\nOptions:" \
+     "\n        -c      Write to stdout" \
+     "\n        -f      Force" \
+
+#define lzma_trivial_usage \
+       "-d [OPTIONS] [FILE]..."
+#define lzma_full_usage "\n\n" \
+       "Decompress FILE (or stdin)\n" \
+     "\nOptions:" \
+     "\n        -d      Decompress" \
+     "\n        -c      Write to stdout" \
+     "\n        -f      Force" \
+
+#define lzcat_trivial_usage \
+       "FILE"
+#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 lzmacat_trivial_usage \
+#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 lzmacat_full_usage "\n\n" \
-       "Uncompress to stdout"
+#define xzcat_full_usage "\n\n" \
+       "Decompress to stdout"
 
 #define cal_trivial_usage \
        "[-jy] [[MONTH] YEAR]"
@@ -262,11 +300,9 @@
      "\n        -y      Display the entire year" \
 
 #define cat_trivial_usage \
-       "[-u] [FILE]..."
+       "[FILE]..."
 #define cat_full_usage "\n\n" \
-       "Concatenate FILEs and print them to stdout\n" \
-     "\nOptions:" \
-     "\n        -u      Use unbuffered i/o (ignored)" \
+       "Concatenate FILEs and print them to stdout" \
 
 #define cat_example_usage \
        "$ cat /proc/uptime\n" \
@@ -555,7 +591,7 @@
      "\n        -L      Follow all symlinks" \
      "\n        -H      Follow symlinks on command line" \
      "\n        -p      Preserve file attributes if possible" \
-     "\n        -f      Force overwrite" \
+     "\n        -f      Overwrite" \
      "\n        -i      Prompt before overwrite" \
      "\n        -l,-s   Create (sym)links" \
 
@@ -1243,10 +1279,10 @@
      "\n        -H HEADS" \
      "\n        -S SECTORS" \
 
-#define blkid_trivial_usage \
-       ""
-#define blkid_full_usage "\n\n" \
-       "Print UUIDs of all filesystems"
+#define fgconsole_trivial_usage \
+        ""
+#define fgconsole_full_usage "\n\n" \
+        "Get active console"
 
 #define findfs_trivial_usage \
        "LABEL=label or UUID=uuid"
@@ -1605,7 +1641,7 @@
 #define gunzip_trivial_usage \
        "[OPTIONS] [FILE]..."
 #define gunzip_full_usage "\n\n" \
-       "Uncompress FILEs (or stdin)\n" \
+       "Decompress FILEs (or stdin)\n" \
      "\nOptions:" \
      "\n        -c      Write to stdout" \
      "\n        -f      Force" \
@@ -1623,8 +1659,8 @@
 #define gzip_full_usage "\n\n" \
        "Compress FILEs (or stdin)\n" \
      "\nOptions:" \
-     "\n        -c      Write to stdout" \
      "\n        -d      Decompress" \
+     "\n        -c      Write to stdout" \
      "\n        -f      Force" \
 
 #define gzip_example_usage \
@@ -4972,10 +5008,10 @@
 #define uncompress_trivial_usage \
        "[-cf] [FILE]..."
 #define uncompress_full_usage "\n\n" \
-       "Uncompress .Z file[s]\n" \
+       "Decompress .Z file[s]\n" \
      "\nOptions:" \
-     "\n        -c      Extract to stdout" \
-     "\n        -f      Overwrite an existing file" \
+     "\n        -c      Write to stdout" \
+     "\n        -f      Overwrite" \
 
 #define unexpand_trivial_usage \
        "[-fa][-t N] [FILE]..."
@@ -5017,8 +5053,8 @@
        "Extract files from ZIP archives\n" \
      "\nOptions:" \
      "\n        -l      List archive contents (with -q for short form)" \
-     "\n        -n      Never overwrite existing files (default)" \
-     "\n        -o      Overwrite files without prompting" \
+     "\n        -n      Never overwrite files (default)" \
+     "\n        -o      Overwrite" \
      "\n        -p      Send output to stdout" \
      "\n        -q      Quiet" \
      "\n        -x XLST Exclude these files" \
@@ -5219,7 +5255,7 @@
 #define zcat_trivial_usage \
        "FILE"
 #define zcat_full_usage "\n\n" \
-       "Uncompress to stdout"
+       "Decompress to stdout"
 
 #define zcip_trivial_usage \
        "[OPTIONS] IFACE SCRIPT"