Merge commit 'da4441c44f6efccb6f7b7588404d9c6bfb7b6af8' into merge

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

12 files changed, 196 insertions, 124 deletions

diff --git a/libbb/Config.src b/libbb/Config.src
index 85892d3fe..18bdc5151 100644
--- a/libbb/Config.src
+++ b/libbb/Config.src
@@ -156,11 +156,30 @@ config FEATURE_COPYBUF_KB
         range 1 1024
         default 4
         help
-          Size of buffer used by cp, mv, install etc.
+          Size of buffer used by cp, mv, install, wget etc.
           Buffers which are 4 kb or less will be allocated on stack.
           Bigger buffers will be allocated with mmap, with fallback to 4 kb
           stack buffer if mmap fails.
 
+config FEATURE_SKIP_ROOTFS
+        bool "Skip rootfs in mount table"
+        default y
+        help
+          Ignore rootfs entry in mount table.
+
+          In Linux, kernel has a special filesystem, rootfs, which is initially
+          mounted on /. It contains initramfs data, if kernel is configured
+          to have one. Usually, another file system is mounted over / early
+          in boot process, and therefore most tools which manipulate
+          mount table, such as df, will skip rootfs entry.
+
+          However, some systems do not mount anything on /.
+          If you need to configure busybox for one of these systems,
+          you may find useful to turn this option off to make df show
+          initramfs statistic.
+
+          Otherwise, choose Y.
+
 config MONOTONIC_SYSCALL
         bool "Use clock_gettime(CLOCK_MONOTONIC) syscall"
         default n
diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index adbc2dea3..48aaf481d 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -78,9 +78,9 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
         /* NB: each struct stat is ~100 bytes */
         struct stat source_stat;
         struct stat dest_stat;
-        signed char retval = 0;
-        signed char dest_exists = 0;
-        signed char ovr;
+        smallint retval = 0;
+        smallint dest_exists = 0;
+        smallint ovr;
 
 /* Inverse of cp -d ("cp without -d") */
 #define FLAGS_DEREF (flags & (FILEUTILS_DEREFERENCE + FILEUTILS_DEREFERENCE_L0))
@@ -157,7 +157,6 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
                 }
 #endif
 
