Merge branch 'busybox' into merge

20 files changed, 419 insertions, 226 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 401475f18..6330b6f8b 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -34,14 +34,6 @@
 # include <malloc.h> /* for mallopt */
 #endif
 
-#include <sys/prctl.h>
-#ifndef PR_SET_NAME
-#define PR_SET_NAME 15
-#endif
-#ifndef PR_GET_NAME
-#define PR_GET_NAME 16
-#endif
-
 /* Declare <applet>_main() */
 #define PROTOTYPES
 #include "applets.h"
@@ -985,8 +977,6 @@ void FAST_FUNC run_applet_no_and_exit(int applet_no, const char *name, char **ar
 {
         int argc = string_array_len(argv);
 
-        /* Reinit some shared global data */
-        xfunc_error_retval = EXIT_FAILURE;
         /*
          * We do not use argv[0]: do not want to repeat massaging of
          * "-/sbin/halt" -> "halt", for example.
@@ -1163,15 +1153,14 @@ int main(int argc UNUSED_PARAM, char **argv)
         }
         applet_name = bb_basename(applet_name);
 
-# if defined(__linux__)
         /* If we are a result of execv("/proc/self/exe"), fix ugly comm of "exe" */
         if (ENABLE_FEATURE_SH_STANDALONE
          || ENABLE_FEATURE_PREFER_APPLETS
          || !BB_MMU
         ) {
-                prctl(PR_SET_NAME, (long)applet_name, 0, 0, 0);
+                if (NUM_APPLETS > 1)
+                        set_task_comm(applet_name);
         }
-# endif
 
         parse_config_file(); /* ...maybe, if FEATURE_SUID_CONFIG */
         run_applet_and_exit(applet_name, argv);
diff --git a/libbb/bb_pwd.c b/libbb/bb_pwd.c
index 4829b723a..dca0a150b 100644
--- a/libbb/bb_pwd.c
+++ b/libbb/bb_pwd.c
@@ -31,9 +31,9 @@ struct group* FAST_FUNC xgetgrnam(const char *name)
         return gr;
 }
 
-
 struct passwd* FAST_FUNC xgetpwuid(uid_t uid)
 {
+        /* Note: used in nofork applets (whoami), be careful not to leak anything */
         struct passwd *pw = getpwuid(uid);
         if (!pw)
                 bb_error_msg_and_die("unknown uid %u", (unsigned)uid);
@@ -50,6 +50,7 @@ struct group* FAST_FUNC xgetgrgid(gid_t gid)
 
 char* FAST_FUNC xuid2uname(uid_t uid)
 {
+        /* Note: used in nofork applets (whoami), be careful not to leak anything */
         struct passwd *pw = xgetpwuid(uid);
         return pw->pw_name;
 }
diff --git a/libbb/capability.c b/libbb/capability.c
new file mode 100644
index 000000000..f60062bfc
--- /dev/null
+++ b/libbb/capability.c
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2017 by  <assafgordon@gmail.com>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+//kbuild:lib-$(CONFIG_PLATFORM_LINUX) += capability.o
+
+#include <linux/capability.h>
+// #include <sys/capability.h>
+// This header is in libcap, but the functions are in libc.
+// Comment in the header says this above capset/capget:
+/* system calls - look to libc for function to system call mapping */
+extern int capset(cap_user_header_t header, cap_user_data_t data);
+extern int capget(cap_user_header_t header, const cap_user_data_t data);
+// so for bbox, let's just repeat the declarations.
+// This way, libcap needs not be installed in build environment.
+#include "libbb.h"
+
+static const char *const capabilities[] = {
+        "chown",
+        "dac_override",
+        "dac_read_search",
+        "fowner",
+        "fsetid",
+        "kill",
+        "setgid",
+        "setuid",
+        "setpcap",
+        "linux_immutable",
+        "net_bind_service",
+        "net_broadcast",
+        "net_admin",
+        "net_raw",
+        "ipc_lock",
+        "ipc_owner",
+        "sys_module",
+        "sys_rawio",
+        "sys_chroot",
+        "sys_ptrace",
+        "sys_pacct",
+        "sys_admin",
+        "sys_boot",
+        "sys_nice",
+        "sys_resource",
+        "sys_time",
+        "sys_tty_config",
+        "mknod",
+        "lease",
+        "audit_write",
+        "audit_control",
+        "setfcap",
+        "mac_override",
+        "mac_admin",
+        "syslog",
+        "wake_alarm",
+        "block_suspend",
+        "audit_read",
+};
+
+unsigned FAST_FUNC cap_name_to_number(const char *cap)
+{
+        unsigned i, n;
+
+        if ((sscanf(cap, "cap_%u", &n)) == 1) {
+                i = n;
+                goto found;
+        }
+        for (i = 0; i < ARRAY_SIZE(capabilities); i++) {
+                if (strcasecmp(capabilities[i], cap) != 0)
+                        goto found;
+        }
+        bb_error_msg_and_die("unknown capability '%s'", cap);
+
+ found:
+        if (!cap_valid(i))
+                bb_error_msg_and_die("unknown capability '%s'", cap);
+        return i;
+}
+
+void FAST_FUNC printf_cap(const char *pfx, unsigned cap_no)
+{
+        if (cap_no < ARRAY_SIZE(capabilities)) {
+                printf("%s%s", pfx, capabilities[cap_no]);
+                return;
+        }
+        printf("%scap_%u", pfx, cap_no);
+}
+
+DEFINE_STRUCT_CAPS;
+
+void FAST_FUNC getcaps(void *arg)
+{
+        static const uint8_t versions[] = {
+                _LINUX_CAPABILITY_U32S_3, /* = 2 (fits into byte) */
+                _LINUX_CAPABILITY_U32S_2, /* = 2 */
+                _LINUX_CAPABILITY_U32S_1, /* = 1 */
+        };
+        int i;
+        struct caps *caps = arg;
+
+        caps->header.pid = 0;
+        for (i = 0; i < ARRAY_SIZE(versions); i++) {
+                caps->header.version = versions[i];
+                if (capget(&caps->header, NULL) == 0)
+                        goto got_it;
+        }
+        bb_simple_perror_msg_and_die("capget");
+ got_it:
+
+        switch (caps->header.version) {
+                case _LINUX_CAPABILITY_VERSION_1:
+                        caps->u32s = _LINUX_CAPABILITY_U32S_1;
+                        break;
+                case _LINUX_CAPABILITY_VERSION_2:
+                        caps->u32s = _LINUX_CAPABILITY_U32S_2;
+                        break;
+                case _LINUX_CAPABILITY_VERSION_3:
+                        caps->u32s = _LINUX_CAPABILITY_U32S_3;
+                        break;
+                default:
+                        bb_error_msg_and_die("unsupported capability version");
+        }
+
+        if (capget(&caps->header, caps->data) != 0)
+                bb_simple_perror_msg_and_die("capget");
+}
diff --git a/libbb/change_identity.c b/libbb/change_identity.c
index d48d86326..431f72c8c 100644
--- a/libbb/change_identity.c
+++ b/libbb/change_identity.c
@@ -15,7 +15,7 @@
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ''AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE
diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index cb6d12359..5372d8680 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -374,7 +374,10 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
                         int r = symlink(lpath, dest);
                         free(lpath);
                         if (r < 0) {
-                                bb_perror_msg("can't create symlink '%s'", dest);
+                                /* shared message */
+                                bb_perror_msg("can't create %slink '%s' to '%s'",
+                                        "sym", dest, lpath
+                                );
                                 return -1;
                         }
                         if (flags & FILEUTILS_PRESERVE_STATUS)
diff --git a/libbb/correct_password.c b/libbb/correct_password.c
index f4635a5bc..51928f68d 100644
--- a/libbb/correct_password.c
+++ b/libbb/correct_password.c
@@ -15,7 +15,7 @@
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ''AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE
diff --git a/libbb/dump.c b/libbb/dump.c
index 211a1ed9e..e23b71294 100644
--- a/libbb/dump.c
+++ b/libbb/dump.c
@@ -828,7 +828,7 @@ void FAST_FUNC bb_dump_add(dumper_t* pub_dumper, const char *fmt)
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ''AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
diff --git a/libbb/get_console.c b/libbb/get_console.c
index 9b6407bd0..96b339ca7 100644
--- a/libbb/get_console.c
+++ b/libbb/get_console.c
@@ -64,7 +64,6 @@ int FAST_FUNC get_console_fd_or_die(void)
         }
 
         bb_error_msg_and_die("can't open console");
-        /*return fd; - total failure */
 }
 
 /* From <linux/vt.h> */
