Merge branch 'busybox' into merge

14 files changed, 55 insertions, 23 deletions

diff --git a/util-linux/fatattr.c b/util-linux/fatattr.c
index 5d933874a..6dca24a73 100644
--- a/util-linux/fatattr.c
+++ b/util-linux/fatattr.c
@@ -42,7 +42,7 @@
  * Extra space at the end is a hack to print space separator in file listing.
  * Let's hope no one ever passes space as an option char :)
  */
-static const char bit_to_char[] = "rhsvda67 ";
+static const char bit_to_char[] ALIGN1 = "rhsvda67 ";
 
 static inline unsigned long get_flag(char c)
 {
diff --git a/util-linux/flock.c b/util-linux/flock.c
index 05a747f72..1f7ade7c4 100644
--- a/util-linux/flock.c
+++ b/util-linux/flock.c
@@ -57,7 +57,6 @@ int flock_main(int argc UNUSED_PARAM, char **argv)
         /* If it is "flock FILE -c PROG", then -c isn't caught by getopt32:
          * we use "+" in order to support "flock -opt FILE PROG -with-opts",
          * we need to remove -c by hand.
-         * TODO: in upstream, -c 'PROG ARGS' means "run sh -c 'PROG ARGS'"
          */
         if (argv[0]
          && argv[0][0] == '-'
@@ -66,6 +65,9 @@ int flock_main(int argc UNUSED_PARAM, char **argv)
             )
         ) {
                 argv++;
+                if (argv[1])
+                        bb_error_msg_and_die("-c takes only one argument");
+                opt |= OPT_c;
         }
 
         if (OPT_s == LOCK_SH && OPT_x == LOCK_EX && OPT_n == LOCK_NB && OPT_u == LOCK_UN) {
@@ -90,8 +92,21 @@ int flock_main(int argc UNUSED_PARAM, char **argv)
                 bb_perror_nomsg_and_die();
         }
 
-        if (argv[0])
-                return spawn_and_wait(argv);
+        if (argv[0]) {
+                int rc;
+                if (opt & OPT_c) {
+                        /* -c 'PROG ARGS' means "run sh -c 'PROG ARGS'" */
+                        argv -= 2;
+                        argv[0] = (char*)get_shell_name();
+                        argv[1] = (char*)"-c";
+                        /* argv[2] = "PROG ARGS"; */
+                        /* argv[3] = NULL; */
+                }
+                rc = spawn_and_wait(argv);
+                if (rc < 0)
+                        bb_simple_perror_msg(argv[0]);
+                return rc;
+        }
 
         return EXIT_SUCCESS;
 }
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index 37fa56827..37514eb54 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -97,6 +97,7 @@
 //usage:       "If /dev/mdev.log file exists, debug log will be appended to it."
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include "xregex.h"
 
 /* "mdev -s" scans /sys/class/xxx, looking for directories which have dev
@@ -285,8 +286,9 @@ struct globals {
         struct rule cur_rule;
         char timestr[sizeof("HH:MM:SS.123456")];
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
+        setup_common_bufsiz(); \
         IF_NOT_FEATURE_MDEV_CONF(G.cur_rule.maj = -1;) \
         IF_NOT_FEATURE_MDEV_CONF(G.cur_rule.mode = 0660;) \
 } while (0)
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index b5d2c49b6..dcb53f008 100644
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -13,6 +13,7 @@
 //usage:     "\n        -L LBL  Label"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 #if ENABLE_SELINUX
 static void mkswap_selinux_setcontext(int fd, const char *path)
@@ -75,6 +76,7 @@ struct swap_header_v1 {
 
 #define NWORDS 129
 #define hdr ((struct swap_header_v1*)bb_common_bufsiz1)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 struct BUG_sizes {
         char swap_header_v1_wrong[sizeof(*hdr)  != (NWORDS * 4) ? -1 : 1];
@@ -92,6 +94,8 @@ int mkswap_main(int argc UNUSED_PARAM, char **argv)
         off_t len;
         const char *label = "";
 
+        INIT_G();
+
         opt_complementary = "-1"; /* at least one param */
         /* TODO: -p PAGESZ, -U UUID */
         getopt32(argv, "L:", &label);
diff --git a/util-linux/more.c b/util-linux/more.c
index 29984df8c..4812f1bc5 100644
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -26,6 +26,7 @@
 #include <conio.h>
 #endif
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 /* Support for FEATURE_USE_TERMIOS */
 
