Merge commit 'da4441c44f6efccb6f7b7588404d9c6bfb7b6af8' into merge

Conflicts:
	libbb/vfork_daemon_rexec.c
	networking/wget.c
	procps/ps.c

7 files changed, 116 insertions, 108 deletions

diff --git a/coreutils/Config.src b/coreutils/Config.src
index b599f7999..6297f43a3 100644
--- a/coreutils/Config.src
+++ b/coreutils/Config.src
@@ -295,11 +295,11 @@ config FEATURE_INSTALL_LONG_OPTIONS
         help
           Support long options for the install applet.
 
-config LENGTH
-        bool "length"
-        default y
-        help
-          length is used to print out the length of a specified string.
+####config LENGTH
+####    bool "length"
+####    default y
+####    help
+####      length is used to print out the length of a specified string.
 
 config LN
         bool "ln"
diff --git a/coreutils/Kbuild.src b/coreutils/Kbuild.src
index 4ea0fa50a..6a41c8318 100644
--- a/coreutils/Kbuild.src
+++ b/coreutils/Kbuild.src
@@ -39,7 +39,7 @@ lib-$(CONFIG_HEAD)      += head.o
 lib-$(CONFIG_HOSTID)    += hostid.o
 lib-$(CONFIG_ID)        += id.o
 lib-$(CONFIG_INSTALL)   += install.o
-lib-$(CONFIG_LENGTH)    += length.o
+#lib-$(CONFIG_LENGTH)    += length.o
 lib-$(CONFIG_LN)        += ln.o
 lib-$(CONFIG_LOGNAME)   += logname.o
 lib-$(CONFIG_LS)        += ls.o
diff --git a/coreutils/df.c b/coreutils/df.c
index af9b77b23..70fd1f4fd 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -160,7 +160,7 @@ int df_main(int argc UNUSED_PARAM, char **argv)
                         }
 
                         /* GNU coreutils 6.10 skips certain mounts, try to be compatible.  */
-                        if (strcmp(device, "rootfs") == 0)
+                        if (ENABLE_FEATURE_SKIP_ROOTFS && strcmp(device, "rootfs") == 0)
                                 continue;
 
 #ifdef WHY_WE_DO_IT_FOR_DEV_ROOT_ONLY
diff --git a/coreutils/echo.c b/coreutils/echo.c
index 3821e594e..72e18c161 100644
--- a/coreutils/echo.c
+++ b/coreutils/echo.c
@@ -29,122 +29,135 @@
 
 /* NB: can be used by shell even if not enabled as applet */
 