diff --git a/libbb/getopt32.c b/libbb/getopt32.c
index 80f4cc060..f778c6e89 100644
--- a/libbb/getopt32.c
+++ b/libbb/getopt32.c
@@ -6,12 +6,13 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
-#if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG
+#if ENABLE_LONG_OPTS
 # include <getopt.h>
 #endif
 #include "libbb.h"
 
+//kbuild:lib-y += getopt32.o
+
 /*      Documentation
 
 uint32_t
@@ -95,20 +96,23 @@ getopt32(char **argv, const char *applet_opts, ...)
         env -i ls -d /
         Here we want env to process just the '-i', not the '-d'.
 
- "!"    Report bad option, missing required options,
+ "!"    Report bad options, missing required options,
         inconsistent options with all-ones return value (instead of abort).
 
-const char *applet_long_options
+ "^"    options string is "^optchars""\0""opt_complementary".
+
+uint32_t
+getopt32long(char **argv, const char *applet_opts, const char *logopts...)
 
-        This struct allows you to define long options:
+        This allows you to define long options:
 
         static const char applet_longopts[] ALIGN1 =
                 //"name\0"  has_arg     val
                 "verbose\0" No_argument "v"
                 ;
-        applet_long_options = applet_longopts;
+        opt = getopt32long(argv, applet_opts, applet_longopts, ...);
 
-        The last member of struct option (val) typically is set to
+        The last element (val) typically is set to
         matching short option from applet_opts. If there is no matching
         char in applet_opts, then:
         - return bit has next position after short options
@@ -119,7 +123,7 @@ const char *applet_long_options
         config process and not a required feature.  The current standard
         is to name the config option CONFIG_FEATURE_<applet>_LONG_OPTIONS.
 
-const char *opt_complementary
+opt_complementary - option modifiers.
 
  ":"    The colon (":") is used to separate groups of two or more chars
         and/or groups of chars and special characters (stating some
@@ -130,8 +134,7 @@ const char *opt_complementary
         Their flags will be turned on if the main option is found even
         if they are not specified on the command line.  For example:
 
-        opt_complementary = "abc";
-        flags = getopt32(argv, "abcd")
+        flags = getopt32(argv, "^abcd""\0""abc")
 
         If getopt() finds "-a" on the command line, then
         getopt32's return value will be as if "-a -b -c" were
@@ -144,8 +147,7 @@ const char *opt_complementary
         if w is given more than once, it is "unlimited"
 
         int w_counter = 0; // must be initialized!
-        opt_complementary = "ww";
-        getopt32(argv, "w", &w_counter);
+        getopt32(argv, "^w""\0""ww", &w_counter);
         if (w_counter)
                 width = (w_counter == 1) ? 132 : INT_MAX;
         else
@@ -160,8 +162,9 @@ const char *opt_complementary
 
         llist_t *my_b = NULL;
         int verbose_level = 0;
-        opt_complementary = "vv:b-c:c-b";
-        f = getopt32(argv, "vb:*c", &my_b, &verbose_level);
+        f = getopt32(argv, "^vb:*c"
+                        "\0""vv:b-c:c-b"
+                        , &my_b, &verbose_level);
         if (f & 2)       // -c after -b unsets -b flag
                 while (my_b) dosomething_with(llist_pop(&my_b));
         if (my_b)        // but llist is stored if -b is specified
@@ -170,31 +173,6 @@ const char *opt_complementary
 
 Special characters:
 
- "-"    A group consisting of just a dash forces all arguments
-        to be treated as options, even if they have no leading dashes.
-        Next char in this case can't be a digit (0-9), use ':' or end of line.
-        Example:
-
-        opt_complementary = "-:w-x:x-w"; // "-w-x:x-w" would also work,
-        getopt32(argv, "wx");            // but is less readable
-
-        This makes it possible to use options without a dash (./program w x)
-        as well as with a dash (./program -x).
-
-        NB: getopt32() will leak a small amount of memory if you use
-        this option! Do not use it if there is a possibility of recursive
-        getopt32() calls.
-
- "--"   A double dash at the beginning of opt_complementary means the
-        argv[1] string should always be treated as options, even if it isn't
-        prefixed with a "-".  This is useful for special syntax in applets
-        such as "ar" and "tar":
-        tar xvf foo.tar
-
-        NB: getopt32() will leak a small amount of memory if you use
-        this option! Do not use it if there is a possibility of recursive
-        getopt32() calls.
-
  "-N"   A dash as the first char in a opt_complementary group followed
         by a single digit (0-9) means that at least N non-option
         arguments must be present on the command line
@@ -222,7 +200,7 @@ Special characters:
         getopt32 finds -s, then -d is unset or if it finds -d
         then -s is unset.  (Note:  busybox implements the GNU
         "--max-depth" option as "-d".)  To obtain this behavior, you
-        set opt_complementary = "s-d:d-s".  Only one flag value is
+        set opt_complementary to "s-d:d-s".  Only one flag value is
         added to getopt32's return value depending on the
         position of the options on the command line.  If one of the
         two options requires an argument pointer (":" in applet_opts
@@ -230,8 +208,7 @@ Special characters:
 
         char *smax_print_depth;
 
-        opt_complementary = "s-d:d-s:x-x";
-        opt = getopt32(argv, "sd:x", &smax_print_depth);
+        opt = getopt32(argv, "^sd:x""\0""s-d:d-s:x-x", &smax_print_depth);
 
         if (opt & 2)
                 max_print_depth = atoi(smax_print_depth);
@@ -247,7 +224,7 @@ Special characters:
         The cut applet must have only one type of list specified, so
         -b, -c and -f are mutually exclusive and should raise an error
         if specified together.  In this case you must set
-        opt_complementary = "b--cf:c--bf:f--bc".  If two of the
+        opt_complementary to "b--cf:c--bf:f--bc".  If two of the
         mutually exclusive options are found, getopt32 will call
         bb_show_usage() and die.
 
@@ -259,8 +236,7 @@ Special characters:
         with xatoi_positive() - allowed range is 0..INT_MAX.
 
         int param;  // "unsigned param;" will also work
-        opt_complementary = "p+";
-        getopt32(argv, "p:", &param);
+        getopt32(argv, "^p:""\0""p+", &param);
 
  "o::"  A double colon after a char in opt_complementary means that the
         option can occur multiple times. Each occurrence will be saved as
@@ -275,8 +251,7 @@ Special characters:
         (this pointer must be initializated to NULL if the list is empty
         as required by llist_add_to_end(llist_t **old_head, char *new_item).)
 
-        opt_complementary = "e::";
-        getopt32(argv, "e:", &patterns);
+        getopt32(argv, "^e:""\0""e::", &patterns);
 
         $ grep -e user -e root /etc/passwd
         root:x:0:0:root:/root:/bin/bash
@@ -294,8 +269,7 @@ Special characters:
         For example from "id" applet:
 
         // Don't allow -n -r -rn -ug -rug -nug -rnug
-        opt_complementary = "r?ug:n?ug:u--g:g--u";
-        flags = getopt32(argv, "rnug");
+        flags = getopt32(argv, "^rnug""\0""r?ug:n?ug:u--g:g--u");
 
         This example allowed only:
         $ id; id -u; id -g; id -ru; id -nu; id -rg; id -ng; id -rnu; id -rng
@@ -306,8 +280,7 @@ Special characters:
         For example from "start-stop-daemon" applet:
 
         // Don't allow -KS -SK, but -S or -K is required
-        opt_complementary = "K:S:K--S:S--K";
-        flags = getopt32(argv, "KS...);
+        flags = getopt32(argv, "^KS...""\0""K:S:K--S:S--K");
 
 
         Don't forget to use ':'. For example, "?322-22-23X-x-a"
@@ -322,8 +295,6 @@ Special characters:
 
 const char *const bb_argv_dash[] = { "-", NULL };
 
-const char *opt_complementary;
-
 enum {
         PARAM_STRING,
         PARAM_LIST,
@@ -341,58 +312,63 @@ typedef struct {
         int *counter;
 } t_complementary;
 
-/* You can set applet_long_options for parse called long options */
-#if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG
+uint32_t option_mask32;
+
+#if ENABLE_LONG_OPTS
 static const struct option bb_null_long_options[1] = {
         { 0, 0, 0, 0 }
 };
