Merge branch 'busybox' into merge

Conflicts:
	Makefile.flags

11 files changed, 70 insertions, 46 deletions

diff --git a/coreutils/chroot.c b/coreutils/chroot.c
index ab8beb023..633e66b38 100644
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -31,7 +31,6 @@ int chroot_main(int argc UNUSED_PARAM, char **argv)
         if (!*argv)
                 bb_show_usage();
         xchroot(*argv);
-        xchdir("/");
 
         ++argv;
         if (!*argv) { /* no 2nd param (PROG), use shell */
diff --git a/coreutils/cp.c b/coreutils/cp.c
index f276d25d7..45efaba72 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -16,9 +16,9 @@
  */
 
 //usage:#define cp_trivial_usage
-//usage:       "[OPTIONS] SOURCE DEST"
+//usage:       "[OPTIONS] SOURCE... DEST"
 //usage:#define cp_full_usage "\n\n"
-//usage:       "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY\n"
+//usage:       "Copy SOURCE(s) to DEST\n"
 //usage:     "\n        -a      Same as -dpR"
 //usage:        IF_SELINUX(
 //usage:     "\n        -c      Preserve security context"
diff --git a/coreutils/date.c b/coreutils/date.c
index d90e620a0..62cceff9c 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -129,6 +129,9 @@
 //usage:     "\n        [YYYY.]MM.DD-hh:mm[:ss]"
 //usage:     "\n        YYYY-MM-DD hh:mm[:ss]"
 //usage:     "\n        [[[[[YY]YY]MM]DD]hh]mm[.ss]"
+//usage:        IF_FEATURE_DATE_COMPAT(
+//usage:     "\n        'date TIME' form accepts MMDDhhmm[[YY]YY][.ss] instead"
+//usage:        )
 //usage:
 //usage:#define date_example_usage
 //usage:       "$ date\n"
diff --git a/coreutils/du.c b/coreutils/du.c
index 34a549f02..19a0319f1 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -26,11 +26,7 @@
 //usage:#define du_trivial_usage
 //usage:       "[-aHLdclsx" IF_FEATURE_HUMAN_READABLE("hm") "k] [FILE]..."
 //usage:#define du_full_usage "\n\n"
-//usage:       "Summarize disk space used for each FILE and/or directory.\n"
-//usage:       "Disk space is printed in units of "
-//usage:        IF_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("1024")
-//usage:        IF_NOT_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("512")
-//usage:       " bytes.\n"
+//usage:       "Summarize disk space used for each FILE and/or directory\n"
 //usage:     "\n        -a      Show file sizes too"
 //usage:     "\n        -L      Follow all symlinks"
 //usage:     "\n        -H      Follow symlinks on command line"
@@ -40,11 +36,13 @@
 //usage:     "\n        -s      Display only a total for each argument"
 //usage:     "\n        -x      Skip directories on different filesystems"
 //usage:        IF_FEATURE_HUMAN_READABLE(
-//usage:     "\n        -h      Sizes in human readable format (e.g., 1K 243M 2G )"
+//usage:     "\n        -h      Sizes in human readable format (e.g., 1K 243M 2G)"
 //usage:     "\n        -m      Sizes in megabytes"
 //usage:        )
-//usage:     "\n        -k      Sizes in kilobytes"
-//usage:                        IF_FEATURE_DU_DEFAULT_BLOCKSIZE_1K(" (default)")
+//usage:     "\n        -k      Sizes in kilobytes" IF_FEATURE_DU_DEFAULT_BLOCKSIZE_1K(" (default)")
+//usage:        IF_NOT_FEATURE_DU_DEFAULT_BLOCKSIZE_1K(
+//usage:     "\n                Default unit is 512 bytes"
+//usage:        )
 //usage:
 //usage:#define du_example_usage
 //usage:       "$ du\n"
@@ -91,7 +89,7 @@ struct globals {
 #define INIT_G() do { } while (0)
 
 
-static void print(unsigned long size, const char *filename)
+static void print(unsigned long long size, const char *filename)
 {
         /* TODO - May not want to defer error checking here. */
 #if ENABLE_FEATURE_HUMAN_READABLE
@@ -105,15 +103,15 @@ static void print(unsigned long size, const char *filename)
                 size++;
                 size >>= 1;
         }
-        printf("%lu\t%s\n", size, filename);
+        printf("%llu\t%s\n", size, filename);
 #endif
 }
 
 /* tiny recursive du */
-static unsigned long du(const char *filename)
+static unsigned long long du(const char *filename)
 {
         struct stat statbuf;
-        unsigned long sum;
+        unsigned long long sum;
 
         if (lstat(filename, &statbuf) != 0) {
                 bb_simple_perror_msg(filename);
@@ -190,7 +188,7 @@ static unsigned long du(const char *filename)
 int du_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int du_main(int argc UNUSED_PARAM, char **argv)
 {
-        unsigned long total;
+        unsigned long long total;
         int slink_depth_save;
         unsigned opt;
 
diff --git a/coreutils/ln.c b/coreutils/ln.c
index 88a9a8f91..0eb3e6579 100644
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -69,8 +69,8 @@ int ln_main(int argc, char **argv)
                 src = last;
 
                 if (is_directory(src,
-                                (opts & LN_NODEREFERENCE) ^ LN_NODEREFERENCE,
-                                NULL)
+                                (opts & LN_NODEREFERENCE) ^ LN_NODEREFERENCE
+                                )
                 ) {
                         src_name = xstrdup(*argv);
                         src = concat_path_file(src, bb_get_last_path_component_strip(src_name));
diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index a4429b1cb..b33b6bba3 100644
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -54,7 +54,7 @@ static const char mkdir_longopts[] ALIGN1 =
 int mkdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int mkdir_main(int argc UNUSED_PARAM, char **argv)
 {
-        mode_t mode = (mode_t)(-1);
+        long mode = -1;
         int status = EXIT_SUCCESS;
         int flags = 0;
         unsigned opt;
@@ -68,10 +68,11 @@ int mkdir_main(int argc UNUSED_PARAM, char **argv)
 #endif
         opt = getopt32(argv, "m:p" IF_SELINUX("Z:"), &smode IF_SELINUX(,&scontext));
         if (opt & 1) {
-                mode = 0777;
-                if (!bb_parse_mode(smode, &mode)) {
+                mode_t mmode = 0777;
+                if (!bb_parse_mode(smode, &mmode)) {
                         bb_error_msg_and_die("invalid mode '%s'", smode);
                 }
+                mode = mmode;
         }
         if (opt & 2)
                 flags |= FILEUTILS_RECUR;
diff --git a/coreutils/printf.c b/coreutils/printf.c
index f53aa4787..3dd43a978 100644
--- a/coreutils/printf.c
+++ b/coreutils/printf.c
@@ -36,13 +36,12 @@
    David MacKenzie <djm@gnu.ai.mit.edu>
 */
 
-//   19990508 Busy Boxed! Dave Cinege
+/* 19990508 Busy Boxed! Dave Cinege */
 
 //usage:#define printf_trivial_usage
-//usage:       "FORMAT [ARGUMENT]..."
+//usage:       "FORMAT [ARG]..."
 //usage:#define printf_full_usage "\n\n"
-//usage:       "Format and print ARGUMENT(s) according to FORMAT,\n"
-//usage:       "where FORMAT controls the output exactly as in C printf"
+//usage:       "Format and print ARG(s) according to FORMAT (a-la C printf)"
 //usage:
 //usage:#define printf_example_usage
 //usage:       "$ printf \"Val=%d\\n\" 5\n"
@@ -132,13 +131,28 @@ static double my_xstrtod(const char *arg)
         return result;
 }
 
+/* Handles %b */
 static void print_esc_string(const char *str)
 {
         char c;
         while ((c = *str) != '\0') {
                 str++;
-                if (c == '\\')
-                        c = bb_process_escape_sequence(&str);
+                if (c == '\\') {
+                        /* %b also accepts 4-digit octals of the form \0### */
+                        if (*str == '0') {
+                                if ((unsigned char)(str[1] - '0') < 8) {
+                                        /* 2nd char is 0..7: skip leading '0' */
+                                        str++;
+                                }
+                        }
+                        {
+                                /* optimization: don't force arg to be on-stack,
+                                 * use another variable for that. */
+                                const char *z = str;
+                                c = bb_process_escape_sequence(&z);
+                                str = z;
+                        }
+                }
                 putchar(c);
         }
 }
diff --git a/coreutils/test.c b/coreutils/test.c
index 2e896f4c7..ccfa923da 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -737,7 +737,8 @@ static number_t nexpr(enum token n)
                 if (n == EOI) {
                         /* special case: [ ! ], [ a -a ! ] are valid */
                         /* IOW, "! ARG" may miss ARG */
-                        unnest_msg("<nexpr:1 (!EOI)\n");
+                        args--;
+                        unnest_msg("<nexpr:1 (!EOI), args:%s(%p)\n", args[0], &args[0]);
                         return 1;
                 }
                 res = !nexpr(n);
@@ -756,15 +757,15 @@ static number_t aexpr(enum token n)
 
         nest_msg(">aexpr(%s)\n", TOKSTR[n]);
         res = nexpr(n);
-        dbg_msg("aexpr: nexpr:%lld, next args:%s\n", res, args[1]);
+        dbg_msg("aexpr: nexpr:%lld, next args:%s(%p)\n", res, args[1], &args[1]);
         if (check_operator(*++args) == BAND) {
-                dbg_msg("aexpr: arg is AND, next args:%s\n", args[1]);
+                dbg_msg("aexpr: arg is AND, next args:%s(%p)\n", args[1], &args[1]);
                 res = aexpr(check_operator(*++args)) && res;
                 unnest_msg("<aexpr:%lld\n", res);
                 return res;
         }
         args--;
-        unnest_msg("<aexpr:%lld, args:%s\n", res, args[0]);
+        unnest_msg("<aexpr:%lld, args:%s(%p)\n", res, args[0], &args[0]);
         return res;
 }
 
@@ -775,15 +776,15 @@ static number_t oexpr(enum token n)
 
         nest_msg(">oexpr(%s)\n", TOKSTR[n]);
         res = aexpr(n);
-        dbg_msg("oexpr: aexpr:%lld, next args:%s\n", res, args[1]);
+        dbg_msg("oexpr: aexpr:%lld, next args:%s(%p)\n", res, args[1], &args[1]);
         if (check_operator(*++args) == BOR) {
-                dbg_msg("oexpr: next arg is OR, next args:%s\n", args[1]);
+                dbg_msg("oexpr: next arg is OR, next args:%s(%p)\n", args[1], &args[1]);
                 res = oexpr(check_operator(*++args)) || res;
                 unnest_msg("<oexpr:%lld\n", res);
                 return res;
         }
         args--;
-        unnest_msg("<oexpr:%lld, args:%s\n", res, args[0]);
+        unnest_msg("<oexpr:%lld, args:%s(%p)\n", res, args[0], &args[0]);
         return res;
 }
 
diff --git a/coreutils/touch.c b/coreutils/touch.c
index 0f980fd7b..1216ca202 100644
--- a/coreutils/touch.c
+++ b/coreutils/touch.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
-/* BB_AUDIT SUSv3 _NOT_ compliant -- options -a, -m, -r, -t not supported. */
+/* BB_AUDIT SUSv3 _NOT_ compliant -- options -a, -m not supported. */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/touch.html */
 
 /* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
@@ -25,18 +25,26 @@
 //config:       help
 //config:         touch is used to create or change the access and/or
 //config:         modification timestamp of specified files.
+//config:
+//config:config FEATURE_TOUCH_SUSV3
+//config:       bool "Add support for SUSV3 features (-d -t -r)"
+//config:       default y
+//config:       depends on TOUCH
+//config:       help
+//config:         Enable touch to use a reference file or a given date/time argument.
 
 //applet:IF_TOUCH(APPLET_NOFORK(touch, touch, BB_DIR_BIN, BB_SUID_DROP, touch))
 
 //kbuild:lib-$(CONFIG_TOUCH) += touch.o
 
 //usage:#define touch_trivial_usage
-//usage:       "[-c]" IF_DESKTOP(" [-d DATE] [-r FILE]") " FILE [FILE]..."
+//usage:       "[-c]" IF_FEATURE_TOUCH_SUSV3(" [-d DATE] [-t DATE] [-r FILE]") " FILE..."
 //usage:#define touch_full_usage "\n\n"
 //usage:       "Update the last-modified date on the given FILE[s]\n"
 //usage:     "\n        -c      Don't create files"
-//usage:        IF_DESKTOP(
+//usage:        IF_FEATURE_TOUCH_SUSV3(
 //usage:     "\n        -d DT   Date/time to use"
+//usage:     "\n        -t DT   Date/time to use"
 //usage:     "\n        -r FILE Use FILE's date/time"
 //usage:        )
 //usage:
@@ -71,7 +79,7 @@ int touch_main(int argc UNUSED_PARAM, char **argv)
         int fd;
         int status = EXIT_SUCCESS;
         int opts;
-#if ENABLE_DESKTOP
+#if ENABLE_FEATURE_TOUCH_SUSV3
 # if ENABLE_LONG_OPTS
         static const char touch_longopts[] ALIGN1 =
                 /* name, has_arg, val */
@@ -90,17 +98,17 @@ int touch_main(int argc UNUSED_PARAM, char **argv)
 # define timebuf        ((struct timeval*)NULL)
 #endif
 
-#if ENABLE_DESKTOP && ENABLE_LONG_OPTS
+#if ENABLE_FEATURE_TOUCH_SUSV3 && ENABLE_LONG_OPTS
         applet_long_options = touch_longopts;
 #endif
         /* -d and -t both set time. In coreutils,
          * accepted data format differs a bit between -d and -t.
          * We accept the same formats for both */
-        opts = getopt32(argv, "c" IF_DESKTOP("r:d:t:")
+        opts = getopt32(argv, "c" IF_FEATURE_TOUCH_SUSV3("r:d:t:")
                                 /*ignored:*/ "fma"
-                                IF_DESKTOP(, &reference_file)
-                                IF_DESKTOP(, &date_str)
-                                IF_DESKTOP(, &date_str)
+                                IF_FEATURE_TOUCH_SUSV3(, &reference_file)
+                                IF_FEATURE_TOUCH_SUSV3(, &date_str)
+                                IF_FEATURE_TOUCH_SUSV3(, &date_str)
         );
 
         opts &= 1; /* only -c bit is left */
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index 23ff711fa..b298fcb95 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -15,7 +15,7 @@
 //usage:       "[-o OUTFILE] [INFILE]"
 //usage:#define uudecode_full_usage "\n\n"
 //usage:       "Uudecode a file\n"
-//usage:       "Finds outfile name in uuencoded source unless -o is given"
+//usage:       "Finds OUTFILE in uuencoded source unless -o is given"
 //usage:
 //usage:#define uudecode_example_usage
 //usage:       "$ uudecode -o busybox busybox.uu\n"
diff --git a/coreutils/uuencode.c b/coreutils/uuencode.c
index 84a489a11..673ef36e7 100644
--- a/coreutils/uuencode.c
+++ b/coreutils/uuencode.c
@@ -9,9 +9,9 @@
  */
 
 //usage:#define uuencode_trivial_usage
-//usage:       "[-m] [INFILE] STORED_FILENAME"
+//usage:       "[-m] [FILE] STORED_FILENAME"
 //usage:#define uuencode_full_usage "\n\n"
-//usage:       "Uuencode a file to stdout\n"
+//usage:       "Uuencode FILE (or stdin) to stdout\n"
 //usage:     "\n        -m      Use base64 encoding per RFC1521"
 //usage:
 //usage:#define uuencode_example_usage