Merge branch 'busybox' into merge

12 files changed, 138 insertions, 92 deletions

diff --git a/coreutils/cat.c b/coreutils/cat.c
index 7e35fa5ee..5f02233ca 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -168,9 +168,12 @@ static int catv(unsigned opts, char **argv)
 int cat_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int cat_main(int argc UNUSED_PARAM, char **argv)
 {
+#if ENABLE_FEATURE_CATV || ENABLE_FEATURE_CATN
         unsigned opts;
 
-        opts = getopt32(argv, IF_FEATURE_CATV("^")
+        opts =
+#endif
+        getopt32(argv, IF_FEATURE_CATV("^")
                 /* -u is ignored ("unbuffered") */
                 IF_FEATURE_CATV("etvA")IF_FEATURE_CATN("nb")"u"
                 IF_FEATURE_CATV("\0" "Aetv" /* -A == -vet */)
diff --git a/coreutils/chown.c b/coreutils/chown.c
index 985d18d6f..6429fd030 100644
--- a/coreutils/chown.c
+++ b/coreutils/chown.c
@@ -128,9 +128,9 @@ int chown_main(int argc UNUSED_PARAM, char **argv)
         struct param_t param;
 
 #if ENABLE_FEATURE_CHOWN_LONG_OPTIONS
-        opt = getopt32long(argv, "^" OPT_STR "\0" "=2", chown_longopts);
+        opt = getopt32long(argv, "^" OPT_STR "\0" "-2", chown_longopts);
 #else
-        opt = getopt32(argv, "^" OPT_STR "\0" "=2");
+        opt = getopt32(argv, "^" OPT_STR "\0" "-2");
 #endif
         argv += optind;
 
diff --git a/coreutils/cksum.c b/coreutils/cksum.c
index 059a33310..e46e249f2 100644
--- a/coreutils/cksum.c
+++ b/coreutils/cksum.c
@@ -31,9 +31,6 @@ int cksum_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int cksum_main(int argc UNUSED_PARAM, char **argv)
 {
         uint32_t *crc32_table = crc32_filltable(NULL, 1);
-        uint32_t crc;
-        off_t length, filesize;
-        int bytes_read;
         int exit_code = EXIT_SUCCESS;
 
 #if ENABLE_DESKTOP
@@ -45,38 +42,42 @@ int cksum_main(int argc UNUSED_PARAM, char **argv)
 
         setup_common_bufsiz();
         do {
+                uint32_t crc;
+                off_t filesize;
                 int fd = open_or_warn_stdin(*argv ? *argv : bb_msg_standard_input);
 
                 if (fd < 0) {
                         exit_code = EXIT_FAILURE;
                         continue;
                 }
-                crc = 0;
-                length = 0;
 
+                crc = 0;
+                filesize = 0;
 #define read_buf bb_common_bufsiz1
-                while ((bytes_read = safe_read(fd, read_buf, COMMON_BUFSIZE)) > 0) {
-                        length += bytes_read;
+                for (;;) {
+                        uoff_t t;
+                        int bytes_read = safe_read(fd, read_buf, COMMON_BUFSIZE);
+                        if (bytes_read > 0) {
+                                filesize += bytes_read;
+                        } else {
+                                /* Checksum filesize bytes, LSB first, and exit */
+                                close(fd);
+                                fd = -1; /* break flag */
+                                t = filesize;
+                                bytes_read = 0;
+                                while (t != 0) {
+                                        read_buf[bytes_read++] = (uint8_t)t;
+                                        t >>= 8;
+                                }
+                        }
                         crc = crc32_block_endian1(crc, read_buf, bytes_read, crc32_table);
+                        if (fd < 0)
+                                break;
                 }
-                close(fd);
-
-                filesize = length;
 
-                while (length) {
-                        crc = (crc << 8) ^ crc32_table[(uint8_t)(crc >> 24) ^ (uint8_t)length];
-                        /* must ensure that shift is unsigned! */
-                        if (sizeof(length) <= sizeof(unsigned))
-                                length = (unsigned)length >> 8;
-                        else if (sizeof(length) <= sizeof(unsigned long))
-                                length = (unsigned long)length >> 8;
-                        else
-                                length = (unsigned long long)length >> 8;
-                }
                 crc = ~crc;
-
-                printf((*argv ? "%"PRIu32" %"OFF_FMT"i %s\n" : "%"PRIu32" %"OFF_FMT"i\n"),
-                                crc, filesize, *argv);
+                printf((*argv ? "%u %"OFF_FMT"u %s\n" : "%u %"OFF_FMT"u\n"),
+                                (unsigned)crc, filesize, *argv);
         } while (*argv && *++argv);
 
         fflush_stdout_and_exit(exit_code);
diff --git a/coreutils/cp.c b/coreutils/cp.c
index 5b34c27e7..455bffbba 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -26,6 +26,7 @@
 //config:       Also add support for --parents option.
 
 //applet:IF_CP(APPLET_NOEXEC(cp, cp, BB_DIR_BIN, BB_SUID_DROP, cp))
+/* NOEXEC despite cases when it can be a "runner" (cp -r LARGE_DIR NEW_DIR) */
 
 //kbuild:lib-$(CONFIG_CP) += cp.o
 
@@ -47,6 +48,7 @@
 //usage:     "\n        -f      Overwrite"
 //usage:     "\n        -i      Prompt before overwrite"
 //usage:     "\n        -l,-s   Create (sym)links"
+//usage:     "\n        -T      Treat DEST as a normal file"
 //usage:     "\n        -u      Copy only newer files"
 
 #include "libbb.h"
@@ -92,13 +94,18 @@ int cp_main(int argc, char **argv)
                 "no-dereference\0" No_argument "P"
                 "recursive\0"      No_argument "R"
                 "symbolic-link\0"  No_argument "s"
+                "no-target-directory\0" No_argument "T"
                 "verbose\0"        No_argument "v"
                 "update\0"         No_argument "u"
                 "remove-destination\0" No_argument "\xff"
                 "parents\0"        No_argument "\xfe"
         );
 #else
-        flags = getopt32(argv, FILEUTILS_CP_OPTSTR);
+        flags = getopt32(argv, "^"
+                FILEUTILS_CP_OPTSTR
+                "\0"
+                "-2:l--s:s--l:Pd:rRd:Rd:apdR"
+        );
 #endif
         /* Options of cp from GNU coreutils 6.10:
          * -a, --archive
@@ -121,6 +128,8 @@ int cp_main(int argc, char **argv)
          *      remove each existing destination file before attempting to open
          * --parents
          *      use full source file name under DIRECTORY
+         * -T, --no-target-directory
+         *      treat DEST as a normal file
          * NOT SUPPORTED IN BBOX:
          * --backup[=CONTROL]
          *      make a backup of each existing destination file
@@ -139,8 +148,6 @@ int cp_main(int argc, char **argv)
          *      override the usual backup suffix
          * -t, --target-directory=DIRECTORY
          *      copy all SOURCE arguments into DIRECTORY
-         * -T, --no-target-directory
-         *      treat DEST as a normal file
          * -x, --one-file-system
          *      stay on this file system
          * -Z, --context=CONTEXT
@@ -175,6 +182,12 @@ int cp_main(int argc, char **argv)
                 if (d_flags < 0)
                         return EXIT_FAILURE;
 
+                if (flags & FILEUTILS_NO_TARGET_DIR) { /* -T */
+                        if (!(s_flags & 2) && (d_flags & 2))
+                                /* cp -T NOTDIR DIR */
+                                bb_error_msg_and_die("'%s' is a directory", last);
+                }
+
 #if ENABLE_FEATURE_CP_LONG_OPTIONS
                 //bb_error_msg("flags:%x FILEUTILS_RMDEST:%x OPT_parents:%x",
                 //      flags, FILEUTILS_RMDEST, OPT_parents);
@@ -192,11 +205,14 @@ int cp_main(int argc, char **argv)
                 if (!((s_flags | d_flags) & 2)
                     /* ...or: recursing, the 1st is a directory, and the 2nd doesn't exist... */
                  || ((flags & FILEUTILS_RECUR) && (s_flags & 2) && !d_flags)
+                 || (flags & FILEUTILS_NO_TARGET_DIR)
                 ) {
                         /* Do a simple copy */
                         dest = last;
                         goto DO_COPY; /* NB: argc==2 -> *++argv==last */
                 }
+        } else if (flags & FILEUTILS_NO_TARGET_DIR) {
+                bb_error_msg_and_die("too many arguments");
         }
 
         while (1) {
diff --git a/coreutils/dd.c b/coreutils/dd.c
index 14d270a1e..178576752 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -37,7 +37,7 @@
 //config:       elapsed time and speed.
 //config:
 //config:config FEATURE_DD_IBS_OBS
-//config:       bool "Enable ibs, obs and conv options"
+//config:       bool "Enable ibs, obs, iflag and conv options"
 //config:       default y
 //config:       depends on DD
 //config:       help
@@ -57,7 +57,7 @@
 
 //usage:#define dd_trivial_usage
 //usage:       "[if=FILE] [of=FILE] " IF_FEATURE_DD_IBS_OBS("[ibs=N] [obs=N] ") "[bs=N] [count=N] [skip=N]\n"
-//usage:       "        [seek=N]" IF_FEATURE_DD_IBS_OBS(" [conv=notrunc|noerror|sync|fsync] [iflag=skip_bytes]")
+//usage:       "        [seek=N]" IF_FEATURE_DD_IBS_OBS(" [conv=notrunc|noerror|sync|fsync] [iflag=skip_bytes|fullblock]")
 //usage:#define dd_full_usage "\n\n"
 //usage:       "Copy a file with converting and formatting\n"
 //usage:     "\n        if=FILE         Read from FILE instead of stdin"
@@ -79,6 +79,7 @@
 //usage:     "\n        conv=fsync      Physically write data out before finishing"
 //usage:     "\n        conv=swab       Swap every pair of bytes"
 //usage:     "\n        iflag=skip_bytes        skip=N is in bytes"
+//usage:     "\n        iflag=fullblock Read full blocks"
 //usage:        )
 //usage:        IF_FEATURE_DD_STATUS(
 //usage:     "\n        status=noxfer   Suppress rate output"
@@ -130,11 +131,12 @@ enum {
         /* start of input flags */
         FLAG_IFLAG_SHIFT = 5,
         FLAG_SKIP_BYTES = (1 << 5) * ENABLE_FEATURE_DD_IBS_OBS,
+        FLAG_FULLBLOCK = (1 << 6) * ENABLE_FEATURE_DD_IBS_OBS,
         /* end of input flags */
-        FLAG_TWOBUFS = (1 << 6) * ENABLE_FEATURE_DD_IBS_OBS,
-        FLAG_COUNT   = 1 << 7,
-        FLAG_STATUS_NONE = 1 << 8,
-        FLAG_STATUS_NOXFER = 1 << 9,
+        FLAG_TWOBUFS = (1 << 7) * ENABLE_FEATURE_DD_IBS_OBS,
+        FLAG_COUNT   = 1 << 8,
+        FLAG_STATUS_NONE = 1 << 9,
+        FLAG_STATUS_NOXFER = 1 << 10,
 };
 
 static void dd_output_status(int UNUSED_PARAM cur_signal)
@@ -195,14 +197,18 @@ static bool write_and_stats(const void *buf, size_t len, size_t obs,
         ssize_t n = full_write_or_warn(buf, len, filename);
         if (n < 0)
                 return 1;
-        if ((size_t)n == obs)
-                G.out_full++;
-        else if (n) /* > 0 */
-                G.out_part++;
 #if ENABLE_FEATURE_DD_THIRD_STATUS_LINE
         G.total_bytes += n;
 #endif
-        return 0;
+        if ((size_t)n == obs) {
+                G.out_full++;
+                return 0;
+        }
+        if ((size_t)n == len) {
+                G.out_part++;
+                return 0;
+        }
+        return 1;
 }
 
 #if ENABLE_LFS
@@ -251,7 +257,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         static const char conv_words[] ALIGN1 =
                 "notrunc\0""sync\0""noerror\0""fsync\0""swab\0";
         static const char iflag_words[] ALIGN1 =
-                "skip_bytes\0";
+                "skip_bytes\0""fullblock\0";
 #endif
 #if ENABLE_FEATURE_DD_STATUS
         static const char status_words[] ALIGN1 =
@@ -290,6 +296,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         /* Partially implemented: */
         //swab          swap every pair of input bytes: will abort on non-even reads
                 OP_iflag_skip_bytes,
+                OP_iflag_fullblock,
 #endif
         };
         smallint exitcode = EXIT_FAILURE;
@@ -456,7 +463,13 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                 size_t blocksz = (G.flags & FLAG_SKIP_BYTES) ? 1 : ibs;
                 if (lseek(ifd, skip * blocksz, SEEK_CUR) < 0) {
                         do {
-                                ssize_t n = safe_read(ifd, ibuf, blocksz);
+                                ssize_t n;
+#if ENABLE_FEATURE_DD_IBS_OBS
+                                if (G.flags & FLAG_FULLBLOCK)
+                                        n = full_read(ifd, ibuf, blocksz);
+                                else
+#endif
+                                        n = safe_read(ifd, ibuf, blocksz);
                                 if (n < 0)
                                         goto die_infile;
                                 if (n == 0)
@@ -477,6 +490,11 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                         n = ibs;
                 }
                 else
+#if ENABLE_FEATURE_DD_IBS_OBS
+                if (G.flags & FLAG_FULLBLOCK)
+                        n = full_read(ifd, ibuf, ibs);
+                else
+#endif
                         n = safe_read(ifd, ibuf, ibs);
                 if (n == 0)
                         break;
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 22286d713..4cc9517b1 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -482,12 +482,11 @@ static NOINLINE unsigned display_single(const struct dnode *dn)
         int opt;
 #if ENABLE_FEATURE_LS_FILETYPES || ENABLE_FEATURE_LS_COLOR
         struct stat statbuf;
-        char append;
 #endif
-
 #if ENABLE_FEATURE_LS_FILETYPES
-        append = append_char(dn->dn_mode);
+        char append = append_char(dn->dn_mode);
 #endif
+
         opt = option_mask32;
 
         /* Do readlink early, so that if it fails, error message
diff --git a/coreutils/mknod.c b/coreutils/mknod.c
index 565b33d20..d57167f7d 100644
--- a/coreutils/mknod.c
+++ b/coreutils/mknod.c
@@ -20,7 +20,7 @@
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
 
 //usage:#define mknod_trivial_usage
-//usage:       "[-m MODE] " IF_SELINUX("[-Z] ") "NAME TYPE MAJOR MINOR"
+//usage:       "[-m MODE] " IF_SELINUX("[-Z] ") "NAME TYPE [MAJOR MINOR]"
 //usage:#define mknod_full_usage "\n\n"
 //usage:       "Create a special file (block, character, or pipe)\n"
 //usage:     "\n        -m MODE Creation mode (default a=rw)"
@@ -30,7 +30,7 @@
 //usage:     "\nTYPE:"
 //usage:     "\n        b       Block device"
 //usage:     "\n        c or u  Character device"
-//usage:     "\n        p       Named pipe (MAJOR and MINOR are ignored)"
+//usage:     "\n        p       Named pipe (MAJOR MINOR must be omitted)"
 //usage:
 //usage:#define mknod_example_usage
 //usage:       "$ mknod /dev/fd0 b 2 0\n"
@@ -47,40 +47,40 @@ static const char modes_chars[] ALIGN1 = { 'p', 'c', 'u', 'b', 0, 1, 1, 2 };
 static const mode_t modes_cubp[] = { S_IFIFO, S_IFCHR, S_IFBLK };
 
 int mknod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int mknod_main(int argc, char **argv)
+int mknod_main(int argc UNUSED_PARAM, char **argv)
 {
         mode_t mode;
         dev_t dev;
-        const char *name;
+        const char *type, *arg;
 
         mode = getopt_mk_fifo_nod(argv);
         argv += optind;
-        argc -= optind;
+        //argc -= optind;
 
-        if (argc >= 2) {
-                name = strchr(modes_chars, argv[1][0]);
-                if (name != NULL) {
-                        mode |= modes_cubp[(int)(name[4])];
+        if (!argv[0] || !argv[1])
+                bb_show_usage();
+        type = strchr(modes_chars, argv[1][0]);
+        if (!type)
+                bb_show_usage();
 
-                        dev = 0;
-                        if (*name != 'p') {
-                                argc -= 2;
-                                if (argc == 2) {
-                                        /* Autodetect what the system supports; these macros should
-                                         * optimize out to two constants. */
-                                        dev = makedev(xatoul_range(argv[2], 0, major(UINT_MAX)),
-                                                        xatoul_range(argv[3], 0, minor(UINT_MAX)));
-                                }
-                        }
+        mode |= modes_cubp[(int)(type[4])];
 
-                        if (argc == 2) {
-                                name = *argv;
-                                if (mknod(name, mode, dev) == 0) {
-                                        return EXIT_SUCCESS;
-                                }
-                                bb_simple_perror_msg_and_die(name);
-                        }
-                }
+        dev = 0;
+        arg = argv[2];
+        if (*type != 'p') {
+                if (!argv[2] || !argv[3])
+                        bb_show_usage();
+                /* Autodetect what the system supports; these macros should
+                 * optimize out to two constants. */
+                dev = makedev(xatoul_range(argv[2], 0, major(UINT_MAX)),
+                                xatoul_range(argv[3], 0, minor(UINT_MAX)));
+                arg = argv[4];
         }