-const char *applet_long_options;
+#else
+#define vgetopt32(argv,applet_opts,applet_long_options,p) \
+        vgetopt32(argv,applet_opts,p)
 #endif
 
-uint32_t option_mask32;
+/* Please keep getopt32 free from xmalloc */
 
-uint32_t FAST_FUNC
-getopt32(char **argv, const char *applet_opts, ...)
+static uint32_t
+vgetopt32(char **argv, const char *applet_opts, const char *applet_long_options, va_list p)
 {
         int argc;
         unsigned flags = 0;
         unsigned requires = 0;
+        unsigned len;
         t_complementary complementary[33]; /* last stays zero-filled */
-        char first_char;
+        char dont_die_flag;
         int c;
         const unsigned char *s;
+        const char *opt_complementary;
         t_complementary *on_off;
-        va_list p;
-#if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG
+#if ENABLE_LONG_OPTS
         const struct option *l_o;
         struct option *long_options = (struct option *) &bb_null_long_options;
 #endif
         unsigned trigger;
-        char **pargv;
         int min_arg = 0;
         int max_arg = -1;
-
-#define SHOW_USAGE_IF_ERROR     1
-#define ALL_ARGV_IS_OPTS        2
-#define FIRST_ARGV_IS_OPT       4
-
         int spec_flgs = 0;
 
-        /* skip 0: some applets cheat: they do not actually HAVE argv[0] */
-        argc = 1 + string_array_len(argv + 1);
-
-        va_start(p, applet_opts);
+#define SHOW_USAGE_IF_ERROR     1
 
         on_off = complementary;
         memset(on_off, 0, sizeof(complementary));
 
-        applet_opts = strcpy(alloca(strlen(applet_opts) + 1), applet_opts);
+        len = strlen(applet_opts);
 
         /* skip bbox extension */
-        first_char = applet_opts[0];
-        if (first_char == '!')
+        opt_complementary = NULL;
+        if (applet_opts[0] == '^') {
+                applet_opts++;
+                /* point it past terminating NUL */
+                opt_complementary = applet_opts + len;
+        }
+
+        /* skip another bbox extension */
+        dont_die_flag = applet_opts[0];
+        if (dont_die_flag == '!')
                 applet_opts++;
 
+        applet_opts = strcpy(alloca(len + 1), applet_opts);
+
         /* skip GNU extension */
         s = (const unsigned char *)applet_opts;
         if (*s == '+' || *s == '-')
@@ -419,7 +395,7 @@ getopt32(char **argv, const char *applet_opts, ...)
                 c++;
         }
 
