Merge branch 'busybox' into merge

Conflicts:
	coreutils/od_bloaty.c
	libbb/lineedit.c

7 files changed, 129 insertions, 88 deletions

diff --git a/coreutils/Config.src b/coreutils/Config.src
index 2914fc36a..f15e03990 100644
--- a/coreutils/Config.src
+++ b/coreutils/Config.src
@@ -87,44 +87,6 @@ config CUT
           cut is used to print selected parts of lines from
           each file to stdout.
 
-config DD
-        bool "dd"
-        default y
-        help
-          dd copies a file (from standard input to standard output,
-          by default) using specific input and output blocksizes,
-          while optionally performing conversions on it.
-
-config FEATURE_DD_SIGNAL_HANDLING
-        bool "Enable DD signal handling for status reporting"
-        default y
-        depends on DD
-        help
-          Sending a SIGUSR1 signal to a running `dd' process makes it
-          print to standard error the number of records read and written
-          so far, then to resume copying.
-
-          $ dd if=/dev/zero of=/dev/null&
-          $ pid=$! kill -USR1 $pid; sleep 1; kill $pid
-          10899206+0 records in
-          10899206+0 records out
-
-config FEATURE_DD_THIRD_STATUS_LINE
-        bool "Enable the third status line upon signal"
-        default y
-        depends on DD && FEATURE_DD_SIGNAL_HANDLING
-        help
-          Displays a coreutils-like third status line with transferred bytes,
-          elapsed time and speed.
-
-config FEATURE_DD_IBS_OBS
-        bool "Enable ibs, obs and conv options"
-        default y
-        depends on DD
-        help
-          Enables support for writing a certain number of bytes in and out,
-          at a time, and performing conversions on the data stream.
-
 config DF
         bool "df"
         default y
diff --git a/coreutils/basename.c b/coreutils/basename.c
index 1f7a13713..ab0c972ed 100644
--- a/coreutils/basename.c
+++ b/coreutils/basename.c
@@ -31,7 +31,7 @@
 //usage:#define basename_trivial_usage
 //usage:       "FILE [SUFFIX]"
 //usage:#define basename_full_usage "\n\n"
-//usage:       "Strip directory path and .SUFFIX from FILE\n"
+//usage:       "Strip directory path and .SUFFIX from FILE"
 //usage:
 //usage:#define basename_example_usage
 //usage:       "$ basename /usr/local/bin/foo\n"
diff --git a/coreutils/date.c b/coreutils/date.c
index 767e0d4a2..7965775fe 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -373,7 +373,7 @@ int date_main(int argc UNUSED_PARAM, char **argv)
                 date_buf[0] = '\0';
         } else {
                 /* Handle special conversions */
-                if (strncmp(fmt_dt2str, "%f", 2) == 0) {
+                if (is_prefixed_with(fmt_dt2str, "%f")) {
                         fmt_dt2str = (char*)"%Y.%m.%d-%H:%M:%S";
                 }
                 /* Generate output string */
diff --git a/coreutils/dd.c b/coreutils/dd.c
index db61f665e..e2d95931c 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -8,6 +8,51 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
+//config:config DD
+//config:       bool "dd"
+//config:       default y
+//config:       help
+//config:         dd copies a file (from standard input to standard output,
+//config:         by default) using specific input and output blocksizes,
+//config:         while optionally performing conversions on it.
+//config:
+//config:config FEATURE_DD_SIGNAL_HANDLING
+//config:       bool "Enable signal handling for status reporting"
+//config:       default y
+//config:       depends on DD
+//config:       help
+//config:         Sending a SIGUSR1 signal to a running `dd' process makes it
+//config:         print to standard error the number of records read and written
+//config:         so far, then to resume copying.
+//config:
+//config:         $ dd if=/dev/zero of=/dev/null &
+//config:         $ pid=$!; kill -USR1 $pid; sleep 1; kill $pid
+//config:         10899206+0 records in
+//config:         10899206+0 records out
+//config:
+//config:config FEATURE_DD_THIRD_STATUS_LINE
+//config:       bool "Enable the third status line upon signal"
+//config:       default y
+//config:       depends on DD && FEATURE_DD_SIGNAL_HANDLING
+//config:       help
+//config:         Displays a coreutils-like third status line with transferred bytes,
+//config:         elapsed time and speed.
+//config:
+//config:config FEATURE_DD_IBS_OBS
+//config:       bool "Enable ibs, obs and conv options"
+//config:       default y
+//config:       depends on DD
+//config:       help
+//config:         Enables support for writing a certain number of bytes in and out,
+//config:         at a time, and performing conversions on the data stream.
+//config:
+//config:config FEATURE_DD_STATUS
+//config:       bool "Enable status display options"
+//config:       default y
+//config:       depends on DD
+//config:       help
+//config:         Enables support for status=noxfer/none option.
+
 //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]")