-        bb_show_usage();
+        if (arg)
+                bb_show_usage();
+
+        if (mknod(argv[0], mode, dev) != 0) {
+                bb_simple_perror_msg_and_die(argv[0]);
+        }
+        return EXIT_SUCCESS;
 }
diff --git a/coreutils/mv.c b/coreutils/mv.c
index 10cbc506f..aeafd1e40 100644
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -17,7 +17,8 @@
 //config:       help
 //config:       mv is used to move or rename files or directories.
 
-//applet:IF_MV(APPLET(mv, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_MV(APPLET_NOEXEC(mv, mv, BB_DIR_BIN, BB_SUID_DROP, mv))
+/* NOEXEC despite cases when it can be a "runner" (mv LARGE_DIR OTHER_FS) */
 
 //kbuild:lib-$(CONFIG_MV) += mv.o
 
diff --git a/coreutils/nice.c b/coreutils/nice.c
index d6818cf00..aa8b06cce 100644
--- a/coreutils/nice.c
+++ b/coreutils/nice.c
@@ -26,7 +26,7 @@
 #include "libbb.h"
 
 int nice_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int nice_main(int argc, char **argv)
+int nice_main(int argc UNUSED_PARAM, char **argv)
 {
         int old_priority, adjustment;
 
@@ -40,18 +40,21 @@ int nice_main(int argc, char **argv)
         adjustment = 10;  /* Set default adjustment. */
 
         if (argv[0][0] == '-') {
-                if (argv[0][1] == 'n') { /* -n */
-                        if (argv[0][2]) { /* -nNNNN (w/o space) */
-                                argv[0] += 2; argv--; argc++;
+                char *nnn = argv[0] + 1;
+                if (nnn[0] == 'n') { /* -n */
+                        nnn += 1;
+                        if (!nnn[0]) { /* "-n NNN" */
+                                nnn = *++argv;
                         }
-                } else { /* -NNN (NNN may be negative) == -n NNN */
-                        argv[0] += 1; argv--; argc++;
+                        /* else: "-nNNN" (w/o space) */
                 }
-                if (argc < 4) {  /* Missing priority and/or utility! */
+                /* else: "-NNN" (NNN may be negative) - same as "-n NNN" */
+
+                if (!nnn || !argv[1]) {  /* Missing priority or PROG! */
                         bb_show_usage();
                 }
-                adjustment = xatoi_range(argv[1], INT_MIN/2, INT_MAX/2);
-                argv += 2;
+                adjustment = xatoi_range(nnn, INT_MIN/2, INT_MAX/2);
+                argv++;
         }
 
         {  /* Set our priority. */
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index df7354b7b..645a05f57 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -1378,9 +1378,13 @@ int od_main(int argc UNUSED_PARAM, char **argv)
         }
 
 #ifdef DEBUG
-        for (i = 0; i < G.n_specs; i++) {
-                printf("%d: fmt=\"%s\" width=%d\n",
-                        i, spec[i].fmt_string, width_bytes[spec[i].size]);
+        {
+                int i;
+                for (i = 0; i < G.n_specs; i++) {
+                        printf("%d: fmt='%s' width=%d\n",
+                                i, G.spec[i].fmt_string,
+                                width_bytes[G.spec[i].size]);
+                }
         }
 #endif
 
diff --git a/coreutils/stat.c b/coreutils/stat.c
index 177ced2f9..41f6d103c 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -758,10 +758,13 @@ int stat_main(int argc UNUSED_PARAM, char **argv)
         IF_FEATURE_STAT_FORMAT(char *format = NULL;)
         int i;
         int ok;
-        unsigned opts;
         statfunc_ptr statfunc = do_stat;
+#if ENABLE_FEATURE_STAT_FILESYSTEM || ENABLE_SELINUX
+        unsigned opts;
 
-        opts = getopt32(argv, "^"
+        opts =
+#endif
+        getopt32(argv, "^"
                 "tL"
                 IF_FEATURE_STAT_FILESYSTEM("f")
                 IF_SELINUX("Z")
diff --git a/coreutils/uname.c b/coreutils/uname.c
index 57039b1bf..765809658 100644
--- a/coreutils/uname.c
+++ b/coreutils/uname.c
@@ -127,11 +127,9 @@ int uname_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
         uname_info_t uname_info;
         IF_UNAME(const char *unknown_str = "unknown";)
-        unsigned toprint;
-
-        toprint = (1 << 4); /* "arch" = "uname -m" */
-
 #if ENABLE_UNAME
+        unsigned toprint = (1 << 4); /* "arch" = "uname -m" */
+
         if (!ENABLE_BB_ARCH || applet_name[0] == 'u') {
 # if ENABLE_LONG_OPTS
                 static const char uname_longopts[] ALIGN1 =