-                /* Create DEST */
                 if (dest_exists) {
                         if (!S_ISDIR(dest_stat.st_mode)) {
                                 bb_error_msg("target '%s' is not a directory", dest);
@@ -166,6 +165,7 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
                         /* race here: user can substitute a symlink between
                          * this check and actual creation of files inside dest */
                 } else {
+                        /* Create DEST */
                         mode_t mode;
                         saved_umask = umask(0);
 
diff --git a/libbb/crc32.c b/libbb/crc32.c
index c63bf0772..ac9836cc9 100644
--- a/libbb/crc32.c
+++ b/libbb/crc32.c
@@ -59,7 +59,7 @@ uint32_t FAST_FUNC crc32_block_endian0(uint32_t val, const void *buf, unsigned l
         const void *end = (uint8_t*)buf + len;
 
         while (buf != end) {
-                val = crc_table[(uint8_t)val ^ *(uint8_t*)buf] ^ (val >> 8);
+                val = crc_table[(uint8_t)val ^ *(uint8_t*)buf] ^ (val >> 8);
                 buf = (uint8_t*)buf + 1;
         }
         return val;
diff --git a/libbb/execable.c b/libbb/execable.c
index 3b144a730..e35dad208 100644
--- a/libbb/execable.c
+++ b/libbb/execable.c
@@ -101,12 +101,12 @@ int FAST_FUNC exists_execable(const char *filename)
 }
 
 #if ENABLE_FEATURE_PREFER_APPLETS
-/* just like the real execvp, but try to launch an applet named 'file' first
- */
-int FAST_FUNC bb_execvp(const char *file, char *const argv[])
+/* just like the real execvp, but try to launch an applet named 'file' first */
+int FAST_FUNC BB_EXECVP(const char *file, char *const argv[])
 {
-        return execvp(find_applet_by_name(file) >= 0 ? bb_busybox_exec_path : file,
-                                        argv);
+        if (find_applet_by_name(file) >= 0)
+                execvp(bb_busybox_exec_path, argv);
+        return execvp(file, argv);
 }
 #endif
 
diff --git a/libbb/find_mount_point.c b/libbb/find_mount_point.c
index 361698a6b..56637ad92 100644
--- a/libbb/find_mount_point.c
+++ b/libbb/find_mount_point.c
@@ -43,7 +43,7 @@ struct mntent* FAST_FUNC find_mount_point(const char *name, int subdir_too)
                 /* rootfs mount in Linux 2.6 exists always,
                  * and it makes sense to always ignore it.
                  * Otherwise people can't reference their "real" root! */
-                if (strcmp(mountEntry->mnt_fsname, "rootfs") == 0)
+                if (ENABLE_FEATURE_SKIP_ROOTFS && strcmp(mountEntry->mnt_fsname, "rootfs") == 0)
                         continue;
 
                 if (strcmp(name, mountEntry->mnt_dir) == 0
diff --git a/libbb/getopt32.c b/libbb/getopt32.c
index 187cb3a79..053ffc349 100644
--- a/libbb/getopt32.c
+++ b/libbb/getopt32.c
@@ -80,9 +80,9 @@ const char *applet_long_options
         This struct allows you to define long options:
 
         static const char applet_longopts[] ALIGN1 =
-                //"name\0" has_arg val
-                "verbose\0" No_argument "v"
-                ;
+                //"name\0" has_arg val
+                "verbose\0" No_argument "v"
+                ;
         applet_long_options = applet_longopts;
 
         The last member of struct option (val) typically is set to
@@ -226,7 +226,7 @@ Special characters:
         if specified together.  In this case you must set
         opt_complementary = "b--cf:c--bf:f--bc".  If two of the
         mutually exclusive options are found, getopt32 will call
-        bb_show_usage() and die.
+        bb_show_usage() and die.
 
  "x--x" Variation of the above, it means that -x option should occur
         at most once.
@@ -531,7 +531,7 @@ getopt32(char **argv, const char *applet_opts, ...)
 
         /* In case getopt32 was already called:
          * reset the libc getopt() function, which keeps internal state.
-         * run_nofork_applet_prime() does this, but we might end up here
+         * run_nofork_applet() does this, but we might end up here
          * also via gunzip_main() -> gzip_main(). Play safe.
          */
 #if defined(__GLIBC__) || ENABLE_PLATFORM_MINGW32
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index f9658711a..92ecc330a 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1817,10 +1817,9 @@ static void win_changed(int nsig)
         errno = sv_errno;
 }
 
-static int lineedit_read_key(char *read_key_buffer)
+static int lineedit_read_key(char *read_key_buffer, int timeout)
 {
         int64_t ic;
-        int timeout = -1;
 #if ENABLE_UNICODE_SUPPORT
         char unicode_buf[MB_CUR_MAX + 1];
         int unicode_idx = 0;
@@ -1925,7 +1924,7 @@ static int isrtl_str(void)
  * 0  on ctrl-C (the line entered is still returned in 'command'),
  * >0 length of input string, including terminating '\n'
  */
-int FAST_FUNC read_line_input(const char *prompt, char *command, int maxsize, line_input_t *st)
+int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *command, int maxsize, int timeout)
 {
         int len;
 #if ENABLE_FEATURE_TAB_COMPLETION
@@ -2006,7 +2005,6 @@ int FAST_FUNC read_line_input(const char *prompt, char *command, int maxsize, li
         new_settings.c_cc[VINTR] = _POSIX_VDISABLE;
         tcsetattr_stdin_TCSANOW(&new_settings);
 
-        /* Now initialize things */
         previous_SIGWINCH_handler = signal(SIGWINCH, win_changed);
         win_changed(0); /* do initial resizing */
 #if ENABLE_USERNAME_OR_HOMEDIR
@@ -2048,7 +2046,7 @@ int FAST_FUNC read_line_input(const char *prompt, char *command, int maxsize, li
                 int32_t ic, ic_raw;
 
                 fflush_all();
-                ic = ic_raw = lineedit_read_key(read_key_buffer);
+                ic = ic_raw = lineedit_read_key(read_key_buffer, timeout);
 
 #if ENABLE_FEATURE_EDITING_VI
                 newdelflag = 1;
@@ -2209,7 +2207,7 @@ int FAST_FUNC read_line_input(const char *prompt, char *command, int maxsize, li
                 case 'd'|VI_CMDMODE_BIT: {
                         int nc, sc;
 
-                        ic = lineedit_read_key(read_key_buffer);
+                        ic = lineedit_read_key(read_key_buffer, timeout);
                         if (errno) /* error */
                                 goto return_error_indicator;
                         if (ic == ic_raw) { /* "cc", "dd" */
@@ -2273,7 +2271,7 @@ int FAST_FUNC read_line_input(const char *prompt, char *command, int maxsize, li
                         break;
                 case 'r'|VI_CMDMODE_BIT:
 //FIXME: unicode case?
-                        ic = lineedit_read_key(read_key_buffer);
+                        ic = lineedit_read_key(read_key_buffer, timeout);
                         if (errno) /* error */
                                 goto return_error_indicator;
                         if (ic < ' ' || ic > 255) {
diff --git a/libbb/messages.c b/libbb/messages.c
index 9e7bd0fef..ef42b30d7 100644
--- a/libbb/messages.c
+++ b/libbb/messages.c
@@ -22,7 +22,7 @@
 const char bb_banner[] ALIGN1 = BANNER;
 
 
-const char bb_msg_memory_exhausted[] ALIGN1 = "memory exhausted";
+const char bb_msg_memory_exhausted[] ALIGN1 = "out of memory";
 const char bb_msg_invalid_date[] ALIGN1 = "invalid date '%s'";
 const char bb_msg_unknown[] ALIGN1 = "(unknown)";
 const char bb_msg_can_not_create_raw_socket[] ALIGN1 = "can't create raw socket";
diff --git a/libbb/platform.c b/libbb/platform.c
index 30d06e3a7..1441a84ac 100644
--- a/libbb/platform.c
+++ b/libbb/platform.c
@@ -147,3 +147,14 @@ char* FAST_FUNC strsep(char **stringp, const char *delim)
         return start;
 }
 #endif
+
+#ifndef HAVE_STPCPY
+char* FAST_FUNC stpcpy(char *p, const char *to_add)
+{
+        while ((*p = *to_add) != '\0') {
+                p++;
+                to_add++;
+        }
+        return p;
+}
+#endif
diff --git a/libbb/progress.c b/libbb/progress.c
index 40608b047..df43dad5c 100644
--- a/libbb/progress.c
+++ b/libbb/progress.c
@@ -52,101 +52,154 @@ static unsigned int get_tty2_width(void)
         return width;
 }
 
-void FAST_FUNC bb_progress_init(bb_progress_t *p)
+void FAST_FUNC bb_progress_init(bb_progress_t *p, const char *curfile)
 {
+#if ENABLE_UNICODE_SUPPORT
+        init_unicode();
+        p->curfile = unicode_conv_to_printable_fixedwidth(/*NULL,*/ curfile, 20);
+#else
+        p->curfile = curfile;
+#endif
         p->start_sec = monotonic_sec();
-        p->lastupdate_sec = p->start_sec;
-        p->lastsize = 0;
-        p->inited = 1;
+        p->last_update_sec = p->start_sec;
+        p->last_change_sec = p->start_sec;
+        p->last_size = 0;
 }
 
+/* File already had beg_size bytes.
+ * Then we started downloading.
+ * We downloaded "transferred" bytes so far.
+ * Download is expected to stop when total size (beg_size + transferred)
+ * will be "totalsize" bytes.
+ * If totalsize == 0, then it is unknown.
+ */
 void FAST_FUNC bb_progress_update(bb_progress_t *p,
-                const char *curfile,
-                off_t beg_range,
-                off_t transferred,
-                off_t totalsize)
+                uoff_t beg_size,
+                uoff_t transferred,
+                uoff_t totalsize)
 {
         uoff_t beg_and_transferred;
         unsigned since_last_update, elapsed;
-        unsigned ratio;
-        int barlength, i;
+        int barlength;
+        int kiloscale;
 
-        /* totalsize == 0 if it is unknown */
+        //transferred = 1234; /* use for stall detection testing */
+        //totalsize = 0; /* use for unknown size download testing */
 
         elapsed = monotonic_sec();
-        since_last_update = elapsed - p->lastupdate_sec;
-        /* Do not update on every call
-         * (we can be called on every network read!) */
-        if (since_last_update == 0 && !totalsize)
-                return;
+        since_last_update = elapsed - p->last_update_sec;
+        p->last_update_sec = elapsed;
 
-        beg_and_transferred = beg_range + transferred;
-        ratio = 100;
-        if (beg_and_transferred < totalsize) {
-                /* Do not update on every call
-                 * (we can be called on every network read!) */
-                if (since_last_update == 0)
-                        return;
-                /* long long helps to have it working even if !LFS */
-                ratio = 100ULL * beg_and_transferred / (uoff_t)totalsize;
+        if (totalsize != 0 && transferred >= totalsize - beg_size) {
+                /* Last call. Do not skip this update */
+                transferred = totalsize - beg_size; /* sanitize just in case */
+        }
+        else if (since_last_update == 0) {
+                /*
+                 * Do not update on every call
+                 * (we can be called on every network read!)
+                 */
+                return;
         }
 
-#if ENABLE_UNICODE_SUPPORT
-        init_unicode();
-        {
-                char *buf = unicode_conv_to_printable_fixedwidth(/*NULL,*/ curfile, 20);
-                fprintf(stderr, "\r%s%4u%% ", buf, ratio);
-                free(buf);
+        kiloscale = 0;
+        /*
+         * Scale sizes down if they are close to overflowing.
+         * This allows calculations like (100 * transferred / totalsize)
+         * without risking overflow: we guarantee 10 highest bits to be 0.
+         * Introduced error is less than 1 / 2^12 ~= 0.025%
+         */
+        if (ULONG_MAX > 0xffffffff || sizeof(off_t) == 4 || sizeof(off_t) != 8) {
+                /*
+                 * 64-bit CPU || small off_t: in either case,
+                 * >> is cheap, single-word operation.
+                 * ... || strange off_t: also use this code
+                 * (it is safe, just suboptimal wrt code size),
+                 * because 32/64 optimized one works only for 64-bit off_t.
+                 */
+                if (totalsize >= (1 << 22)) {
+                        totalsize >>= 10;
+                        beg_size >>= 10;
+                        transferred >>= 10;
+                        kiloscale = 1;
+                }
+        } else {
+                /* 32-bit CPU and 64-bit off_t.
+                 * Use a 40-bit shift, it is easier to do on 32-bit CPU.
+                 */
+                if (totalsize >= (uoff_t)(1ULL << 54)) {
+                        totalsize = (uint32_t)(totalsize >> 32) >> 8;
+                        beg_size = (uint32_t)(beg_size >> 32) >> 8;
+                        transferred = (uint32_t)(transferred >> 32) >> 8;
+                        kiloscale = 4;
+                }
         }
-#else
-        fprintf(stderr, "\r%-20.20s%4u%% ", curfile, ratio);
-#endif
 
-        barlength = get_tty2_width() - 49;
-        if (barlength > 0) {
-                /* god bless gcc for variable arrays :) */
-                char buf[barlength + 1];
-                unsigned stars = (unsigned)barlength * ratio / (unsigned)100;
-                memset(buf, ' ', barlength);
-                buf[barlength] = '\0';
-                memset(buf, '*', stars);
-                fprintf(stderr, "|%s|", buf);
+        if (ENABLE_UNICODE_SUPPORT)
+                fprintf(stderr, "\r%s", p->curfile);
+        else
+                fprintf(stderr, "\r%-20.20s", p->curfile);
+
+        beg_and_transferred = beg_size + transferred;
+
+        if (totalsize != 0) {
+                unsigned ratio = 100 * beg_and_transferred / totalsize;
+                fprintf(stderr, "%4u%%", ratio);
+
+                barlength = get_tty2_width() - 49;
+                if (barlength > 0) {
+                        /* god bless gcc for variable arrays :) */
+                        char buf[barlength + 1];
+                        unsigned stars = (unsigned)barlength * beg_and_transferred / totalsize;
+                        memset(buf, ' ', barlength);
+                        buf[barlength] = '\0';
+                        memset(buf, '*', stars);
+                        fprintf(stderr, " |%s|", buf);
+                }
         }
 
-        i = 0;
         while (beg_and_transferred >= 100000) {
-                i++;
                 beg_and_transferred >>= 10;
+                kiloscale++;
         }
         /* see http://en.wikipedia.org/wiki/Tera */
-        fprintf(stderr, "%6u%c ", (unsigned)beg_and_transferred, " kMGTPEZY"[i]);
-#define beg_and_transferred dont_use_beg_and_transferred_below
+        fprintf(stderr, "%6u%c", (unsigned)beg_and_transferred, " kMGTPEZY"[kiloscale]);
+#define beg_and_transferred dont_use_beg_and_transferred_below()
 
-        if (transferred > p->lastsize) {
-                p->lastupdate_sec = elapsed;
-                p->lastsize = transferred;
+        since_last_update = elapsed - p->last_change_sec;
+        if ((unsigned)transferred != p->last_size) {
+                p->last_change_sec = elapsed;
+                p->last_size = (unsigned)transferred;
                 if (since_last_update >= STALLTIME) {
-                        /* We "cut off" these seconds from elapsed time
+                        /* We "cut out" these seconds from elapsed time
                          * by adjusting start time */
                         p->start_sec += since_last_update;
                 }
                 since_last_update = 0; /* we are un-stalled now */
         }
+
         elapsed -= p->start_sec; /* now it's "elapsed since start" */
 
         if (since_last_update >= STALLTIME) {
-                fprintf(stderr, " - stalled -");
+                fprintf(stderr, "  - stalled -");
+        } else if (!totalsize || !transferred || (int)elapsed < 0) {
+                fprintf(stderr, " --:--:-- ETA");
         } else {
-                off_t to_download = totalsize - beg_range;
-                if (!totalsize || transferred <= 0 || (int)elapsed <= 0 || transferred > to_download) {
-                        fprintf(stderr, "--:--:-- ETA");
-                } else {
-                        /* to_download / (transferred/elapsed) - elapsed: */
-                        /* (long long helps to have working ETA even if !LFS) */
-                        unsigned eta = (unsigned long long)to_download*elapsed/(uoff_t)transferred - elapsed;
-                        unsigned secs = eta % 3600;
-                        unsigned hours = eta / 3600;
-                        fprintf(stderr, "%02u:%02u:%02u ETA", hours, secs / 60, secs % 60);
-                }
+                unsigned eta, secs, hours;
+
+                totalsize -= beg_size; /* now it's "total to upload" */
+
+                /* Estimated remaining time =
+                 * estimated_sec_to_dl_totalsize_bytes - elapsed_sec =
+                 * totalsize / average_bytes_sec_so_far - elapsed =
+                 * totalsize / (transferred/elapsed) - elapsed =
+                 * totalsize * elapsed / transferred - elapsed
+                 */
+                eta = totalsize * elapsed / transferred - elapsed;
+                if (eta >= 1000*60*60)
+                        eta = 1000*60*60 - 1;
+                secs = eta % 3600;
+                hours = eta / 3600;
+                fprintf(stderr, "%3u:%02u:%02u ETA", hours, secs / 60, secs % 60);
         }
 }
diff --git a/libbb/systemd_support.c b/libbb/systemd_support.c
index 981296dbb..542a3efff 100644
--- a/libbb/systemd_support.c
+++ b/libbb/systemd_support.c
@@ -33,7 +33,7 @@
 //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 yhe downside is increased code size.
+//config:         but the downside is increased code size.
 
 //kbuild:lib-$(CONFIG_FEATURE_SYSTEMD) += systemd_support.o
 
diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index 1fbb1bba9..5d8056bd6 100644
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -55,6 +55,7 @@ pid_t FAST_FUNC spawn(char **argv)
          * 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;
         }
@@ -71,17 +72,22 @@ pid_t FAST_FUNC xspawn(char **argv)
 }
 
 #if ENABLE_FEATURE_PREFER_APPLETS
-void FAST_FUNC save_nofork_data(struct nofork_save_area *save)
+struct nofork_save_area {
+        jmp_buf die_jmp;
+        const char *applet_name;
+        uint32_t option_mask32;
+        int die_sleep;
+        uint8_t xfunc_error_retval;
+};
+static void save_nofork_data(struct nofork_save_area *save)
 {
         memcpy(&save->die_jmp, &die_jmp, sizeof(die_jmp));
         save->applet_name = applet_name;
         save->xfunc_error_retval = xfunc_error_retval;
         save->option_mask32 = option_mask32;
         save->die_sleep = die_sleep;
-        save->saved = 1;
 }
-
-void FAST_FUNC restore_nofork_data(struct nofork_save_area *save)
+static void restore_nofork_data(struct nofork_save_area *save)
 {
         memcpy(&die_jmp, &save->die_jmp, sizeof(die_jmp));
         applet_name = save->applet_name;
@@ -90,19 +96,17 @@ void FAST_FUNC restore_nofork_data(struct nofork_save_area *save)
         die_sleep = save->die_sleep;
 }
 
-int FAST_FUNC run_nofork_applet_prime(struct nofork_save_area *old, int applet_no, char **argv)
+int FAST_FUNC run_nofork_applet(int applet_no, char **argv)
 {
         int rc, argc;
+        struct nofork_save_area old;
+
+        save_nofork_data(&old);
 
         applet_name = APPLET_NAME(applet_no);
 
         xfunc_error_retval = EXIT_FAILURE;
 
-        /* Special flag for xfunc_die(). If xfunc will "die"
-         * in NOFORK applet, xfunc_die() sees negative
-         * die_sleep and longjmp here instead. */
-        die_sleep = -1;
-
         /* In case getopt() or getopt32() was already called:
          * reset the libc getopt() function, which keeps internal state.
          *
@@ -132,6 +136,11 @@ int FAST_FUNC run_nofork_applet_prime(struct nofork_save_area *old, int applet_n
         while (argv[argc])
                 argc++;
 
+        /* Special flag for xfunc_die(). If xfunc will "die"
+         * in NOFORK applet, xfunc_die() sees negative
+         * die_sleep and longjmp here instead. */
+        die_sleep = -1;
+
         rc = setjmp(die_jmp);
         if (!rc) {
                 /* Some callers (xargs)
@@ -140,15 +149,6 @@ int FAST_FUNC run_nofork_applet_prime(struct nofork_save_area *old, int applet_n
                 memcpy(tmp_argv, argv, (argc+1) * sizeof(tmp_argv[0]));
                 /* Finally we can call NOFORK applet's main() */
                 rc = applet_main[applet_no](argc, tmp_argv);
-
-        /* The whole reason behind nofork_save_area is that <applet>_main
-         * may exit non-locally! For example, in hush Ctrl-Z tries
-         * (modulo bugs) to dynamically create a child (backgrounded task)
-         * if it detects that Ctrl-Z was pressed when a NOFORK was running.
-         * Testcase: interactive "rm -i".
-         * Don't fool yourself into thinking "and <applet>_main() returns
-         * quickly here" and removing "useless" nofork_save_area code. */
-
         } else { /* xfunc died in NOFORK applet */
                 /* in case they meant to return 0... */
                 if (rc == -2222)
@@ -156,7 +156,7 @@ int FAST_FUNC run_nofork_applet_prime(struct nofork_save_area *old, int applet_n
         }
 
         /* Restoring some globals */
-        restore_nofork_data(old);
+        restore_nofork_data(&old);
 
         /* Other globals can be simply reset to defaults */
 #ifdef __GLIBC__
@@ -167,15 +167,6 @@ int FAST_FUNC run_nofork_applet_prime(struct nofork_save_area *old, int applet_n
 
         return rc & 0xff; /* don't confuse people with "exitcodes" >255 */
 }
-
-int FAST_FUNC run_nofork_applet(int applet_no, char **argv)
-{
-        struct nofork_save_area old;
-
-        /* Saving globals */
-        save_nofork_data(&old);
-        return run_nofork_applet_prime(&old, applet_no, argv);
-}
 #endif /* FEATURE_PREFER_APPLETS */
 
 int FAST_FUNC spawn_and_wait(char **argv)
@@ -185,17 +176,17 @@ int FAST_FUNC spawn_and_wait(char **argv)
         int a = find_applet_by_name(argv[0]);
 
         if (a >= 0 && (APPLET_IS_NOFORK(a)
-#if BB_MMU
+# if BB_MMU
                         || APPLET_IS_NOEXEC(a) /* NOEXEC trick needs fork() */
-#endif
+# endif
         )) {
-#if BB_MMU
+# if BB_MMU
                 if (APPLET_IS_NOFORK(a))
-#endif
+# endif
                 {
                         return run_nofork_applet(a, argv);
                 }
-#if BB_MMU && !ENABLE_PLATFORM_MINGW32
+# if BB_MMU && !ENABLE_PLATFORM_MINGW32
                 /* MMU only */
                 /* a->noexec is true */
                 rc = fork();
@@ -204,7 +195,7 @@ int FAST_FUNC spawn_and_wait(char **argv)
                 /* child */
                 xfunc_error_retval = EXIT_FAILURE;
                 run_applet_no_and_exit(a, argv);
-#endif
+# endif
         }
 #endif /* FEATURE_PREFER_APPLETS */
         rc = spawn(argv);