8 files changed, 37 insertions, 91 deletions

diff --git a/libbb/Config.src b/libbb/Config.src
index 19021fed1..6ba256290 100644
--- a/libbb/Config.src
+++ b/libbb/Config.src
@@ -16,7 +16,7 @@ config PASSWORD_MINLEN
 
 config MD5_SMALL
         int "MD5: Trade bytes for speed (0:fast, 3:slow)"
-        default 1
+        default 1  # all "fast or small" options default to small
         range 0 3
         help
           Trade binary size versus speed for the md5sum algorithm.
@@ -30,7 +30,7 @@ config MD5_SMALL
 
 config SHA3_SMALL
         int "SHA3: Trade bytes for speed (0:fast, 1:slow)"
-        default 1
+        default 1  # all "fast or small" options default to small
         range 0 1
         help
           Trade binary size versus speed for the sha3sum algorithm.
@@ -40,7 +40,7 @@ config SHA3_SMALL
 
 config FEATURE_FAST_TOP
         bool "Faster /proc scanning code (+100 bytes)"
-        default y
+        default n  # all "fast or small" options default to small
         help
           This option makes top (and ps) ~20% faster (or 20% less CPU hungry),
           but code size is slightly bigger.
@@ -114,7 +114,7 @@ config FEATURE_EDITING_SAVE_ON_EXIT
 config FEATURE_REVERSE_SEARCH
         bool "Reverse history search"
         default y
-        depends on FEATURE_EDITING_SAVEHISTORY
+        depends on FEATURE_EDITING
         help
           Enable readline-like Ctrl-R combination for reverse history search.
           Increases code by about 0.5k.
@@ -208,7 +208,7 @@ config FEATURE_SKIP_ROOTFS
 
 config MONOTONIC_SYSCALL
         bool "Use clock_gettime(CLOCK_MONOTONIC) syscall"
-        default n
+        default y
         select PLATFORM_LINUX
         help
           Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 7da7cad1c..1d6a4b274 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -628,7 +628,7 @@ static int busybox_main(char **argv)
                 output_width = 80;
                 if (ENABLE_FEATURE_AUTOWIDTH) {
                         /* Obtain the terminal width */
-                        get_terminal_width_height(0, &output_width, NULL);
+                        output_width = get_terminal_width(2);
                 }
 
                 dup2(1, 2);
@@ -659,10 +659,10 @@ static int busybox_main(char **argv)
                         )
                         IF_FEATURE_SH_STANDALONE(
                         "\tBusyBox is a multi-call binary that combines many common Unix\n"
-                        "\tutilities into a single executable.  The shell in this version\n"
-                        "\thas been configured to prefer built-in utilities to external\n"
-                        "\tbinaries.  This avoids having to install a link to busybox for\n"
-                        "\teach function to be invoked.\n"
+                        "\tutilities into a single executable.  The shell in this build\n"
+                        "\tis configured to run built-in utilities without $PATH search.\n"
+                        "\tYou don't need to install a link to busybox for each utility.\n"
+                        "\tTo run external program, use full path (/sbin/ip instead of ip).\n"
                         )
                         "\n"
 #if ENABLE_GLOBBING
diff --git a/libbb/kernel_version.c b/libbb/kernel_version.c
index 738ed022b..9b6c62299 100644
--- a/libbb/kernel_version.c
+++ b/libbb/kernel_version.c
@@ -20,16 +20,16 @@
 int FAST_FUNC get_linux_version_code(void)
 {
         struct utsname name;
-        char *s, *t;
+        char *t;
         int i, r;
 
         uname(&name); /* never fails */
-        s = name.release;
+        t = name.release;
         r = 0;
         for (i = 0; i < 3; i++) {
-                t = strtok(s, ".");
+                t = strtok(t, ".");
                 r = r * 256 + (t ? atoi(t) : 0);
-                s = NULL;
+                t = NULL;
         }
         return r;
 }
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 5cb40a508..04361b509 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -829,10 +829,12 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
         if (type == FIND_EXE_ONLY) {
                 const char *p = applet_names;
 
-                for (i=0; i < NUM_APPLETS; i++) {
+                i = 0;
+                while (i < NUM_APPLETS) {
                         if (strncmp(pfind, p, pf_len) == 0)
                                 add_match(xstrdup(p));
                         p += strlen(p) + 1;
+                        i++;
                 }
         }
 #endif
diff --git a/libbb/procps.c b/libbb/procps.c
index 5a4ea59d0..452b50b82 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -589,12 +589,14 @@ void FAST_FUNC read_cmdline(char *buf, int col, unsigned pid, const char *comm)
                                 buf[sz] = ' ';
                         sz--;
                 }
+                if (base[0] == '-') /* "-sh" (login shell)? */
+                        base++;
 
                 /* If comm differs from argv0, prepend "{comm} ".
                  * It allows to see thread names set by prctl(PR_SET_NAME).
                  */