@@ -32,8 +77,12 @@
 //usage:     "\n        conv=fsync      Physically write data out before finishing"
 //usage:     "\n        conv=swab       Swap every pair of bytes"
 //usage:        )
+//usage:        IF_FEATURE_DD_STATUS(
+//usage:     "\n        status=noxfer   Suppress rate output"
+//usage:     "\n        status=none     Suppress all output"
+//usage:        )
 //usage:     "\n"
-//usage:     "\nN may be suffixed by c (1), w (2), b (512), kD (1000), k (1024), MD, M, GD, G"
+//usage:     "\nN may be suffixed by c (1), w (2), b (512), kB (1000), k (1024), MB, M, GB, G"
 //usage:
 //usage:#define dd_example_usage
 //usage:       "$ dd if=/dev/zero of=/dev/ram1 bs=1M count=4\n"
@@ -54,13 +103,18 @@ static const struct suffix_mult dd_suffixes[] = {
         { "c", 1 },
         { "w", 2 },
         { "b", 512 },
+        { "kB", 1000 },
         { "kD", 1000 },
         { "k", 1024 },
-        { "K", 1024 },  /* compat with coreutils dd */
+        { "K", 1024 },  /* compat with coreutils dd (it also accepts KB and KD, TODO?) */
+        { "MB", 1000000 },
         { "MD", 1000000 },
-        { "M", 1048576 },
+        { "M", 1024*1024 },
+        { "GB", 1000000000 },
         { "GD", 1000000000 },
-        { "G", 1073741824 },
+        { "G", 1024*1024*1024 },
+        /* "D" suffix for decimal is not in coreutils manpage, looks like it's deprecated */
+        /* coreutils also understands TPEZY suffixes for tera- and so on, with B suffix for decimal */
         { "", 0 }
 };
 