+/*
+ * NB2: we don't use stdio, we need better error handing.
+ * Examples include writing into non-opened stdout and error on write.
+ *
+ * With stdio, output gets shoveled into stdout buffer, and even
+ * fflush cannot clear it out. It seems that even if libc receives
+ * EBADF on write attempts, it feels determined to output data no matter what.
+ * If echo is called by shell, it will try writing again later, and possibly
+ * will clobber future output. Not good.
+ *
+ * Solaris has fpurge which discards buffered input. glibc has __fpurge.
+ * But this function is not standard.
+ */
+
 int echo_main(int argc UNUSED_PARAM, char **argv)
 {
+        char **pp;
         const char *arg;
+        char *out;
+        char *buffer;
+        unsigned buflen;
 #if !ENABLE_FEATURE_FANCY_ECHO
         enum {
                 eflag = '\\',
                 nflag = 1,  /* 1 -- print '\n' */
         };
 
-        /* We must check that stdout is not closed.
-         * The reason for this is highly non-obvious.
-         * echo_main is used from shell. Shell must correctly handle "echo foo"
-         * if stdout is closed. With stdio, output gets shoveled into
-         * stdout buffer, and even fflush cannot clear it out. It seems that
-         * even if libc receives EBADF on write attempts, it feels determined
-         * to output data no matter what. So it will try later,
-         * and possibly will clobber future output. Not good. */
-// TODO: check fcntl() & O_ACCMODE == O_WRONLY or O_RDWR?
-        if (fcntl(1, F_GETFL) == -1)
-                return 1; /* match coreutils 6.10 (sans error msg to stderr) */
-        //if (dup2(1, 1) != 1) - old way
-        //      return 1;
-
-        arg = *++argv;
-        if (!arg)
-                goto newline_ret;
+        argv++;
 #else
-        const char *p;
         char nflag = 1;
         char eflag = 0;
 
-        /* We must check that stdout is not closed. */
-        if (fcntl(1, F_GETFL) == -1)
-                return 1;
+        while ((arg = *++argv) != NULL) {
+                char n, e;
 
-        while (1) {
-                arg = *++argv;
-                if (!arg)
-                        goto newline_ret;
-                if (*arg != '-')
-                        break;
+                if (arg[0] != '-')
+                        break; /* not an option arg, echo it */
 
                 /* If it appears that we are handling options, then make sure
                  * that all of the options specified are actually valid.
                  * Otherwise, the string should just be echoed.
                  */
-                p = arg + 1;
-                if (!*p)        /* A single '-', so echo it. */
-                        goto just_echo;
-
+                arg++;
+                n = nflag;
+                e = eflag;
                 do {
-                        if (!strrchr("neE", *p))
+                        if (*arg == 'n')
+                                n = 0;
+                        else if (*arg == 'e')
+                                e = '\\';
+                        else if (*arg != 'E') {
+                                /* "-ccc" arg with one of c's invalid, echo it */
+                                /* arg consisting from just "-" also handled here */
                                 goto just_echo;
-                } while (*++p);
-
-                /* All of the options in this arg are valid, so handle them. */
-                p = arg + 1;
-                do {
-                        if (*p == 'n')
-                                nflag = 0;
-                        if (*p == 'e')
-                                eflag = '\\';
-                } while (*++p);
+                        }
+                } while (*++arg);
+                nflag = n;
+                eflag = e;
         }
  just_echo:
 #endif
-        while (1) {
-                /* arg is already == *argv and isn't NULL */
+
+        buflen = 0;
+        pp = argv;
+        while ((arg = *pp) != NULL) {
+                buflen += strlen(arg) + 1;
+                pp++;
+        }
+        out = buffer = xmalloc(buflen + 1); /* +1 is needed for "no args" case */
+
+        while ((arg = *argv) != NULL) {
                 int c;
 
                 if (!eflag) {
                         /* optimization for very common case */
-                        fputs(arg, stdout);
-                } else while ((c = *arg++)) {
-                        if (c == eflag) {       /* Check for escape seq. */
+                        out = stpcpy(out, arg);
+                } else
+                while ((c = *arg++) != '\0') {
+                        if (c == eflag) {
+                                /* This is an "\x" sequence */
+
                                 if (*arg == 'c') {
-                                        /* '\c' means cancel newline and
+                                        /* "\c" means cancel newline and
                                          * ignore all subsequent chars. */
-                                        goto ret;
+                                        goto do_write;
                                 }
-#if !ENABLE_FEATURE_FANCY_ECHO
-                                /* SUSv3 specifies that octal escapes must begin with '0'. */
-                                if ( ((int)(unsigned char)(*arg) - '0') >= 8) /* '8' or bigger */
-#endif
-                                {
-                                        /* Since SUSv3 mandates a first digit of 0, 4-digit octals
-                                        * of the form \0### are accepted. */
-                                        if (*arg == '0') {
-                                                /* NB: don't turn "...\0" into "...\" */
-                                                if (arg[1] && ((unsigned char)(arg[1]) - '0') < 8) {
-                                                        arg++;
-                                                }
+                                /* Since SUSv3 mandates a first digit of 0, 4-digit octals
+                                * of the form \0### are accepted. */
+                                if (*arg == '0') {
+                                        if ((unsigned char)(arg[1] - '0') < 8) {
+                                                /* 2nd char is 0..7: skip leading '0' */
+                                                arg++;
                                         }
-                                        /* bb_process_escape_sequence handles NUL correctly
-                                         * ("...\" case). */
-                                        c = bb_process_escape_sequence(&arg);
+                                }
+                                /* bb_process_escape_sequence handles NUL correctly
+                                 * ("...\" case). */
+                                {
+                                        /* optimization: don't force arg to be on-stack,
+                                         * use another variable for that. ~30 bytes win */
+                                        const char *z = arg;
+                                        c = bb_process_escape_sequence(&z);
+                                        arg = z;
                                 }
                         }
-                        bb_putchar(c);
+                        *out++ = c;
                 }
 
-                arg = *++argv;
-                if (!arg)
+                if (!*++argv)
                         break;
-                bb_putchar(' ');
+                *out++ = ' ';
         }
 
- newline_ret:
         if (nflag) {
-                bb_putchar('\n');
+                *out++ = '\n';
         }
- ret:
-        return fflush_all();
+
+ do_write:
+        /* Careful to error out on partial writes too (think ENOSPC!) */
+        errno = 0;
+        /*r =*/ full_write(STDOUT_FILENO, buffer, out - buffer);
+        free(buffer);
+        if (/*WRONG:r < 0*/ errno) {
+                bb_perror_msg(bb_msg_write_error);
+                return 1;
+        }
+        return 0;
 }
 
-/*-
+/*
  * Copyright (c) 1991, 1993
  *      The Regents of the University of California.  All rights reserved.
  *
@@ -230,7 +243,7 @@ int echo_main(int argc, char **argv)
                         goto just_echo;
 
                 do {
-                        if (!strrchr("neE", *p))
+                        if (!strchr("neE", *p))
                                 goto just_echo;
                 } while (*++p);
 
@@ -256,27 +269,23 @@ int echo_main(int argc, char **argv)
                         /* optimization for very common case */
                         p += strlen(arg);
                 } else while ((c = *arg++)) {
-                        if (c == eflag) {       /* Check for escape seq. */
+                        if (c == eflag) {
+                                /* This is an "\x" sequence */
+
                                 if (*arg == 'c') {
-                                        /* '\c' means cancel newline and
+                                        /* "\c" means cancel newline and
                                          * ignore all subsequent chars. */
                                         cur_io->iov_len = p - (char*)cur_io->iov_base;
                                         cur_io++;
                                         goto ret;
                                 }
-#if !ENABLE_FEATURE_FANCY_ECHO
-                                /* SUSv3 specifies that octal escapes must begin with '0'. */
-                                if ( (((unsigned char)*arg) - '1') >= 7)
-#endif
-                                {
-                                        /* Since SUSv3 mandates a first digit of 0, 4-digit octals
-                                        * of the form \0### are accepted. */
-                                        if (*arg == '0' && ((unsigned char)(arg[1]) - '0') < 8) {
-                                                arg++;
-                                        }
-                                        /* bb_process_escape_sequence can handle nul correctly */
-                                        c = bb_process_escape_sequence( (void*) &arg);
+                                /* Since SUSv3 mandates a first digit of 0, 4-digit octals
+                                * of the form \0### are accepted. */
+                                if (*arg == '0' && (unsigned char)(arg[1] - '0') < 8) {
+                                        arg++;
                                 }
+                                /* bb_process_escape_sequence can handle nul correctly */
+                                c = bb_process_escape_sequence( (void*) &arg);
                         }
                         *p++ = c;
                 }
diff --git a/coreutils/id.c b/coreutils/id.c
index ed1dc862e..0639325c3 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -176,10 +176,9 @@ int id_main(int argc UNUSED_PARAM, char **argv)
                                 prefix = ",";
                         }
                 } else if (n < 0) { /* error in get_groups() */
-                        if (!ENABLE_DESKTOP)
+                        if (ENABLE_DESKTOP)
                                 bb_error_msg_and_die("can't get groups");
-                        else
-                                return EXIT_FAILURE;
+                        return EXIT_FAILURE;
                 }
                 if (ENABLE_FEATURE_CLEAN_UP)
                         free(groups);
diff --git a/coreutils/length.c b/coreutils/length.c.disabled
index 7f0b48ccd..7f0b48ccd 100644
--- a/coreutils/length.c
+++ b/coreutils/length.c.disabled
diff --git a/coreutils/stty.c b/coreutils/stty.c
index 1dd01c4dd..d8184a34f 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -345,7 +345,7 @@ static const char mode_name[] =
         MI_ENTRY("icrnl",    input,       SANE_SET   | REV,  ICRNL,      0 )
         MI_ENTRY("ixon",     input,       REV,               IXON,       0 )
         MI_ENTRY("ixoff",    input,       SANE_UNSET | REV,  IXOFF,      0 )
-        MI_ENTRY("tandem",   input,       REV        | OMIT, IXOFF,      0 )
+        MI_ENTRY("tandem",   input,       OMIT       | REV,  IXOFF,      0 )
 #if IUCLC
         MI_ENTRY("iuclc",    input,       SANE_UNSET | REV,  IUCLC,      0 )
 #endif
@@ -425,7 +425,7 @@ static const char mode_name[] =
 #endif
         MI_ENTRY("echo",     local,       SANE_SET   | REV,  ECHO,       0 )
         MI_ENTRY("echoe",    local,       SANE_SET   | REV,  ECHOE,      0 )
-        MI_ENTRY("crterase", local,       REV        | OMIT, ECHOE,      0 )
+        MI_ENTRY("crterase", local,       OMIT       | REV,  ECHOE,      0 )
         MI_ENTRY("echok",    local,       SANE_SET   | REV,  ECHOK,      0 )
         MI_ENTRY("echonl",   local,       SANE_UNSET | REV,  ECHONL,     0 )
         MI_ENTRY("noflsh",   local,       SANE_UNSET | REV,  NOFLSH,     0 )
@@ -437,15 +437,15 @@ static const char mode_name[] =
 #endif
 #if ECHOPRT
         MI_ENTRY("echoprt",  local,       SANE_UNSET | REV,  ECHOPRT,    0 )
-        MI_ENTRY("prterase", local,       REV | OMIT,        ECHOPRT,    0 )
+        MI_ENTRY("prterase", local,       OMIT       | REV,  ECHOPRT,    0 )
 #endif
 #if ECHOCTL
         MI_ENTRY("echoctl",  local,       SANE_SET   | REV,  ECHOCTL,    0 )
-        MI_ENTRY("ctlecho",  local,       REV        | OMIT, ECHOCTL,    0 )
+        MI_ENTRY("ctlecho",  local,       OMIT       | REV,  ECHOCTL,    0 )
 #endif
 #if ECHOKE
         MI_ENTRY("echoke",   local,       SANE_SET   | REV,  ECHOKE,     0 )
-        MI_ENTRY("crtkill",  local,       REV        | OMIT, ECHOKE,     0 )
+        MI_ENTRY("crtkill",  local,       OMIT       | REV,  ECHOKE,     0 )
 #endif
         ;
 
@@ -502,7 +502,7 @@ static const struct mode_info mode_info[] = {
         MI_ENTRY("icrnl",    input,       SANE_SET   | REV,  ICRNL,      0 )
         MI_ENTRY("ixon",     input,       REV,               IXON,       0 )
         MI_ENTRY("ixoff",    input,       SANE_UNSET | REV,  IXOFF,      0 )
-        MI_ENTRY("tandem",   input,       REV        | OMIT, IXOFF,      0 )
+        MI_ENTRY("tandem",   input,       OMIT       | REV,  IXOFF,      0 )
 #if IUCLC
         MI_ENTRY("iuclc",    input,       SANE_UNSET | REV,  IUCLC,      0 )
 #endif
@@ -582,7 +582,7 @@ static const struct mode_info mode_info[] = {
 #endif
         MI_ENTRY("echo",     local,       SANE_SET   | REV,  ECHO,       0 )
         MI_ENTRY("echoe",    local,       SANE_SET   | REV,  ECHOE,      0 )
-        MI_ENTRY("crterase", local,       REV        | OMIT, ECHOE,      0 )
+        MI_ENTRY("crterase", local,       OMIT       | REV,  ECHOE,      0 )
         MI_ENTRY("echok",    local,       SANE_SET   | REV,  ECHOK,      0 )
         MI_ENTRY("echonl",   local,       SANE_UNSET | REV,  ECHONL,     0 )
         MI_ENTRY("noflsh",   local,       SANE_UNSET | REV,  NOFLSH,     0 )
@@ -594,15 +594,15 @@ static const struct mode_info mode_info[] = {
 #endif
 #if ECHOPRT
         MI_ENTRY("echoprt",  local,       SANE_UNSET | REV,  ECHOPRT,    0 )
-        MI_ENTRY("prterase", local,       REV | OMIT,        ECHOPRT,    0 )
+        MI_ENTRY("prterase", local,       OMIT       | REV,  ECHOPRT,    0 )
 #endif
 #if ECHOCTL
         MI_ENTRY("echoctl",  local,       SANE_SET   | REV,  ECHOCTL,    0 )
-        MI_ENTRY("ctlecho",  local,       REV        | OMIT, ECHOCTL,    0 )
+        MI_ENTRY("ctlecho",  local,       OMIT       | REV,  ECHOCTL,    0 )
 #endif
 #if ECHOKE
         MI_ENTRY("echoke",   local,       SANE_SET   | REV,  ECHOKE,     0 )
-        MI_ENTRY("crtkill",  local,       REV        | OMIT, ECHOKE,     0 )
+        MI_ENTRY("crtkill",  local,       OMIT       | REV,  ECHOKE,     0 )
 #endif
 };