-#if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG
+#if ENABLE_LONG_OPTS
         if (applet_long_options) {
                 const char *optstr;
                 unsigned i, count;
@@ -458,14 +434,11 @@ getopt32(char **argv, const char *applet_opts, ...)
                         c++;
  next_long: ;
                 }
-                /* Make it unnecessary to clear applet_long_options
-                 * by hand after each call to getopt32
-                 */
-                applet_long_options = NULL;
         }
-#endif /* ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG */
+#endif /* ENABLE_LONG_OPTS */
 
-        for (s = (const unsigned char *)opt_complementary; s && *s; s++) {
+        s = (const unsigned char *)opt_complementary;
+        if (s) for (; *s; s++) {
                 t_complementary *pair;
                 unsigned *pair_switch;
 
@@ -482,13 +455,7 @@ getopt32(char **argv, const char *applet_opts, ...)
                         continue;
                 }
                 if (*s == '-') {
-                        if (c < '0' || c > '9') {
-                                if (c == '-') {
-                                        spec_flgs |= FIRST_ARGV_IS_OPT;
-                                        s++;
-                                } else
-                                        spec_flgs |= ALL_ARGV_IS_OPTS;
-                        } else {
+                        if (c >= '0' && c <= '9') {
                                 min_arg = c - '0';
                                 s++;
                         }
@@ -548,26 +515,6 @@ getopt32(char **argv, const char *applet_opts, ...)
                 }
                 s--;
         }
-        opt_complementary = NULL;
-        va_end(p);
-
-        if (spec_flgs & (FIRST_ARGV_IS_OPT | ALL_ARGV_IS_OPTS)) {
-                pargv = argv + 1;
-                while (*pargv) {
-                        if (pargv[0][0] != '-' && pargv[0][0] != '\0') {
-                                /* Can't use alloca: opts with params will
-                                 * return pointers to stack!
-                                 * NB: we leak these allocations... */
-                                char *pp = xmalloc(strlen(*pargv) + 2);
-                                *pp = '-';
-                                strcpy(pp + 1, *pargv);
-                                *pargv = pp;
-                        }
-                        if (!(spec_flgs & ALL_ARGV_IS_OPTS))
-                                break;
-                        pargv++;
-                }
-        }
 
         /* In case getopt32 was already called:
          * reset the libc getopt() function, which keeps internal state.
@@ -576,11 +523,14 @@ getopt32(char **argv, const char *applet_opts, ...)
          */
         GETOPT_RESET();
 
+        /* skip 0: some applets cheat: they do not actually HAVE argv[0] */
+        argc = 1 + string_array_len(argv + 1);
+
         /* Note: just "getopt() <= 0" will not work well for
          * "fake" short options, like this one:
          * wget $'-\203' "Test: test" http://kernel.org/
          * (supposed to act as --header, but doesn't) */
-#if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG
+#if ENABLE_LONG_OPTS
         while ((c = getopt_long(argc, argv, applet_opts,
                         long_options, NULL)) != -1) {
 #else
@@ -637,7 +587,33 @@ getopt32(char **argv, const char *applet_opts, ...)
         return flags;
 
  error:
-        if (first_char != '!')
+        if (dont_die_flag != '!')
                 bb_show_usage();
         return (int32_t)-1;
 }
+
+uint32_t FAST_FUNC
+getopt32(char **argv, const char *applet_opts, ...)
+{
+        uint32_t opt;
+        va_list p;
+
+        va_start(p, applet_opts);
+        opt = vgetopt32(argv, applet_opts, NULL, p);
+        va_end(p);
+        return opt;
+}
+
+#if ENABLE_LONG_OPTS
+uint32_t FAST_FUNC
+getopt32long(char **argv, const char *applet_opts, const char *longopts, ...)
+{
+        uint32_t opt;
+        va_list p;
+
+        va_start(p, longopts);
+        opt = vgetopt32(argv, applet_opts, longopts, p);
+        va_end(p);
+        return opt;
+}
+#endif
diff --git a/libbb/getopt_allopts.c b/libbb/getopt_allopts.c
new file mode 100644
index 000000000..a67d2b70e
--- /dev/null
+++ b/libbb/getopt_allopts.c
@@ -0,0 +1,27 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Copyright (C) 2017 Denys Vlasenko
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+#include "libbb.h"
+
+//kbuild:lib-y += getopt_allopts.o
+
+void FAST_FUNC make_all_argv_opts(char **argv)
+{
+        /* Note: we skip argv[0] */
+        while (*++argv) {
+                char *p;
+
+                if (argv[0][0] == '-')
+                        continue;
+                /* Neither top nor ps care if "" arg turns into "-" */
+                /*if (argv[0][0] == '\0')
+                        continue;*/
+                p = xmalloc(strlen(*argv) + 2);
+                *p = '-';
+                strcpy(p + 1, *argv);
+                *argv = p;
+        }
+}
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 051a39b2e..c2b0a3842 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1320,6 +1320,7 @@ line_input_t* FAST_FUNC new_line_input_t(int flags)
 {
         line_input_t *n = xzalloc(sizeof(*n));
         n->flags = flags;
+        n->timeout = -1;
 #if MAX_HISTORY > 0
         n->max_history = MAX_HISTORY;
 #endif
@@ -2192,7 +2193,7 @@ enum {
  * Backspace deletes last matched char.
  * Control keys exit search and return to normal editing (at current history line).
  */
-static int32_t reverse_i_search(void)
+static int32_t reverse_i_search(int timeout)
 {
         char match_buf[128]; /* for user input */
         char read_key_buffer[KEYCODE_BUFFER_SIZE];
@@ -2214,8 +2215,8 @@ static int32_t reverse_i_search(void)
                 int h;
                 unsigned match_buf_len = strlen(match_buf);
 
-//FIXME: correct timeout?
-                ic = lineedit_read_key(read_key_buffer, -1);
+//FIXME: correct timeout? (i.e. count it down?)
+                ic = lineedit_read_key(read_key_buffer, timeout);
 
                 switch (ic) {
                 case CTRL('R'): /* searching for the next match */
@@ -2318,9 +2319,10 @@ static int32_t reverse_i_search(void)
  * (in both cases the cursor remains on the input line, '\n' is not printed)
  * >0 length of input string, including terminating '\n'
  */
-int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *command, int maxsize, int timeout)
+int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *command, int maxsize)
 {
         int len;
+        int timeout;
 #if ENABLE_FEATURE_TAB_COMPLETION
         smallint lastWasTab = 0;
 #endif
@@ -2366,8 +2368,15 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
                 maxsize = MAX_LINELEN;
         S.maxsize = maxsize;
 
-        /* With zero flags, no other fields are ever used */
-        state = st ? st : (line_input_t*) &const_int_0;
+        timeout = -1;
+        /* Make state->flags == 0 if st is NULL.
+         * With zeroed flags, no other fields are ever referenced.
+         */
+        state = (line_input_t*) &const_int_0;
+        if (st) {
+                state = st;
+                timeout = st->timeout;
+        }
 #if MAX_HISTORY > 0
 # if ENABLE_FEATURE_EDITING_SAVEHISTORY
         if (state->hist_file)
@@ -2584,7 +2593,7 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
                 }
 #if ENABLE_FEATURE_REVERSE_SEARCH
                 case CTRL('R'):
-                        ic = ic_raw = reverse_i_search();
+                        ic = ic_raw = reverse_i_search(timeout);
                         goto again;
 #endif
 
diff --git a/libbb/parse_config.c b/libbb/parse_config.c
index 307ae2cd2..8701b010c 100644
--- a/libbb/parse_config.c
+++ b/libbb/parse_config.c
@@ -42,8 +42,9 @@ int parse_main(int argc UNUSED_PARAM, char **argv)
         int mintokens = 0, ntokens = 128;
         unsigned noout;
 
-        opt_complementary = "-1";
-        noout = 1 & getopt32(argv, "xn:+m:+d:f:+", &ntokens, &mintokens, &delims, &flags);
+        noout = 1 & getopt32(argv, "^" "xn:+m:+d:f:+" "\0" "-1",
+                                &ntokens, &mintokens, &delims, &flags
+        );
         //argc -= optind;
         argv += optind;
 
@@ -161,13 +162,18 @@ mintokens > 0 make config_read() print error message if less than mintokens
 #undef config_read
 int FAST_FUNC config_read(parser_t *parser, char **tokens, unsigned flags, const char *delims)
 {
-        char *line;
+        char *line, *p;
         int ntokens, mintokens;
         int t;
+        char alt_comment_ch;
 
         if (!parser)
                 return 0;
 
+        alt_comment_ch = '\0';
+        if (flags & PARSE_ALT_COMMENTS)
+                alt_comment_ch = *delims++;
+
         ntokens = (uint8_t)flags;
         mintokens = (uint8_t)(flags >> 8);
 
@@ -184,7 +190,10 @@ int FAST_FUNC config_read(parser_t *parser, char **tokens, unsigned flags, const
         if (flags & PARSE_TRIM)
                 line += strspn(line, delims + 1);
 
-        if (line[0] == '\0' || line[0] == delims[0])
+        p = line;
+        if (flags & PARSE_WS_COMMENTS)
+                p = skip_whitespace(p);
+        if (p[0] == '\0' || p[0] == delims[0] || p[0] == alt_comment_ch)
                 goto again;
 
         if (flags & PARSE_KEEP_COPY) {
@@ -201,10 +210,10 @@ int FAST_FUNC config_read(parser_t *parser, char **tokens, unsigned flags, const
                 /* Combine remaining arguments? */
                 if ((t != (ntokens-1)) || !(flags & PARSE_GREEDY)) {
                         /* Vanilla token, find next delimiter */
-                        line += strcspn(line, delims[0] ? delims : delims + 1);
+                        line += strcspn(line, (delims[0] && (flags & PARSE_EOL_COMMENTS)) ? delims : delims + 1);
                 } else {
                         /* Combining, find comment char if any */
-                        line = strchrnul(line, PARSE_EOL_COMMENTS ? delims[0] : '\0');
+                        line = strchrnul(line, (flags & PARSE_EOL_COMMENTS) ? delims[0] : '\0');
 
                         /* Trim any extra delimiters from the end */
                         if (flags & PARSE_TRIM) {
@@ -214,10 +223,10 @@ int FAST_FUNC config_read(parser_t *parser, char **tokens, unsigned flags, const
                 }
 
                 /* Token not terminated? */
-                if (*line == delims[0])
-                        *line = '\0';
+                if ((flags & PARSE_EOL_COMMENTS) && *line == delims[0])
+                        *line = '\0'; /* ends with comment char: this line is done */
                 else if (*line != '\0')
-                        *line++ = '\0';
+                        *line++ = '\0'; /* token is done, continue parsing line */
 
 #if 0 /* unused so far */
                 if (flags & PARSE_ESCAPE) {
diff --git a/libbb/progress.c b/libbb/progress.c
index 3c2f01667..64e6529ac 100644
--- a/libbb/progress.c
+++ b/libbb/progress.c
@@ -25,7 +25,7 @@
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ''AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
diff --git a/libbb/pw_encrypt_des.c b/libbb/pw_encrypt_des.c
index c8e02ddff..19a9ab15b 100644
--- a/libbb/pw_encrypt_des.c
+++ b/libbb/pw_encrypt_des.c
@@ -24,7 +24,7 @@
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ''AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
diff --git a/libbb/run_shell.c b/libbb/run_shell.c
index b6b9360e8..3bb58bb6f 100644
--- a/libbb/run_shell.c
+++ b/libbb/run_shell.c
@@ -15,7 +15,7 @@
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ''AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE
diff --git a/libbb/setup_environment.c b/libbb/setup_environment.c
index 944ac5538..7ac22cd92 100644
--- a/libbb/setup_environment.c
+++ b/libbb/setup_environment.c
@@ -15,7 +15,7 @@
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ''AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE
diff --git a/libbb/trim.c b/libbb/trim.c
index 16cb4fbb0..e47fec74e 100644
--- a/libbb/trim.c
+++ b/libbb/trim.c
@@ -10,9 +10,10 @@
 
 #include "libbb.h"
 
-void FAST_FUNC trim(char *s)
+char* FAST_FUNC trim(char *s)
 {
         size_t len = strlen(s);
+        size_t old = len;
 
         /* trim trailing whitespace */
         while (len && isspace(s[len-1]))
@@ -26,5 +27,12 @@ void FAST_FUNC trim(char *s)
                         memmove(s, nws, len);
                 }
         }
-        s[len] = '\0';
+
+        s += len;
+        /* If it was a "const char*" which does not need trimming,
+         * avoid superfluous store */
+        if (old != len)
+                *s = '\0';
+
+        return s;
 }
diff --git a/libbb/ubi.c b/libbb/ubi.c
index 34595d797..a90016acf 100644
--- a/libbb/ubi.c
+++ b/libbb/ubi.c
@@ -35,6 +35,7 @@ int FAST_FUNC ubi_get_volid_by_name(unsigned ubi_devnum, const char *vol_name)
                 if (open_read_close(fname, buf, sizeof(buf)) <= 0)
                         continue;
 
+                buf[UBI_MAX_VOLUME_NAME] = '\0';
                 strchrnul(buf, '\n')[0] = '\0';
                 if (strcmp(vol_name, buf) == 0)
                         return i;
diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index 4b3ed5a3b..eca2fabf5 100644
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -14,78 +14,46 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+#include <sys/prctl.h>
+#ifndef PR_SET_NAME
+#define PR_SET_NAME 15
+#endif
+#ifndef PR_GET_NAME
+#define PR_GET_NAME 16
+#endif
 
 #include "busybox.h" /* uses applet tables */
 #include "NUM_APPLETS.h"
 
-#if !ENABLE_PLATFORM_MINGW32
-/* This does a fork/exec in one call, using vfork().  Returns PID of new child,
- * -1 for failure.  Runs argv[0], searching path if that has no / in it. */
-pid_t FAST_FUNC spawn(char **argv)
-{
-        /* Compiler should not optimize stores here */
-        volatile int failed;
-        pid_t pid;
-
-        fflush_all();
-
-        /* Be nice to nommu machines. */
-        failed = 0;
-        pid = vfork();
-        if (pid < 0) /* error */
-                return pid;
-        if (!pid) { /* child */
-                /* This macro is ok - it doesn't do NOEXEC/NOFORK tricks */
-                BB_EXECVP(argv[0], argv);
-
-                /* We are (maybe) sharing a stack with blocked parent,
-                 * let parent know we failed and then exit to unblock parent
-                 * (but don't run atexit() stuff, which would screw up parent.)
-                 */
-                failed = errno;
-                /* mount, for example, does not want the message */
-                /*bb_perror_msg("can't execute '%s'", argv[0]);*/
-                _exit(111);
-        }
-        /* parent */
-        /* Unfortunately, this is not reliable: according to standards
-         * vfork() can be equivalent to fork() and we won't see value
-         * of 'failed'.
-         * Interested party can wait on pid and learn exit code.
-         * If 111 - then it (most probably) failed to exec */
-        if (failed) {
-                safe_waitpid(pid, NULL, 0); /* prevent zombie */
-                errno = failed;
-                return -1;
-        }
-        return pid;
-}
-#endif
+#define NOFORK_SUPPORT ((NUM_APPLETS > 1) && (ENABLE_FEATURE_PREFER_APPLETS || ENABLE_FEATURE_SH_NOFORK))
+#define NOEXEC_SUPPORT ((NUM_APPLETS > 1) && (ENABLE_FEATURE_PREFER_APPLETS || ENABLE_FEATURE_SH_STANDALONE))
 
-/* Die with an error message if we can't spawn a child process. */
-pid_t FAST_FUNC xspawn(char **argv)
+#if defined(__linux__) && (NUM_APPLETS > 1)
+void FAST_FUNC set_task_comm(const char *comm)
 {
-        pid_t pid = spawn(argv);
-        if (pid < 0)
-                bb_simple_perror_msg_and_die(*argv);
-        return pid;
+        /* okay if too long (truncates) */
+        prctl(PR_SET_NAME, (long)comm, 0, 0, 0);
 }
+#endif
 
-#if ENABLE_FEATURE_PREFER_APPLETS \
- || ENABLE_FEATURE_SH_NOFORK
+/*
+ * NOFORK/NOEXEC support
+ */
+#if NOFORK_SUPPORT
 static jmp_buf die_jmp;
 static void jump(void)
 {
         /* Special case. We arrive here if NOFORK applet
          * calls xfunc, which then decides to die.
-         * We don't die, but jump instead back to caller.
+         * We don't die, but instead jump back to caller.
          * NOFORK applets still cannot carelessly call xfuncs:
          * p = xmalloc(10);
          * q = xmalloc(10); // BUG! if this dies, we leak p!
          */
         /* | 0x100 allows to pass zero exitcode (longjmp can't pass 0).
          * This works because exitcodes are bytes,
-         * run_nofork_applet() ensures that by "& 0xff" */
+         * run_nofork_applet() ensures that by "& 0xff"
+         */
         longjmp(die_jmp, xfunc_error_retval | 0x100);
 }
 
@@ -94,6 +62,7 @@ struct nofork_save_area {
         void (*die_func)(void);
         const char *applet_name;
         uint32_t option_mask32;
+        smallint logmode;
         uint8_t xfunc_error_retval;
 };
 static void save_nofork_data(struct nofork_save_area *save)
@@ -102,6 +71,7 @@ static void save_nofork_data(struct nofork_save_area *save)
         save->die_func = die_func;
         save->applet_name = applet_name;
         save->option_mask32 = option_mask32;
+        save->logmode = logmode;
         save->xfunc_error_retval = xfunc_error_retval;
 }
 static void restore_nofork_data(struct nofork_save_area *save)
@@ -110,6 +80,7 @@ static void restore_nofork_data(struct nofork_save_area *save)
         die_func = save->die_func;
         applet_name = save->applet_name;
         option_mask32 = save->option_mask32;
+        logmode = save->logmode;
         xfunc_error_retval = save->xfunc_error_retval;
 }
 
@@ -120,16 +91,15 @@ int FAST_FUNC run_nofork_applet(int applet_no, char **argv)
 
         save_nofork_data(&old);
 
+        logmode = LOGMODE_STDIO;
         xfunc_error_retval = EXIT_FAILURE;
-
-        /* In case getopt() or getopt32() was already called:
+        /* In case getopt() was already called:
          * reset the libc getopt() function, which keeps internal state.
+         * (getopt32() does it itself, but getopt() doesn't (and can't))
          */
         GETOPT_RESET();
 
-        argc = 1;
-        while (argv[argc])
-                argc++;
+        argc = string_array_len(argv);
 
         /* If xfunc "dies" in NOFORK applet, die_func longjmp's here instead */
         die_func = jump;
@@ -142,19 +112,97 @@ int FAST_FUNC run_nofork_applet(int applet_no, char **argv)
                 applet_name = tmp_argv[0];
                 /* Finally we can call NOFORK applet's main() */
                 rc = applet_main[applet_no](argc, tmp_argv);
+                /* Important for shells: `which CMD` was failing */
+                fflush_all();
         } else {
                 /* xfunc died in NOFORK applet */
         }
 
         /* Restoring some globals */
         restore_nofork_data(&old);
-
         /* Other globals can be simply reset to defaults */
         GETOPT_RESET();
 
         return rc & 0xff; /* don't confuse people with "exitcodes" >255 */
 }
-#endif /* FEATURE_PREFER_APPLETS || FEATURE_SH_NOFORK */
+#endif
+
+#if NOEXEC_SUPPORT
+void FAST_FUNC run_noexec_applet_and_exit(int a, const char *name, char **argv)
+{
+        /* reset some state and run without execing */
+        /* msg_eol = "\n"; - no caller needs this reinited yet */
+        logmode = LOGMODE_STDIO;
+        xfunc_error_retval = EXIT_FAILURE;
+        die_func = NULL;
+        GETOPT_RESET();
+
+//TODO: think pidof, pgrep, pkill!
+//set_task_comm() makes our pidof find NOEXECs (e.g. "yes >/dev/null"),
+//but one from procps-ng-3.3.10 needs more!
+//Rewrite /proc/PID/cmdline? (need to save argv0 and length at init for this to work!)
+        set_task_comm(name);
+        /* applet_name is set by this function: */
+        run_applet_no_and_exit(a, name, argv);
+}
+#endif
+
+/*
+ * Higher-level code, hiding optional NOFORK/NOEXEC trickery.
+ */
+
+#if !ENABLE_PLATFORM_MINGW32
+/* This does a fork/exec in one call, using vfork().  Returns PID of new child,
+ * -1 for failure.  Runs argv[0], searching path if that has no / in it. */
+pid_t FAST_FUNC spawn(char **argv)
+{
+        /* Compiler should not optimize stores here */
+        volatile int failed;
+        pid_t pid;
+
+        fflush_all();
+
+        /* Be nice to nommu machines. */
+        failed = 0;
+        pid = vfork();
+        if (pid < 0) /* error */
+                return pid;
+        if (!pid) { /* child */
+                /* This macro is ok - it doesn't do NOEXEC/NOFORK tricks */
+                BB_EXECVP(argv[0], argv);
+
+                /* We are (maybe) sharing a stack with blocked parent,
+                 * let parent know we failed and then exit to unblock parent
+                 * (but don't run atexit() stuff, which would screw up parent.)
+                 */
+                failed = errno;
+                /* mount, for example, does not want the message */
+                /*bb_perror_msg("can't execute '%s'", argv[0]);*/
+                _exit(111);
+        }
+        /* parent */
+        /* Unfortunately, this is not reliable: according to standards
+         * vfork() can be equivalent to fork() and we won't see value
+         * of 'failed'.
+         * Interested party can wait on pid and learn exit code.
+         * If 111 - then it (most probably) failed to exec */
+        if (failed) {
+                safe_waitpid(pid, NULL, 0); /* prevent zombie */
+                errno = failed;
+                return -1;
+        }
+        return pid;
+}
+#endif
+
+/* Die with an error message if we can't spawn a child process. */
+pid_t FAST_FUNC xspawn(char **argv)
+{
+        pid_t pid = spawn(argv);
+        if (pid < 0)
+                bb_simple_perror_msg_and_die(*argv);
+        return pid;
+}
 
 int FAST_FUNC spawn_and_wait(char **argv)
 {
@@ -174,21 +222,12 @@ int FAST_FUNC spawn_and_wait(char **argv)
                                 return wait4pid(rc);
 
                         /* child */
-                        /* reset some state and run without execing */
-
-                        /* msg_eol = "\n"; - no caller needs this reinited yet */
-                        logmode = LOGMODE_STDIO;
-                        /* die_func = NULL; - needed if the caller is a shell,
-                         * init, or a NOFORK applet. But none of those call us
-                         * as of yet (and that should probably always stay true).
-                         */
-                        /* xfunc_error_retval and applet_name are init by: */
-                        run_applet_no_and_exit(a, argv[0], argv);
+                        run_noexec_applet_and_exit(a, argv[0], argv);
                 }
 #  endif
 # endif
         }
-#endif /* FEATURE_PREFER_APPLETS */
+#endif
         rc = spawn(argv);
         return wait4pid(rc);
 }
@@ -209,6 +248,9 @@ pid_t FAST_FUNC fork_or_rexec(char **argv)
         /* Maybe we are already re-execed and come here again? */
         if (re_execed)
                 return 0;
+
+        /* fflush_all(); ? - so far all callers had no buffered output to flush */
+
         pid = xvfork();
         if (pid) /* parent */
                 return pid;
@@ -245,8 +287,11 @@ void FAST_FUNC bb_daemonize_or_rexec(int flags, char **argv)
                 fd = dup(fd); /* have 0,1,2 open at least to /dev/null */
 
         if (!(flags & DAEMON_ONLY_SANITIZE)) {
+
+                /* fflush_all(); - add it in fork_or_rexec() if necessary */
+
                 if (fork_or_rexec(argv))
-                        exit(EXIT_SUCCESS); /* parent */
+                        _exit(EXIT_SUCCESS); /* parent */
                 /* if daemonizing, detach from stdio & ctty */
                 setsid();
                 dup2(fd, 0);
@@ -258,7 +303,7 @@ void FAST_FUNC bb_daemonize_or_rexec(int flags, char **argv)
                          * Prevent this: stop being a session leader.
                          */
                         if (fork_or_rexec(argv))
-                                exit(EXIT_SUCCESS); /* parent */
+                                _exit(EXIT_SUCCESS); /* parent */
                 }
         }
         while (fd > 2) {
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 98d3531d6..1b3a1667b 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -313,7 +313,7 @@ int FAST_FUNC tcsetattr_stdin_TCSANOW(const struct termios *tp)
 
 int FAST_FUNC set_termios_to_raw(int fd, struct termios *oldterm, int flags)
 {
-//TODO: lineedit, microcom and less might be adapted to use this too:
+//TODO: lineedit, microcom, slattach, less might be adapted to use this too:
 // grep for "tcsetattr"
 
         struct termios newterm;