@@ -35,10 +36,10 @@ struct globals {
         struct termios new_settings;
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
-#define INIT_G() ((void)0)
 #define initial_settings (G.initial_settings)
 #define new_settings     (G.new_settings    )
 #define cin_fileno       (G.cin_fileno      )
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 #define setTermSettings(fd, argp) \
 do { \
diff --git a/util-linux/mount.c b/util-linux/mount.c
index c428f5827..c76f6ef61 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -223,6 +223,7 @@
 #define BB_MS_INVERTED_VALUE (1u << 31)
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #if ENABLE_FEATURE_MOUNT_LABEL
 # include "volume_id.h"
 #else
@@ -376,7 +377,7 @@ static const int32_t mount_options[] = {
         /* "remount" */ MS_REMOUNT  // action flag
 };
 
-static const char mount_option_str[] =
+static const char mount_option_str[] ALIGN1 =
         IF_FEATURE_MOUNT_LOOP(
                 "loop\0"
         )
@@ -447,7 +448,7 @@ struct globals {
         char getmntent_buf[1];
 } FIX_ALIASING;
 enum { GETMNTENT_BUFSIZE = COMMON_BUFSIZE - offsetof(struct globals, getmntent_buf) };
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define nfs_mount_version (G.nfs_mount_version)
 #if ENABLE_FEATURE_MOUNT_VERBOSE
 #define verbose           (G.verbose          )
@@ -456,7 +457,7 @@ enum { GETMNTENT_BUFSIZE = COMMON_BUFSIZE - offsetof(struct globals, getmntent_b
 #endif
 #define fslist            (G.fslist           )
 #define getmntent_buf     (G.getmntent_buf    )
-#define INIT_G() do { } while (0)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 #if ENABLE_FEATURE_MTAB_SUPPORT
 /*
@@ -1002,7 +1003,7 @@ enum {
 # define EDQUOT ENOSPC
 #endif
 /* Convert each NFSERR_BLAH into EBLAH */
-static const uint8_t nfs_err_stat[] = {
+static const uint8_t nfs_err_stat[] ALIGN1 = {
          1,  2,  5,  6, 13, 17,
         19, 20, 21, 22, 27, 28,
         30, 63, 66, 69, 70, 71
@@ -1015,7 +1016,7 @@ typedef uint8_t nfs_err_type;
 #else
 typedef uint16_t nfs_err_type;
 #endif
-static const nfs_err_type nfs_err_errnum[] = {
+static const nfs_err_type nfs_err_errnum[] ALIGN2 = {
         EPERM , ENOENT      , EIO      , ENXIO , EACCES, EEXIST,
         ENODEV, ENOTDIR     , EISDIR   , EINVAL, EFBIG , ENOSPC,
         EROFS , ENAMETOOLONG, ENOTEMPTY, EDQUOT, ESTALE, EREMOTE
diff --git a/util-linux/nsenter.c b/util-linux/nsenter.c
index b08b3dae7..6834292da 100644
--- a/util-linux/nsenter.c
+++ b/util-linux/nsenter.c
@@ -128,7 +128,7 @@ static const struct namespace_descr ns_list[] = {
 /*
  * Upstream nsenter doesn't support the short option for --preserve-credentials
  */
-static const char opt_str[] = "U::i::u::n::p::m::""t+S+G+r::w::F";
+static const char opt_str[] ALIGN1 = "U::i::u::n::p::m::""t+S+G+r::w::F";
 
 #if ENABLE_FEATURE_NSENTER_LONG_OPTS
 static const char nsenter_longopts[] ALIGN1 =
diff --git a/util-linux/script.c b/util-linux/script.c
index abcd73bff..86475c1f1 100644
--- a/util-linux/script.c
+++ b/util-linux/script.c
@@ -23,6 +23,7 @@
 //usage:        )
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 int script_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int script_main(int argc UNUSED_PARAM, char **argv)
@@ -108,11 +109,12 @@ int script_main(int argc UNUSED_PARAM, char **argv)
 
         if (child_pid) {
                 /* parent */
-#define buf bb_common_bufsiz1
                 struct pollfd pfd[2];
                 int outfd, count, loop;
                 double oldtime = ENABLE_SCRIPTREPLAY ? time(NULL) : 0;
                 smallint fd_count = 2;
+#define buf bb_common_bufsiz1
+                setup_common_bufsiz();
 
                 outfd = xopen(fname, mode);
                 pfd[0].fd = pty;
@@ -134,7 +136,7 @@ int script_main(int argc UNUSED_PARAM, char **argv)
                         }
                         if (pfd[0].revents) {
                                 errno = 0;
-                                count = safe_read(pty, buf, sizeof(buf));
+                                count = safe_read(pty, buf, COMMON_BUFSIZE);
                                 if (count <= 0 && errno != EAGAIN) {
                                         /* err/eof from pty: exit */
                                         goto restore;
@@ -157,7 +159,7 @@ int script_main(int argc UNUSED_PARAM, char **argv)
                                 }
                         }
                         if (pfd[1].revents) {
-                                count = safe_read(STDIN_FILENO, buf, sizeof(buf));
+                                count = safe_read(STDIN_FILENO, buf, COMMON_BUFSIZE);
                                 if (count <= 0) {
                                         /* err/eof from stdin: don't read stdin anymore */
                                         pfd[1].revents = 0;
@@ -176,7 +178,7 @@ int script_main(int argc UNUSED_PARAM, char **argv)
                  * (util-linux's script doesn't do this. buggy :) */
                 loop = 999;
                 /* pty is in O_NONBLOCK mode, we exit as soon as buffer is empty */
-                while (--loop && (count = safe_read(pty, buf, sizeof(buf))) > 0) {
+                while (--loop && (count = safe_read(pty, buf, COMMON_BUFSIZE)) > 0) {
                         full_write(STDOUT_FILENO, buf, count);
                         full_write(outfd, buf, count);
                 }
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index c29dd3071..6713852e5 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -28,6 +28,7 @@
 //usage:     "\n        -a      Stop swapping on all swap devices"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include <mntent.h>
 #ifndef __BIONIC__
 # include <sys/swap.h>
@@ -62,7 +63,7 @@
 struct globals {
         int flags;
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define g_flags (G.flags)
 #define save_g_flags()    int save_g_flags = g_flags
 #define restore_g_flags() g_flags = save_g_flags
@@ -71,7 +72,7 @@ struct globals {
 #define save_g_flags()    ((void)0)
 #define restore_g_flags() ((void)0)
 #endif
-#define INIT_G() do { } while (0)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 #define do_swapoff   (applet_name[5] == 'f')
 
diff --git a/util-linux/uevent.c b/util-linux/uevent.c
index 514a9e934..b98fe6160 100644
--- a/util-linux/uevent.c
+++ b/util-linux/uevent.c
@@ -25,11 +25,13 @@
 //usage:   "\n""        # uevent mdev & mdev -s"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include <linux/netlink.h>
 
 #define BUFFER_SIZE 16*1024
 
-#define env ((char **)&bb_common_bufsiz1)
+#define env ((char **)bb_common_bufsiz1)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 enum {
         MAX_ENV = COMMON_BUFSIZE / sizeof(env[0]) - 1,
 };
@@ -45,6 +47,8 @@ int uevent_main(int argc UNUSED_PARAM, char **argv)
         struct sockaddr_nl sa;
         int fd;
 
+        INIT_G();
+
         argv++;
 
         // Subscribe for UEVENT kernel messages
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 30bef1686..91da69674 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -34,6 +34,7 @@
 # define MNT_DETACH 0x00000002
 #endif
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 #if defined(__dietlibc__)
 // TODO: This does not belong here.
@@ -102,7 +103,8 @@ int umount_main(int argc UNUSED_PARAM, char **argv)
                 if (opt & OPT_ALL)
                         bb_error_msg_and_die("can't open '%s'", bb_path_mtab_file);
         } else {
-                while (getmntent_r(fp, &me, bb_common_bufsiz1, sizeof(bb_common_bufsiz1))) {
+                setup_common_bufsiz();
+                while (getmntent_r(fp, &me, bb_common_bufsiz1, COMMON_BUFSIZE)) {
                         /* Match fstype if passed */
                         if (!match_fstype(&me, fstype))
                                 continue;
diff --git a/util-linux/unshare.c b/util-linux/unshare.c
index d05cfdb6c..fa7086add 100644
--- a/util-linux/unshare.c
+++ b/util-linux/unshare.c
@@ -137,7 +137,7 @@ static const struct namespace_descr ns_list[] = {
  * we are forced to use "fake" letters for them.
  * '+': stop at first non-option.
  */
-static const char opt_str[] = "+muinpU""fr""\xfd::""\xfe:""\xff:";
+static const char opt_str[] ALIGN1 = "+muinpU""fr""\xfd::""\xfe:""\xff:";
 static const char unshare_longopts[] ALIGN1 =
         "mount\0"               Optional_argument       "\xf0"
         "uts\0"                 Optional_argument       "\xf1"
diff --git a/util-linux/volume_id/bcache.c b/util-linux/volume_id/bcache.c
index 648e44de5..fd40eb081 100644
--- a/util-linux/volume_id/bcache.c
+++ b/util-linux/volume_id/bcache.c
@@ -24,7 +24,7 @@
 #define SB_LABEL_SIZE      32
 #define SB_JOURNAL_BUCKETS 256U
 
-static const char bcache_magic[] = {
+static const char bcache_magic[] ALIGN1 = {
         0xc6, 0x85, 0x73, 0xf6, 0x4e, 0x1a, 0x45, 0xca,
         0x82, 0x65, 0xf5, 0x7f, 0x48, 0xba, 0x6d, 0x81
 };
diff --git a/util-linux/volume_id/luks.c b/util-linux/volume_id/luks.c
index 42bf87659..21cb26f51 100644
--- a/util-linux/volume_id/luks.c
+++ b/util-linux/volume_id/luks.c
@@ -40,7 +40,7 @@
 #define LUKS_SALTSIZE           32
 #define LUKS_NUMKEYS             8
 
-static const uint8_t LUKS_MAGIC[] = { 'L','U','K','S', 0xba, 0xbe };
+static const uint8_t LUKS_MAGIC[] ALIGN1 = { 'L','U','K','S', 0xba, 0xbe };
 
 struct luks_phdr {
         uint8_t         magic[LUKS_MAGIC_L];