-                if (base[0] == '-') /* "-sh" (login shell)? */
-                        base++;
+                if (!comm)
+                        return;
                 comm_len = strlen(comm);
                 /* Why compare up to comm_len, not COMM_LEN-1?
                  * Well, some processes rewrite argv, and use _spaces_ there
@@ -613,7 +615,7 @@ void FAST_FUNC read_cmdline(char *buf, int col, unsigned pid, const char *comm)
                         buf[col - 1] = '\0';
                 }
         } else {
-                snprintf(buf, col, "[%s]", comm);
+                snprintf(buf, col, "[%s]", comm ? comm : "?");
         }
 }
 
diff --git a/libbb/progress.c b/libbb/progress.c
index 372feb0c2..3c2f01667 100644
--- a/libbb/progress.c
+++ b/libbb/progress.c
@@ -45,13 +45,6 @@ enum {
         STALLTIME = 5
 };
 
-static unsigned int get_tty2_width(void)
-{
-        unsigned width;
-        get_terminal_width_height(2, &width, NULL);
-        return width;
-}
-
 void FAST_FUNC bb_progress_init(bb_progress_t *p, const char *curfile)
 {
 #if ENABLE_UNICODE_SUPPORT
@@ -80,7 +73,7 @@ void FAST_FUNC bb_progress_update(bb_progress_t *p,
 {
         uoff_t beg_and_transferred;
         unsigned since_last_update, elapsed;
-        int barlength;
+        int notty;
         int kiloscale;
 
         //transferred = 1234; /* use for stall detection testing */
@@ -137,18 +130,21 @@ void FAST_FUNC bb_progress_update(bb_progress_t *p,
                 }
         }
 
+        notty = !isatty(STDERR_FILENO);
+
         if (ENABLE_UNICODE_SUPPORT)
-                fprintf(stderr, "\r%s", p->curfile);
+                fprintf(stderr, "\r%s" + notty, p->curfile);
         else
-                fprintf(stderr, "\r%-20.20s", p->curfile);
+                fprintf(stderr, "\r%-20.20s" + notty, p->curfile);
 
         beg_and_transferred = beg_size + transferred;
 
         if (totalsize != 0) {
+                int barlength;
                 unsigned ratio = 100 * beg_and_transferred / totalsize;
                 fprintf(stderr, "%4u%%", ratio);
 
-                barlength = get_tty2_width() - 49;
+                barlength = get_terminal_width(2) - 49;
                 if (barlength > 0) {
                         /* god bless gcc for variable arrays :) */
                         char buf[barlength + 1];
@@ -204,4 +200,6 @@ void FAST_FUNC bb_progress_update(bb_progress_t *p,
                 hours = eta / 3600;
                 fprintf(stderr, "%3u:%02u:%02u ETA", hours, secs / 60, secs % 60);
         }
+        if (notty)
+                fputc('\n', stderr);
 }
diff --git a/libbb/systemd_support.c b/libbb/systemd_support.c
deleted file mode 100644
index 542a3efff..000000000
--- a/libbb/systemd_support.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2011 Davide Cavalca <davide@geexbox.org>
- *
- * Based on http://cgit.freedesktop.org/systemd/tree/src/sd-daemon.c
- * Copyright 2010 Lennart Poettering
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#include "libbb.h"
-
-//config:config FEATURE_SYSTEMD
-//config:       bool "Enable systemd support"
-//config:       default y
-//config:       help
-//config:         If you plan to use busybox daemons on a system where daemons
-//config:         are controlled by systemd, enable this option.
-//config:         If you don't use systemd, it is still safe to enable it,
-//config:         but the downside is increased code size.
-
-//kbuild:lib-$(CONFIG_FEATURE_SYSTEMD) += systemd_support.o
-
-int sd_listen_fds(void)
-{
-        const char *e;
-        int n;
-        int fd;
-
-        e = getenv("LISTEN_PID");
-        if (!e)
-                return 0;
-        n = xatoi_positive(e);
-        /* Is this for us? */
-        if (getpid() != (pid_t) n)
-                return 0;
-
-        e = getenv("LISTEN_FDS");
-        if (!e)
-                return 0;
-        n = xatoi_positive(e);
-        for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd++)
-                close_on_exec_on(fd);
-
-        return n;
-}
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 0c9969640..206edb4a0 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -270,6 +270,12 @@ int FAST_FUNC get_terminal_width_height(int fd, unsigned *width, unsigned *heigh
                 *width = wh_helper(win.ws_col, 80, "COLUMNS", &err);
         return err;
 }
+int FAST_FUNC get_terminal_width(int fd)
+{
+        unsigned width;
+        get_terminal_width_height(fd, &width, NULL);
+        return width;
+}
 
 int FAST_FUNC tcsetattr_stdin_TCSANOW(const struct termios *tp)
 {