@@ -70,6 +124,7 @@ struct globals {
         unsigned long long total_bytes;
         unsigned long long begin_time_us;
 #endif
+        int flags;
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
 #define INIT_G() do { \
@@ -77,6 +132,21 @@ struct globals {
         memset(&G, 0, sizeof(G)); \
 } while (0)
 
+enum {
+        /* Must be in the same order as OP_conv_XXX! */
+        /* (see "flags |= (1 << what)" below) */
+        FLAG_NOTRUNC = (1 << 0) * ENABLE_FEATURE_DD_IBS_OBS,
+        FLAG_SYNC    = (1 << 1) * ENABLE_FEATURE_DD_IBS_OBS,
+        FLAG_NOERROR = (1 << 2) * ENABLE_FEATURE_DD_IBS_OBS,
+        FLAG_FSYNC   = (1 << 3) * ENABLE_FEATURE_DD_IBS_OBS,
+        FLAG_SWAB    = (1 << 4) * ENABLE_FEATURE_DD_IBS_OBS,
+        /* end of conv flags */
+        FLAG_TWOBUFS = (1 << 5) * ENABLE_FEATURE_DD_IBS_OBS,
+        FLAG_COUNT   = 1 << 6,
+        FLAG_STATUS  = 1 << 7,
+        FLAG_STATUS_NONE = 1 << 7,
+        FLAG_STATUS_NOXFER = 1 << 8,
+};
 
 static void dd_output_status(int UNUSED_PARAM cur_signal)
 {
@@ -93,6 +163,13 @@ static void dd_output_status(int UNUSED_PARAM cur_signal)
                         G.out_full, G.out_part);
 
 #if ENABLE_FEATURE_DD_THIRD_STATUS_LINE
+# if ENABLE_FEATURE_DD_STATUS
+        if (G.flags & FLAG_STATUS_NOXFER) /* status=noxfer active? */
+                return;
+        //TODO: should status=none make dd stop reacting to USR1 entirely?
+        //So far we react to it (we print the stats),
+        //status=none only suppresses final, non-USR1 generated status message.
+# endif
         fprintf(stderr, "%llu bytes (%sB) copied, ",
                         G.total_bytes,
                         /* show fractional digit, use suffixes */
@@ -148,20 +225,8 @@ static bool write_and_stats(const void *buf, size_t len, size_t obs,
 int dd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int dd_main(int argc UNUSED_PARAM, char **argv)
 {
-        enum {
-                /* Must be in the same order as OP_conv_XXX! */
-                /* (see "flags |= (1 << what)" below) */
-                FLAG_NOTRUNC = (1 << 0) * ENABLE_FEATURE_DD_IBS_OBS,
-                FLAG_SYNC    = (1 << 1) * ENABLE_FEATURE_DD_IBS_OBS,
-                FLAG_NOERROR = (1 << 2) * ENABLE_FEATURE_DD_IBS_OBS,
-                FLAG_FSYNC   = (1 << 3) * ENABLE_FEATURE_DD_IBS_OBS,
-                FLAG_SWAB    = (1 << 4) * ENABLE_FEATURE_DD_IBS_OBS,
-                /* end of conv flags */
-                FLAG_TWOBUFS = (1 << 5) * ENABLE_FEATURE_DD_IBS_OBS,
-                FLAG_COUNT   = 1 << 6,
-        };
         static const char keywords[] ALIGN1 =
-                "bs\0""count\0""seek\0""skip\0""if\0""of\0"
+                "bs\0""count\0""seek\0""skip\0""if\0""of\0"IF_FEATURE_DD_STATUS("status\0")
 #if ENABLE_FEATURE_DD_IBS_OBS
                 "ibs\0""obs\0""conv\0"
 #endif
@@ -170,6 +235,10 @@ 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";
 #endif
+#if ENABLE_FEATURE_DD_STATUS
+        static const char status_words[] ALIGN1 =
+                "none\0""noxfer\0";
+#endif
         enum {
                 OP_bs = 0,
                 OP_count,
@@ -177,6 +246,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                 OP_skip,
                 OP_if,
                 OP_of,
+                IF_FEATURE_DD_STATUS(OP_status,)
 #if ENABLE_FEATURE_DD_IBS_OBS
                 OP_ibs,
                 OP_obs,
@@ -216,14 +286,12 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
 #endif
         /* These are all zeroed at once! */
         struct {
-                int flags;
                 size_t oc;
                 ssize_t prev_read_size; /* for detecting swab failure */
                 off_t count;
                 off_t seek, skip;
                 const char *infile, *outfile;
         } Z;
-#define flags   (Z.flags  )
 #define oc      (Z.oc     )
 #define prev_read_size (Z.prev_read_size)
 #define count   (Z.count  )
@@ -279,7 +347,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                                 n = index_in_strings(conv_words, val);
                                 if (n < 0)
                                         bb_error_msg_and_die(bb_msg_invalid_arg, val, "conv");
-                                flags |= (1 << n);
+                                G.flags |= (1 << n);
                                 if (!arg) /* no ',' left, so this was the last specifier */
                                         break;
                                 /* *arg = ','; - to preserve ps listing? */
@@ -295,7 +363,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                 }
                 /* These can be large: */
                 if (what == OP_count) {
-                        flags |= FLAG_COUNT;
+                        G.flags |= FLAG_COUNT;
                         count = XATOU_SFX(val, dd_suffixes);
                         /*continue;*/
                 }
@@ -315,6 +383,16 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                         outfile = val;
                         /*continue;*/
                 }
+#if ENABLE_FEATURE_DD_STATUS
+                if (what == OP_status) {
+                        int n;
+                        n = index_in_strings(status_words, val);
+                        if (n < 0)
+                                bb_error_msg_and_die(bb_msg_invalid_arg, val, "status");
+                        G.flags |= FLAG_STATUS << n;
+                        /*continue;*/
+                }
+#endif
         } /* end of "for (argv[i])" */
 
 //XXX:FIXME for huge ibs or obs, malloc'ing them isn't the brightest idea ever
@@ -322,7 +400,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         obuf = ibuf;
 #if ENABLE_FEATURE_DD_IBS_OBS
         if (ibs != obs) {
-                flags |= FLAG_TWOBUFS;
+                G.flags |= FLAG_TWOBUFS;
                 obuf = xmalloc(obs);
         }
 #endif
@@ -347,12 +425,12 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         if (outfile) {
                 int oflag = O_WRONLY | O_CREAT;
 
-                if (!seek && !(flags & FLAG_NOTRUNC))
+                if (!seek && !(G.flags & FLAG_NOTRUNC))
                         oflag |= O_TRUNC;
 
                 xmove_fd(xopen(outfile, oflag), ofd);
 
-                if (seek && !(flags & FLAG_NOTRUNC)) {
+                if (seek && !(G.flags & FLAG_NOTRUNC)) {
                         if (ftruncate(ofd, seek * obs) < 0) {
                                 struct stat st;
 
@@ -383,7 +461,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                         goto die_outfile;
         }
 
-        while (!(flags & FLAG_COUNT) || (G.in_full + G.in_part != count)) {
+        while (!(G.flags & FLAG_COUNT) || (G.in_full + G.in_part != count)) {
                 ssize_t n;
 
                 if (devzero) {
@@ -396,7 +474,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                         break;
                 if (n < 0) {
                         /* "Bad block" */
-                        if (!(flags & FLAG_NOERROR))
+                        if (!(G.flags & FLAG_NOERROR))
                                 goto die_infile;
                         bb_simple_perror_msg(infile);
                         /* GNU dd with conv=noerror skips over bad blocks */
@@ -405,7 +483,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                          * conv=noerror just ignores input bad blocks */
                         n = 0;
                 }
-                if (flags & FLAG_SWAB) {
+                if (G.flags & FLAG_SWAB) {
                         uint16_t *p16;
                         ssize_t n2;
 
@@ -430,12 +508,12 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                         G.in_full++;
                 else {
                         G.in_part++;
-                        if (flags & FLAG_SYNC) {
+                        if (G.flags & FLAG_SYNC) {
                                 memset(ibuf + n, 0, ibs - n);
                                 n = ibs;
                         }
                 }
-                if (flags & FLAG_TWOBUFS) {
+                if (G.flags & FLAG_TWOBUFS) {
                         char *tmp = ibuf;
                         while (n) {
                                 size_t d = obs - oc;
@@ -457,7 +535,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                                 goto out_status;
                 }
 
-                if (flags & FLAG_FSYNC) {
+                if (G.flags & FLAG_FSYNC) {
                         if (fsync(ofd) < 0)
                                 goto die_outfile;
                 }
@@ -480,11 +558,12 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
 
         exitcode = EXIT_SUCCESS;
  out_status:
-        dd_output_status(0);
+        if (!ENABLE_FEATURE_DD_STATUS || !(G.flags & FLAG_STATUS_NONE))
+                dd_output_status(0);
 
         if (ENABLE_FEATURE_CLEAN_UP) {
                 free(obuf);
-                if (flags & FLAG_TWOBUFS)
+                if (G.flags & FLAG_TWOBUFS)
                         free(ibuf);
         }
 
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 1b63be56d..14c8beaff 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -566,12 +566,12 @@ static NOINLINE unsigned display_single(const struct dnode *dn)
 #if ENABLE_FEATURE_LS_TIMESTAMPS
         if (G.all_fmt & (LIST_FULLTIME|LIST_DATE_TIME)) {
                 char *filetime;
-                time_t ttime = dn->dn_mtime;
+                const time_t *ttime = &dn->dn_mtime;
                 if (G.all_fmt & TIME_ACCESS)
-                        ttime = dn->dn_atime;
+                        ttime = &dn->dn_atime;
                 if (G.all_fmt & TIME_CHANGE)
-                        ttime = dn->dn_ctime;
-                filetime = ctime(&ttime);
+                        ttime = &dn->dn_ctime;
+                filetime = ctime(ttime);
                 /* filetime's format: "Wed Jun 30 21:49:08 1993\n" */
                 if (G.all_fmt & LIST_FULLTIME) { /* -e */
                         /* Note: coreutils 8.4 ls --full-time prints:
@@ -580,13 +580,16 @@ static NOINLINE unsigned display_single(const struct dnode *dn)
                         column += printf("%.24s ", filetime);
                 } else { /* LIST_DATE_TIME */
                         /* G.current_time_t ~== time(NULL) */
-                        time_t age = G.current_time_t - ttime;
-                        printf("%.6s ", filetime + 4); /* "Jun 30" */
+                        time_t age = G.current_time_t - *ttime;
                         if (age < 3600L * 24 * 365 / 2 && age > -15 * 60) {
-                                /* hh:mm if less than 6 months old */
-                                printf("%.5s ", filetime + 11);
-                        } else { /* year. buggy if year > 9999 ;) */
-                                printf(" %.4s ", filetime + 20);
+                                /* less than 6 months old */
+                                /* "mmm dd hh:mm " */
+                                printf("%.12s ", filetime + 4);
+                        } else {
+                                /* "mmm dd  yyyy " */
+                                /* "mmm dd yyyyy " after year 9999 :) */
+                                strchr(filetime + 20, '\n')[0] = ' ';
+                                printf("%.7s%6s", filetime + 4, filetime + 20);
                         }
                         column += 13;
                 }
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index 34ceefb1c..1e7c5bfa0 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -395,10 +395,10 @@ print_named_ascii(size_t n_bytes, const char *block,
         };
         // buf[N] pos:  01234 56789
         char buf[12] = "   x\0 xxx\0";
-        // share string with print_ascii.
         // [12] because we take three 32bit stack slots anyway, and
         // gcc is too dumb to initialize with constant stores,
         // it copies initializer from rodata. Oh well.
+        // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65410
 
         while (n_bytes--) {
                 unsigned masked_c = *(unsigned char *) block++;
@@ -462,9 +462,6 @@ print_ascii(size_t n_bytes, const char *block,
                 case '\v':
                         s = "  \\v";
                         break;
-                case '\x7f':
-                        s = " 177";
-                        break;
                 default:
                         buf[6] = (c >> 6 & 3) + '0';
                         buf[7] = (c >> 3 & 7) + '0';
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index b298fcb95..3f1227306 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -110,10 +110,10 @@ int uudecode_main(int argc UNUSED_PARAM, char **argv)
                 FILE *dst_stream;
                 int mode;
 
-                if (strncmp(line, "begin-base64 ", 13) == 0) {
+                if (is_prefixed_with(line, "begin-base64 ")) {
                         line_ptr = line + 13;
                         decode_fn_ptr = read_base64;
-                } else if (strncmp(line, "begin ", 6) == 0) {
+                } else if (is_prefixed_with(line, "begin ")) {
                         line_ptr = line + 6;
                         decode_fn_ptr = read_stduu;
                 } else {