14 files changed, 74 insertions, 60 deletions

diff --git a/archival/ar.c b/archival/ar.c
index 66930f0b8..eb734a685 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -48,19 +48,9 @@
 
 //kbuild:lib-$(CONFIG_AR) += ar.o
 
-//usage:#define ar_trivial_usage
-//usage:       "[-o] [-v] [-p] [-t] [-x] ARCHIVE FILES"
-//usage:#define ar_full_usage "\n\n"
-//usage:       "Extract or list FILES from an ar archive\n"
-//usage:     "\n        -o      Preserve original dates"
-//usage:     "\n        -p      Extract to stdout"
-//usage:     "\n        -t      List"
-//usage:     "\n        -x      Extract"
-//usage:     "\n        -v      Verbose"
-
 #include "libbb.h"
 #include "bb_archive.h"
-#include "ar.h"
+#include "ar_.h"
 
 #if ENABLE_FEATURE_AR_CREATE
 /* filter out entries with same names as specified on the command line */
@@ -236,23 +226,36 @@ static void FAST_FUNC header_verbose_list_ar(const file_header_t *file_header)
         );
 }
 
-#define AR_OPT_VERBOSE          (1 << 0)
-#define AR_OPT_PRESERVE_DATE    (1 << 1)
-/* "ar r" implies create, but warns about it. c suppresses warning.
- * bbox accepts but ignores it: */
-#define AR_OPT_CREATE           (1 << 2)
-
-#define AR_CMD_PRINT            (1 << 3)
-#define FIRST_CMD               AR_CMD_PRINT
-#define AR_CMD_LIST             (1 << 4)
-#define AR_CMD_EXTRACT          (1 << 5)
-#define AR_CMD_INSERT           (1 << 6)
+//usage:#define ar_trivial_usage
+//usage:       "x|p|t"IF_FEATURE_AR_CREATE("|r")" [-ov] ARCHIVE [FILE]..."
+//usage:#define ar_full_usage "\n\n"
+//usage:       "Extract or list FILEs from an ar archive"IF_FEATURE_AR_CREATE(", or create it")"\n"
+//usage:     "\n        x       Extract"
+//usage:     "\n        p       Extract to stdout"
+//usage:     "\n        t       List"
+//usage:        IF_FEATURE_AR_CREATE(
+//usage:     "\n        r       Create"
+//usage:        )
+//usage:     "\n        -o      Restore mtime"
+//usage:     "\n        -v      Verbose"
 
 int ar_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int ar_main(int argc UNUSED_PARAM, char **argv)
 {
         archive_handle_t *archive_handle;
         unsigned opt, t;
+        enum {
+                OPT_VERBOSE       = (1 << 0),
+                OPT_PRESERVE_DATE = (1 << 1),
+                /* "ar r" implies create, but warns about it. c suppresses warning.
+                 * bbox accepts but ignores it: */
+                OPT_CREATE        = (1 << 2),
+                CMD_PRINT         = (1 << 3),
+                FIRST_CMD         = CMD_PRINT,
+                CMD_LIST          = (1 << 4),
+                CMD_EXTRACT       = (1 << 5),
+                CMD_INSERT        = ((1 << 6) * ENABLE_FEATURE_AR_CREATE),
+        };
 
         archive_handle = init_handle();
 
@@ -272,26 +275,26 @@ int ar_main(int argc UNUSED_PARAM, char **argv)
         if (t & (t-1)) /* more than one of p,t,x[,r] are specified */
                 bb_show_usage();
 
-        if (opt & AR_CMD_PRINT) {
+        if (opt & CMD_PRINT) {
                 archive_handle->action_data = data_extract_to_stdout;
         }
-        if (opt & AR_CMD_LIST) {
+        if (opt & CMD_LIST) {
                 archive_handle->action_header = header_list;
         }
-        if (opt & AR_CMD_EXTRACT) {
+        if (opt & CMD_EXTRACT) {
                 archive_handle->action_data = data_extract_all;
         }
-        if (opt & AR_OPT_PRESERVE_DATE) {
+        if (opt & OPT_PRESERVE_DATE) {
                 archive_handle->ah_flags |= ARCHIVE_RESTORE_DATE;
         }
-        if (opt & AR_OPT_VERBOSE) {
+        if (opt & OPT_VERBOSE) {
                 archive_handle->action_header = header_verbose_list_ar;
         }
 #if ENABLE_FEATURE_AR_CREATE
         archive_handle->ar__name = *argv;
 #endif
         archive_handle->src_fd = xopen(*argv++,
-                        (opt & AR_CMD_INSERT)
+                        (opt & CMD_INSERT)
                                 ? O_RDWR | O_CREAT
                                 : O_RDONLY
         );
@@ -303,7 +306,7 @@ int ar_main(int argc UNUSED_PARAM, char **argv)
         }
 
 #if ENABLE_FEATURE_AR_CREATE
-        if (opt & AR_CMD_INSERT)
+        if (opt & CMD_INSERT)
                 return write_ar_archive(archive_handle);
 #endif
 
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 320fe4fd1..2beb92763 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -221,7 +221,7 @@ char* FAST_FUNC make_new_name_generic(char *filename, const char *expected_ext)
 //usage:#define uncompress_trivial_usage
 //usage:       "[-cf] [FILE]..."
 //usage:#define uncompress_full_usage "\n\n"
-//usage:       "Decompress .Z file[s]\n"
+//usage:       "Decompress FILEs (or stdin)\n"
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Overwrite"
 
@@ -463,7 +463,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //usage:#define unlzma_trivial_usage
 //usage:       "[-cfk] [FILE]..."
 //usage:#define unlzma_full_usage "\n\n"
-//usage:       "Decompress FILE (or stdin)\n"
+//usage:       "Decompress FILEs (or stdin)\n"
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
 //usage:     "\n        -k      Keep input files"
@@ -471,7 +471,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //usage:#define lzma_trivial_usage
 //usage:       "-d [-cfk] [FILE]..."
 //usage:#define lzma_full_usage "\n\n"
-//usage:       "Decompress FILE (or stdin)\n"
+//usage:       "Decompress FILEs (or stdin)\n"
 //usage:     "\n        -d      Decompress"
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
@@ -534,7 +534,7 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv)
 //usage:#define unxz_trivial_usage
 //usage:       "[-cfk] [FILE]..."
 //usage:#define unxz_full_usage "\n\n"
-//usage:       "Decompress FILE (or stdin)\n"
+//usage:       "Decompress FILEs (or stdin)\n"
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
 //usage:     "\n        -k      Keep input files"
@@ -543,7 +543,7 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv)
 //usage:#define xz_trivial_usage
 //usage:       "-d [-cfk] [FILE]..."
 //usage:#define xz_full_usage "\n\n"
-//usage:       "Decompress FILE (or stdin)\n"
+//usage:       "Decompress FILEs (or stdin)\n"
 //usage:     "\n        -d      Decompress"
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
diff --git a/archival/bzip2.c b/archival/bzip2.c
index d0390a92a..ac5db0880 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -50,7 +50,7 @@
 //kbuild:lib-$(CONFIG_BZIP2) += bzip2.o
 
 //usage:#define bzip2_trivial_usage
-//usage:       "[OPTIONS] [FILE]..."
+//usage:       "[-cfk" IF_FEATURE_BZIP2_DECOMPRESS("dt") "123456789] [FILE]..."
 //usage:#define bzip2_full_usage "\n\n"
 //usage:       "Compress FILEs (or stdin) with bzip2 algorithm\n"
 //usage:     "\n        -1..9   Compression level"
diff --git a/archival/cpio.c b/archival/cpio.c
index 94b4b8174..94303389e 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -68,7 +68,7 @@
 //usage:     "\n        -H newc Archive format"
 //usage:        )
 //usage:     "\n        -d      Make leading directories"
-//usage:     "\n        -m      Preserve mtime"
+//usage:     "\n        -m      Restore mtime"
 //usage:     "\n        -v      Verbose"
 //usage:     "\n        -u      Overwrite"
 //usage:     "\n        -F FILE Input (-t,-i,-p) or output (-o) file"
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 61631bd4d..8e1f9431d 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -1309,7 +1309,7 @@ postrm abort-install <old_version>
 postrm abort-upgrade <old_version>
 postrm disappear <overwriter> <version>
 */
-static const char *const all_control_files[] = {
+static const char *const all_control_files[] ALIGN_PTR = {
         "preinst", "postinst", "prerm", "postrm",
         "list", "md5sums", "shlibs", "conffiles",
         "config", "templates"
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index c2c4cbbcc..a5a80439d 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -28,7 +28,7 @@
 //usage:     "\n        -f      Print control fields"
 //usage:     "\n        -e      Extract control files to DIR (default: ./DEBIAN)"
 //usage:     "\n        -x      Extract files to DIR (no default)"
-//usage:     "\n        -X      Verbose -x"
+//usage:     "\n        -X      Verbose extract"
 //usage:
 //usage:#define dpkg_deb_example_usage
 //usage:       "$ dpkg-deb -X ./busybox_0.48-1_i386.deb /tmp\n"
diff --git a/archival/libarchive/bz/blocksort.c b/archival/libarchive/bz/blocksort.c
index 92d6d8251..062fd0f54 100644
--- a/archival/libarchive/bz/blocksort.c
+++ b/archival/libarchive/bz/blocksort.c
@@ -459,7 +459,7 @@ int mainGtU(EState* state,
  * usually small, typically <= 20.
  */
 static
-const uint32_t incs[14] = {
+const uint32_t incs[14] ALIGN4 = {
         1, 4, 13, 40, 121, 364, 1093, 3280,
         9841, 29524, 88573, 265720,
         797161, 2391484
diff --git a/archival/libarchive/data_extract_all.c b/archival/libarchive/data_extract_all.c
index 3142405a3..049c2c156 100644
--- a/archival/libarchive/data_extract_all.c
+++ b/archival/libarchive/data_extract_all.c
@@ -159,6 +159,10 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
                 break;
         }
         case S_IFDIR:
+//TODO: this causes problems if tarball contains a r-xr-xr-x directory:
+// we create this directory, and then fail to create files inside it
+// (if tar xf isn't run as root).
+// GNU tar works around this by chmod-ing directories *after* all files are extracted.
                 res = mkdir(dst_name, file_header->mode);
                 if ((res != 0)
                  && (errno != EISDIR) /* btw, Linux doesn't return this */
diff --git a/archival/libarchive/data_extract_to_command.c b/archival/libarchive/data_extract_to_command.c
index 0fcabb4a9..f8b2ff8d2 100644
--- a/archival/libarchive/data_extract_to_command.c
+++ b/archival/libarchive/data_extract_to_command.c
@@ -20,7 +20,7 @@ enum {
         TAR_MAX,
 };
 
-static const char *const tar_var[] = {
+static const char *const tar_var[] ALIGN_PTR = {
         // "FILETYPE",
         "MODE",
         "FILENAME",
diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c
index c0332d414..b2a3eb1c2 100644
--- a/archival/libarchive/decompress_gunzip.c
+++ b/archival/libarchive/decompress_gunzip.c
@@ -194,14 +194,14 @@ struct cp_ext {
 };
 /* Copy lengths and extra bits for literal codes 257..285 */
 /* note: see note #13 above about the 258 in this list. */
-static const struct cp_ext lit = {
+static const struct cp_ext lit ALIGN2 = {
         /*257 258 259 260 261 262 263 264 265 266 267 268 269 270 271  272  273  274  275  276   277   278   279   280   281   282   283    284    285 */
         /*0   1   2   3   4   5   6   7   8   9   10  11  12  13   14   15   16   17   18   19    20    21    22    23    24    25    26     27     28     29  30 */
         { 3,  4,  5,  6,  7,  8,  9,  10, 11, 13, 15, 17, 19, 23,  27,  31,  35,  43,  51,  59,   67,   83,   99,  115,  131,  163,  195,   227,   258,     0, 0  },
         { 0,  0,  0,  0,  0,  0,  0,   0,  1,  1,  1,  1,  2,  2,   2,   2,   3,   3,   3,   3,    4,    4,    4,    4,    5,    5,    5,     5,     0,    99, 99 } /* 99 == invalid */
 };
 /* Copy offsets and extra bits for distance codes 0..29 */
-static const struct cp_ext dist = {
+static const struct cp_ext dist ALIGN2 = {
         /*0   1   2   3   4   5   6   7   8   9   10  11  12  13   14   15   16   17   18   19    20    21    22    23    24    25    26     27     28     29 */
         { 1,  2,  3,  4,  5,  7,  9,  13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577 },
         { 0,  0,  0,  0,  1,  1,  2,   2,  3,  3,  4,  4,  5,  5,   6,   6,   7,   7,   8,   8,    9,    9,   10,   10,   11,   11,   12,    12,    13,    13 }
diff --git a/archival/libarchive/get_header_ar.c b/archival/libarchive/get_header_ar.c
index b6ecd596c..3a19d6ff7 100644
--- a/archival/libarchive/get_header_ar.c
+++ b/archival/libarchive/get_header_ar.c
@@ -6,7 +6,7 @@
  */
 #include "libbb.h"
 #include "bb_archive.h"
-#include "ar.h"
+#include "ar_.h"
 
 /* WARNING: Clobbers str[len], so fields must be read in reverse order! */
 static unsigned read_num(char *str, int base, int len)
diff --git a/archival/libarchive/unpack_ar_archive.c b/archival/libarchive/unpack_ar_archive.c
index 584c18ce8..125d424c9 100644
--- a/archival/libarchive/unpack_ar_archive.c
+++ b/archival/libarchive/unpack_ar_archive.c
@@ -4,7 +4,7 @@
  */
 #include "libbb.h"
 #include "bb_archive.h"
-#include "ar.h"
+#include "ar_.h"
 
 void FAST_FUNC unpack_ar_archive(archive_handle_t *ar_archive)
 {
diff --git a/archival/rpm.c b/archival/rpm.c
index 0d8f641b9..63d13d0e1 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -83,7 +83,9 @@ struct globals {
         void *map;
         rpm_index *mytags;
         int tagcount;
-        unsigned mapsize, pagesize;
+        unsigned mapsize;
+        IF_VARIABLE_ARCH_PAGESIZE(unsigned pagesize;)
+#define G_pagesize cached_pagesize(G.pagesize)
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { setup_common_bufsiz(); } while (0)
@@ -142,11 +144,11 @@ static int rpm_gettags(const char *filename)
 
 #if !ENABLE_PLATFORM_MINGW32
         /* Map the store */
-        storepos = (storepos + G.pagesize) & -(int)G.pagesize;
+        storepos = (storepos + G_pagesize) & -(int)G_pagesize;
         /* remember size for munmap */
         G.mapsize = storepos;
         /* some NOMMU systems prefer MAP_PRIVATE over MAP_SHARED */
-        G.map = mmap(0, storepos, PROT_READ, MAP_PRIVATE, fd, 0);
+        G.map = mmap_read(fd, storepos);
         if (G.map == MAP_FAILED)
                 bb_perror_msg_and_die("mmap '%s'", filename);
 #else
@@ -368,7 +370,7 @@ int rpm_main(int argc, char **argv)
         int opt, func = 0;
 
         INIT_G();
-        G.pagesize = getpagesize();
+        INIT_PAGESIZE(G.pagesize);
 
         while ((opt = getopt(argc, argv, "iqpldc")) != -1) {
                 switch (opt) {
@@ -535,7 +537,7 @@ int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
         int rpm_fd;
 
         INIT_G();
-        G.pagesize = getpagesize();
+        INIT_PAGESIZE(G.pagesize);
 
         rpm_fd = rpm_gettags(argv[1]);
 
diff --git a/archival/tar.c b/archival/tar.c
index 1796d4c60..6c1591bdc 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -794,7 +794,7 @@ static llist_t *append_file_list_to_list(llist_t *list)
 //usage:        IF_FEATURE_TAR_NOPRESERVE_TIME("m")
 //usage:        "vokO] "
 //usage:        "[-f TARFILE] [-C DIR] "
-//usage:        IF_FEATURE_TAR_FROM("[-T FILE] [-X FILE] "IF_FEATURE_TAR_LONG_OPTIONS("[--exclude PATTERN]... "))
+//usage:        IF_FEATURE_TAR_FROM("[-T FILE] [-X FILE] "IF_FEATURE_TAR_LONG_OPTIONS("[OPTION]... "))
 //usage:        "[FILE]..."
 //usage:#define tar_full_usage "\n\n"
 //usage:        IF_FEATURE_TAR_CREATE("Create, extract, ")
@@ -828,6 +828,11 @@ static llist_t *append_file_list_to_list(llist_t *list)
 //usage:        IF_FEATURE_SEAMLESS_BZ2(
 //usage:     "\n        -j      (De)compress using bzip2"
 //usage:        )
+//usage:        IF_FEATURE_SEAMLESS_LZMA(
+//usage:        IF_FEATURE_TAR_LONG_OPTIONS(
+//usage:     "\n        --lzma  (De)compress using lzma"
+//usage:        )
+//usage:        )
 //usage:     "\n        -a      (De)compress based on extension"
 //usage:        IF_FEATURE_TAR_CREATE(
 //usage:     "\n        -h      Follow symlinks"
@@ -839,21 +844,21 @@ static llist_t *append_file_list_to_list(llist_t *list)
 //usage:     "\n        --exclude PATTERN       Glob pattern to exclude"
 //usage:        )
 //usage:        )
+//usage:        IF_FEATURE_TAR_LONG_OPTIONS(
+//usage:     "\n        --overwrite             Replace existing files"
+//usage:     "\n        --strip-components NUM  NUM of leading components to strip"
+//usage:     "\n        --no-recursion          Don't descend in directories"
+//usage:     "\n        --numeric-owner         Use numeric user:group"
+//usage:     "\n        --no-same-permissions   Don't restore access permissions"
+//usage:        IF_FEATURE_TAR_TO_COMMAND(
+//usage:     "\n        --to-command COMMAND    Pipe files to COMMAND"
+//usage:        )
+//usage:        )
 //usage:
 //usage:#define tar_example_usage
 //usage:       "$ zcat /tmp/tarball.tar.gz | tar -xf -\n"
 //usage:       "$ tar -cf /tmp/tarball.tar /usr/local\n"
 
-// Supported but aren't in --help:
-//      lzma
-//      no-recursion
-//      numeric-owner
-//      no-same-permissions
-//      overwrite
-//IF_FEATURE_TAR_TO_COMMAND(
-//      to-command
-//)
-
 enum {
         OPTBIT_KEEP_OLD = 8,
         IF_FEATURE_TAR_CREATE(   OPTBIT_CREATE      ,)