Merge branch 'busybox' into merge

4 files changed, 28 insertions, 9 deletions

diff --git a/coreutils/ls.c b/coreutils/ls.c
index 9f0462936..22286d713 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -347,6 +347,8 @@ struct globals {
         IF_FEATURE_LS_TIMESTAMPS(time(&G.current_time_t);) \
 } while (0)
 
+#define ESC "\033"
+
 
 /*** Output code ***/
 
@@ -586,12 +588,12 @@ static NOINLINE unsigned display_single(const struct dnode *dn)
                 if (!mode)
                         if (lstat(dn->fullname, &statbuf) == 0)
                                 mode = statbuf.st_mode;
-                printf("\033[%u;%um", bold(mode), fgcolor(mode));
+                printf(ESC"[%u;%um", bold(mode), fgcolor(mode));
         }
 #endif
         column += print_name(dn->name);
         if (G_show_color) {
-                printf("\033[0m");
+                printf(ESC"[m");
         }
 
         if (lpath) {
@@ -609,7 +611,7 @@ static NOINLINE unsigned display_single(const struct dnode *dn)
 # endif
 # if ENABLE_FEATURE_LS_COLOR
                         if (G_show_color) {
-                                printf("\033[%u;%um", bold(mode), fgcolor(mode));
+                                printf(ESC"[%u;%um", bold(mode), fgcolor(mode));
                         }
 # endif
                 }
@@ -617,7 +619,7 @@ static NOINLINE unsigned display_single(const struct dnode *dn)
                 column += print_name(lpath) + 4;
                 free(lpath);
                 if (G_show_color) {
-                        printf("\033[0m");
+                        printf(ESC"[m");
                 }
         }
 #if ENABLE_FEATURE_LS_FILETYPES
diff --git a/coreutils/printf.c b/coreutils/printf.c
index d1ff183d0..353cfc608 100644
--- a/coreutils/printf.c
+++ b/coreutils/printf.c
@@ -48,7 +48,6 @@
 //applet:IF_PRINTF(APPLET_NOFORK(printf, printf, BB_DIR_USR_BIN, BB_SUID_DROP, printf))
 
 //kbuild:lib-$(CONFIG_PRINTF) += printf.o
-
 //kbuild:lib-$(CONFIG_ASH_PRINTF)  += printf.o
 //kbuild:lib-$(CONFIG_HUSH_PRINTF) += printf.o
 
diff --git a/coreutils/shuf.c b/coreutils/shuf.c
index d0caaa2ce..fdbd3e9b2 100644
--- a/coreutils/shuf.c
+++ b/coreutils/shuf.c
@@ -6,16 +6,16 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 //config:config SHUF
 //config:       bool "shuf (5.4 kb)"
 //config:       default y
 //config:       help
 //config:       Generate random permutations
 
-//kbuild:lib-$(CONFIG_SHUF) += shuf.o
 //applet:IF_SHUF(APPLET_NOEXEC(shuf, shuf, BB_DIR_USR_BIN, BB_SUID_DROP, shuf))
 
+//kbuild:lib-$(CONFIG_SHUF) += shuf.o
+
 //usage:#define shuf_trivial_usage
 //usage:       "[-e|-i L-H] [-n NUM] [-o FILE] [-z] [FILE|ARG...]"
 //usage:#define shuf_full_usage "\n\n"
diff --git a/coreutils/stty.c b/coreutils/stty.c
index 57e2cc30d..b6e836364 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -148,6 +148,9 @@
 #ifndef CRDLY
 # define CRDLY 0
 #endif
+#ifndef CMSPAR
+# define CMSPAR 0
+#endif
 #ifndef CRTSCTS
 # define CRTSCTS 0
 #endif
@@ -352,6 +355,9 @@ static const char mode_name[] ALIGN1 =
 #endif
         MI_ENTRY("parenb",   control,     REV,               PARENB,     0 )
         MI_ENTRY("parodd",   control,     REV,               PARODD,     0 )
+#if CMSPAR
+        MI_ENTRY("cmspar",   control,     REV,               CMSPAR,     0 )
+#endif
         MI_ENTRY("cs5",      control,     0,                 CS5,     CSIZE)
         MI_ENTRY("cs6",      control,     0,                 CS6,     CSIZE)
         MI_ENTRY("cs7",      control,     0,                 CS7,     CSIZE)
@@ -477,6 +483,10 @@ static const char mode_name[] ALIGN1 =
         MI_ENTRY("echoke",   local,       SANE_SET   | REV,  ECHOKE,     0 )
         MI_ENTRY("crtkill",  local,       OMIT       | REV,  ECHOKE,     0 )
 #endif
+        MI_ENTRY("flusho",   local,       SANE_UNSET | REV,  FLUSHO,     0 )
+#ifdef EXTPROC
+        MI_ENTRY("extproc",  local,       SANE_UNSET | REV,  EXTPROC,    0 )
+#endif
         ;
 
 #undef MI_ENTRY
@@ -509,6 +519,9 @@ static const struct mode_info mode_info[] = {
 #endif
         MI_ENTRY("parenb",   control,     REV,               PARENB,     0 )
         MI_ENTRY("parodd",   control,     REV,               PARODD,     0 )
+#if CMSPAR
+        MI_ENTRY("cmspar",   control,     REV,               CMSPAR,     0 )
+#endif
         MI_ENTRY("cs5",      control,     0,                 CS5,     CSIZE)
         MI_ENTRY("cs6",      control,     0,                 CS6,     CSIZE)
         MI_ENTRY("cs7",      control,     0,                 CS7,     CSIZE)
@@ -634,6 +647,10 @@ static const struct mode_info mode_info[] = {
         MI_ENTRY("echoke",   local,       SANE_SET   | REV,  ECHOKE,     0 )
         MI_ENTRY("crtkill",  local,       OMIT       | REV,  ECHOKE,     0 )
 #endif
+        MI_ENTRY("flusho",   local,       SANE_UNSET | REV,  FLUSHO,     0 )
+#ifdef EXTPROC
+        MI_ENTRY("extproc",  local,       SANE_UNSET | REV,  EXTPROC,    0 )
+#endif
 };
 
 enum {
@@ -836,10 +853,11 @@ static void wrapf(const char *message, ...)
                 G.current_col++;
                 if (buf[0] != '\n') {
                         if (G.current_col + buflen >= G.max_col) {
-                                bb_putchar('\n');
                                 G.current_col = 0;
-                        } else
+                                bb_putchar('\n');
+                        } else {
                                 bb_putchar(' ');
+                        }
                 }
         }
         fputs(buf, stdout);