Applied post 1.9.0 fixes

13 files changed, 221 insertions, 207 deletions

diff --git a/Makefile.help b/Makefile.help
index 513c10c4e..f95740365 100644
--- a/Makefile.help
+++ b/Makefile.help
@@ -16,7 +16,6 @@ help:
         @echo 'Configuration:'
         @echo '  allnoconfig            - disable all symbols in .config'
         @echo '  allyesconfig           - enable all symbols in .config (see defconfig)'
-        @echo '  allbareconfig          - enable all applets without any sub-features'
         @echo '  config         - text based configurator (of last resort)'
         @echo '  defconfig              - set .config to largest generic configuration'
         @echo '  menuconfig             - interactive curses-based configurator'
diff --git a/applets/applet_tables.c b/applets/applet_tables.c
index c16df06a7..3945f7c51 100644
--- a/applets/applet_tables.c
+++ b/applets/applet_tables.c
@@ -71,7 +71,7 @@ int main(int argc, char **argv)
 
         puts("/* This is a generated file, don't edit */");
 
-        puts("const char applet_names[] ALIGN1 =");
+        puts("const char applet_names[] ALIGN1 = \"\" \n");
         for (i = 0; i < NUM_APPLETS; i++) {
                 printf("\"%s\" \"\\0\"\n", applets[i].name);
         }
diff --git a/coreutils/stty.c b/coreutils/stty.c
index ade2468a8..298fb5b70 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -780,30 +780,14 @@ static const struct suffix_mult stty_suffixes[] = {
 
 static const struct mode_info *find_mode(const char *name)
 {
-        int i = 0;
-        const char *m = mode_name;
-
-        while (*m) {
-                if (strcmp(name, m) == 0)
-                        return &mode_info[i];
-                m += strlen(m) + 1;
-                i++;
-        }
-        return NULL;
+        int i = index_in_strings(mode_name, name);
+        return i >= 0 ? &mode_info[i] : NULL;
 }
 
 static const struct control_info *find_control(const char *name)
 {
-        int i = 0;
-        const char *m = mode_name;
-
-        while (*m) {
-                if (strcmp(name, m) == 0)
-                        return &control_info[i];
-                m += strlen(m) + 1;
-                i++;
-        }
-        return NULL;
+        int i = index_in_strings(control_name, name);
+        return i >= 0 ? &control_info[i] : NULL;
 }
 
 enum {
diff --git a/coreutils/test.c b/coreutils/test.c
index a30a5087d..22dadac0e 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -555,7 +555,7 @@ int test_main(int argc, char **argv)
 {
         int res;
         const char *arg0;
-        bool _off;
+        bool negate = 0;
 
         arg0 = bb_basename(argv[0]);
         if (arg0[0] == '[') {
@@ -578,9 +578,8 @@ int test_main(int argc, char **argv)
         INIT_S();
 
         res = setjmp(leaving);
-        if (res) {
+        if (res)
                 goto ret;
-        }
 
         /* resetting ngroups is probably unnecessary.  it will
          * force a new call to getgroups(), which prevents using
@@ -592,34 +591,40 @@ int test_main(int argc, char **argv)
          */
         ngroups = 0;
 
+        //argc--;
+        argv++;
+
         /* Implement special cases from POSIX.2, section 4.62.4 */
-        if (argc == 1) {
+        if (!argv[0]) { /* "test" */
                 res = 1;
                 goto ret;
         }
-        if (argc == 2) {
-                res = (*argv[1] == '\0');
+        if (LONE_CHAR(argv[0], '!') && argv[1]) {
+                negate = 1;
+                //argc--;
+                argv++;
+        }
+        if (!argv[1]) { /* "test [!] arg" */
+                res = (*argv[0] == '\0');
                 goto ret;
         }
-
-        /* remember if we saw argc==4 which wants *no* '!' test */
-        _off = argc - 4;
-        if (_off ? (LONE_CHAR(argv[1], '!'))
-                 : (argv[1][0] != '!' || argv[1][1] != '\0')
-        ) {
-                if (argc == 3) {
-                        res = (*argv[2] != '\0');
-                        goto ret;
-                }
-
-                t_lex(argv[2 + _off]);
+        if (argv[2] && !argv[3]) {
+                t_lex(argv[1]);
                 if (t_wp_op && t_wp_op->op_type == BINOP) {
-                        t_wp = &argv[1 + _off];
-                        res = (binop() == _off);
+                        /* "test [!] arg1 <binary_op> arg2" */
+                        t_wp = &argv[0];
+                        res = (binop() == 0);
                         goto ret;
                 }
         }
-        t_wp = &argv[1];
+
+        /* Some complex expression. Undo '!' removal */
+        if (negate) {
+                negate = 0;
+                //argc++;
+                argv--;
+        }
+        t_wp = &argv[0];
         res = !oexpr(t_lex(*t_wp));
 
         if (*t_wp != NULL && *++t_wp != NULL) {
@@ -628,5 +633,5 @@ int test_main(int argc, char **argv)
         }
  ret:
         DEINIT_S();
-        return res;
+        return negate ? !res : res;
 }
diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c
index f80de8178..ef0e80d60 100644
--- a/e2fsprogs/fsck.c
+++ b/e2fsprogs/fsck.c
@@ -665,6 +665,12 @@ static void execute(const char *type, const char *device, const char *mntpt,
         for (i = num_args+1; i < argc; i++)
                 free(argv[i]);
 
+        /* No pid, so don't record an instance */
+        if (pid < 0) {
+                free(inst);
+                return;
+        }
+
         inst->pid = pid;
         inst->prog = argv[0];
         inst->type = xstrdup(type);
diff --git a/include/libbb.h b/include/libbb.h
index 2b928215f..8f6643767 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -641,6 +641,9 @@ enum {
   void re_exec(char **argv) ATTRIBUTE_NORETURN;
   void forkexit_or_rexec(char **argv);
   extern bool re_execed;
+  int  BUG_fork_is_unavailable_on_nommu(void);
+  int  BUG_daemon_is_unavailable_on_nommu(void);
+  void BUG_bb_daemonize_is_unavailable_on_nommu(void);
 # define fork()          BUG_fork_is_unavailable_on_nommu()
 # define daemon(a,b)     BUG_daemon_is_unavailable_on_nommu()
 # define bb_daemonize(a) BUG_bb_daemonize_is_unavailable_on_nommu()
@@ -950,10 +953,9 @@ enum {
 };
 line_input_t *new_line_input_t(int flags);
 /* Returns:
- * -1 on read errors or EOF, or on bare Ctrl-D.
- * 0  on ctrl-C,
+ * -1 on read errors or EOF, or on bare Ctrl-D,
+ * 0  on ctrl-C (the line entered is still returned in 'command'),
  * >0 length of input string, including terminating '\n'
- * [is this true? stores "" in 'command' if return value is 0 or -1]
  */
 int read_line_input(const char* prompt, char* command, int maxsize, line_input_t *state);
 #else
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 69768da30..c23fe3107 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1315,8 +1315,8 @@ static void win_changed(int nsig)
 #define CTRL(a) ((a) & ~0x40)
 
 /* Returns:
- * -1 on read errors or EOF, or on bare Ctrl-D.
- * 0  on ctrl-C,
+ * -1 on read errors or EOF, or on bare Ctrl-D,
+ * 0  on ctrl-C (the line entered is still returned in 'command'),
  * >0 length of input string, including terminating '\n'
  */
 int read_line_input(const char *prompt, char *command, int maxsize, line_input_t *st)
diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
index ce2cd8b39..5ded99b2e 100644
--- a/networking/libiproute/iproute.c
+++ b/networking/libiproute/iproute.c
@@ -841,15 +841,17 @@ int do_iproute(char **argv)
         /*0-3*/ "add\0""append\0""change\0""chg\0"
         /*4-7*/ "delete\0""get\0""list\0""show\0"
         /*8..*/ "prepend\0""replace\0""test\0""flush\0";
-        int command_num = 6;
+        int command_num;
         unsigned flags = 0;
         int cmd = RTM_NEWROUTE;
 
+        if (!*argv)
+                return iproute_list_or_flush(argv, 0);
+
         /* "Standard" 'ip r a' treats 'a' as 'add', not 'append' */
         /* It probably means that it is using "first match" rule */
-        if (*argv) {
-                command_num = index_in_substrings(ip_route_commands, *argv);
-        }
+        command_num = index_in_substrings(ip_route_commands, *argv);
+
         switch (command_num) {
                 case 0: /* add */
                         flags = NLM_F_CREATE|NLM_F_EXCL;
diff --git a/networking/nameif.c b/networking/nameif.c
index 66376a500..c92b352da 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -50,18 +50,18 @@ typedef struct ethtable_s {
 #define ETHTOOL_BUSINFO_LEN 32
 /* these strings are set to whatever the driver author decides... */
 struct ethtool_drvinfo {
-        __u32 cmd;
-        char  driver[32]; /* driver short name, "tulip", "eepro100" */
-        char  version[32];  /* driver version string */
-        char  fw_version[32]; /* firmware version string, if applicable */
-        char  bus_info[ETHTOOL_BUSINFO_LEN];  /* Bus info for this IF. */
+        uint32_t cmd;
+        char driver[32]; /* driver short name, "tulip", "eepro100" */
+        char version[32];  /* driver version string */
+        char fw_version[32]; /* firmware version string, if applicable */
+        char bus_info[ETHTOOL_BUSINFO_LEN];  /* Bus info for this IF. */
         /* For PCI devices, use pci_dev->slot_name. */
-        char  reserved1[32];
-        char  reserved2[16];
-        __u32 n_stats;  /* number of u64's from ETHTOOL_GSTATS */
-        __u32 testinfo_len;
-        __u32 eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */
-        __u32 regdump_len;  /* Size of data from ETHTOOL_GREGS (bytes) */
+        char reserved1[32];
+        char reserved2[16];
+        uint32_t n_stats;  /* number of u64's from ETHTOOL_GSTATS */
+        uint32_t testinfo_len;
+        uint32_t eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */
+        uint32_t regdump_len;  /* Size of data from ETHTOOL_GREGS (bytes) */
 };
 #define ETHTOOL_GDRVINFO  0x00000003 /* Get driver info. */
 #endif
diff --git a/networking/zcip.c b/networking/zcip.c
index ef9aa2186..8ffed8593 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -180,7 +180,7 @@ int zcip_main(int argc, char **argv)
         char *r_opt;
         unsigned opts;
 
-        /* Ugly trick, but I want these zeroed in one go */
+        // ugly trick, but I want these zeroed in one go
         struct {
                 const struct in_addr null_ip;
                 const struct ether_addr null_addr;
@@ -214,8 +214,17 @@ int zcip_main(int argc, char **argv)
         // exactly 2 args; -v accumulates and implies -f
         opt_complementary = "=2:vv:vf";
         opts = getopt32(argv, "fqr:v", &r_opt, &verbose);
+#if !BB_MMU
+        // on NOMMU reexec early (or else we will rerun things twice)
+        if (!FOREGROUND)
+                bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);
+#endif
+        // open an ARP socket
+        // (need to do it before openlog to prevent openlog from taking
+        // fd 3 (sock_fd==3))
+        xmove_fd(xsocket(AF_PACKET, SOCK_PACKET, htons(ETH_P_ARP)), sock_fd);
         if (!FOREGROUND) {
-                /* Do it early, before all bb_xx_msg calls */
+                // do it before all bb_xx_msg calls
                 openlog(applet_name, 0, LOG_DAEMON);
                 logmode |= LOGMODE_SYSLOG;
         }
@@ -226,11 +235,6 @@ int zcip_main(int argc, char **argv)
                         bb_error_msg_and_die("invalid link address");
                 }
         }
-        // On NOMMU reexec early (or else we will rerun things twice)
-#if !BB_MMU
-        if (!FOREGROUND)
-                bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);
-#endif
         argc -= optind;
         argv += optind;
 
@@ -249,8 +253,6 @@ int zcip_main(int argc, char **argv)
         //TODO: are we leaving sa_family == 0 (AF_UNSPEC)?!
         safe_strncpy(saddr.sa_data, intf, sizeof(saddr.sa_data));
 
-        // open an ARP socket
-        xmove_fd(xsocket(AF_PACKET, SOCK_PACKET, htons(ETH_P_ARP)), sock_fd);
         // bind to the interface's ARP socket
         xbind(sock_fd, &saddr, sizeof(saddr));
 
@@ -290,7 +292,7 @@ int zcip_main(int argc, char **argv)
         // restarting after address conflicts:
         //  - start with some address we want to try
         //  - short random delay
-        //  - arp probes to see if another host else uses it
+        //  - arp probes to see if another host uses it
         //  - arp announcements that we're claiming it
         //  - use it
         //  - defend it, within limits
@@ -321,7 +323,7 @@ int zcip_main(int argc, char **argv)
                 switch (safe_poll(fds, 1, timeout_ms)) {
 
                 default:
-                        /*bb_perror_msg("poll"); - done in safe_poll */
+                        //bb_perror_msg("poll"); - done in safe_poll
                         return EXIT_FAILURE;
 
                 // timeout
diff --git a/shell/hush.c b/shell/hush.c
index cb2c3e98e..c01af5f38 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -80,18 +80,28 @@
 #include <glob.h>      /* glob, of course */
 #include <getopt.h>    /* should be pretty obvious */
 /* #include <dmalloc.h> */
+extern char **environ;
+#include "busybox.h" /* for APPLET_IS_NOFORK/NOEXEC */
 
-extern char **environ; /* This is in <unistd.h>, but protected with __USE_GNU */
 
-#include "busybox.h" /* for APPLET_IS_NOFORK/NOEXEC */
+#if !BB_MMU && ENABLE_HUSH_TICK
+//#undef ENABLE_HUSH_TICK
+//#define ENABLE_HUSH_TICK 0
+#warning On NOMMU, hush command substitution is dangerous.
+#warning Dont use it for commands which produce lots of output.
+#warning For more info see shell/hush.c, generate_stream_from_list().
+#endif
 
+#if !BB_MMU && ENABLE_HUSH_JOB
+#undef ENABLE_HUSH_JOB
+#define ENABLE_HUSH_JOB 0
+#endif
 
-#if !BB_MMU
-/* A bit drastic. Can allow some simpler commands
- * by analysing command in generate_stream_from_list()
- */
-#undef ENABLE_HUSH_TICK
-#define ENABLE_HUSH_TICK 0
+#if !ENABLE_HUSH_INTERACTIVE
+#undef ENABLE_FEATURE_EDITING
+#define ENABLE_FEATURE_EDITING 0
+#undef ENABLE_FEATURE_EDITING_FANCY_PROMPT
+#define ENABLE_FEATURE_EDITING_FANCY_PROMPT 0
 #endif
 
 
@@ -178,13 +188,6 @@ void xxfree(void *ptr)
 #endif
 
 
-#if !ENABLE_HUSH_INTERACTIVE
-#undef ENABLE_FEATURE_EDITING
-#define ENABLE_FEATURE_EDITING 0
-#undef ENABLE_FEATURE_EDITING_FANCY_PROMPT
-#define ENABLE_FEATURE_EDITING_FANCY_PROMPT 0
-#endif
-
 #define SPECIAL_VAR_SYMBOL   3
 
 #define PARSEFLAG_EXIT_FROM_LOOP 1
@@ -510,10 +513,10 @@ static int free_pipe_list(struct pipe *head, int indent);
 static int free_pipe(struct pipe *pi, int indent);
 /*  really run the final data structures: */
 static int setup_redirects(struct child_prog *prog, int squirrel[]);
-static int run_list_real(struct pipe *pi);
+static int run_list(struct pipe *pi);
 static void pseudo_exec_argv(char **argv) ATTRIBUTE_NORETURN;
 static void pseudo_exec(struct child_prog *child) ATTRIBUTE_NORETURN;
-static int run_pipe_real(struct pipe *pi);
+static int run_pipe(struct pipe *pi);
 /*   extended glob support: */
 static char **globhack(const char *src, char **strings);
 static int glob_needed(const char *s);
@@ -1418,7 +1421,7 @@ static void restore_redirects(int squirrel[])
         }
 }
 
-/* Called after [v]fork() in run_pipe_real(), or from builtin_exec().
+/* Called after [v]fork() in run_pipe(), or from builtin_exec().
  * Never returns.
  * XXX no exit() here.  If you don't exec, use _exit instead.
  * The at_exit handlers apparently confuse the calling process,
@@ -1440,9 +1443,8 @@ static void pseudo_exec_argv(char **argv)
         /* If a variable is assigned in a forest, and nobody listens,
          * was it ever really set?
          */
-        if (argv[0] == NULL) {
+        if (!argv[0])
                 _exit(EXIT_SUCCESS);
-        }
 
         argv = expand_strvec_to_strvec(argv);
 
@@ -1486,15 +1488,15 @@ static void pseudo_exec_argv(char **argv)
         _exit(1);
 }
 
-/* Called after [v]fork() in run_pipe_real()
+/* Called after [v]fork() in run_pipe()
  */
 static void pseudo_exec(struct child_prog *child)
 {
 // FIXME: buggy wrt NOMMU! Must not modify any global data
-// until it does exec/_exit, but currently it does.
-        if (child->argv) {
+// until it does exec/_exit, but currently it does
+// (puts malloc'ed stuff into environment)
+        if (child->argv)
                 pseudo_exec_argv(child->argv);
-        }
 
         if (child->group) {
 #if !BB_MMU
@@ -1503,11 +1505,12 @@ static void pseudo_exec(struct child_prog *child)
                 int rcode;
 
 #if ENABLE_HUSH_INTERACTIVE
-                debug_printf_exec("pseudo_exec: setting interactive_fd=0\n");
-                interactive_fd = 0;    /* crucial!!!! */
+// run_list_level now takes care of it?
+//              debug_printf_exec("pseudo_exec: setting interactive_fd=0\n");
+//              interactive_fd = 0;    /* crucial!!!! */
 #endif
-                debug_printf_exec("pseudo_exec: run_list_real\n");
-                rcode = run_list_real(child->group);
+                debug_printf_exec("pseudo_exec: run_list\n");
+                rcode = run_list(child->group);
                 /* OK to leak memory by not calling free_pipe_list,
                  * since this process is about to exit */
                 _exit(rcode);
@@ -1649,6 +1652,7 @@ static int checkjobs(struct pipe* fg_pipe)
 // + killall -STOP cat
 
  wait_more:
+// TODO: safe_waitpid?
         while ((childpid = waitpid(-1, &status, attributes)) > 0) {
                 const int dead = WIFEXITED(status) || WIFSIGNALED(status);
 
@@ -1673,7 +1677,7 @@ static int checkjobs(struct pipe* fg_pipe)
                                         if (dead) {
                                                 fg_pipe->progs[i].pid = 0;
                                                 fg_pipe->running_progs--;
-                                                if (i == fg_pipe->num_progs-1)
+                                                if (i == fg_pipe->num_progs - 1)
                                                         /* last process gives overall exitstatus */
                                                         rcode = WEXITSTATUS(status);
                                         } else {
@@ -1754,13 +1758,13 @@ static int checkjobs_and_fg_shell(struct pipe* fg_pipe)
 }
 #endif
 
-/* run_pipe_real() starts all the jobs, but doesn't wait for anything
+/* run_pipe() starts all the jobs, but doesn't wait for anything
  * to finish.  See checkjobs().
  *
  * return code is normally -1, when the caller has to wait for children
  * to finish to determine the exit status of the pipe.  If the pipe
  * is a simple builtin command, however, the action is done by the
- * time run_pipe_real returns, and the exit code is provided as the
+ * time run_pipe returns, and the exit code is provided as the
  * return value.
  *
  * The input of the pipe is always stdin, the output is always
@@ -1773,11 +1777,11 @@ static int checkjobs_and_fg_shell(struct pipe* fg_pipe)
  * Returns -1 only if started some children. IOW: we have to
  * mask out retvals of builtins etc with 0xff!
  */
-static int run_pipe_real(struct pipe *pi)
+static int run_pipe(struct pipe *pi)
 {
         int i;
-        int nextin, nextout;
-        int pipefds[2];                         /* pipefds[0] is for reading */
+        int nextin;
+        int pipefds[2];         /* pipefds[0] is for reading */
         struct child_prog *child;
         const struct built_in_command *x;
         char *p;
@@ -1786,9 +1790,8 @@ static int run_pipe_real(struct pipe *pi)
         int rcode;
         const int single_fg = (pi->num_progs == 1 && pi->followup != PIPE_BG);
 
-        debug_printf_exec("run_pipe_real start: single_fg=%d\n", single_fg);
+        debug_printf_exec("run_pipe start: single_fg=%d\n", single_fg);
 
-        nextin = 0;
 #if ENABLE_HUSH_JOB
         pi->pgrp = -1;
 #endif
@@ -1803,11 +1806,11 @@ static int run_pipe_real(struct pipe *pi)
         if (single_fg && child->group && child->subshell == 0) {
                 debug_printf("non-subshell grouping\n");
                 setup_redirects(child, squirrel);
-                debug_printf_exec(": run_list_real\n");
-                rcode = run_list_real(child->group);
+                debug_printf_exec(": run_list\n");
+                rcode = run_list(child->group) & 0xff;
                 restore_redirects(squirrel);
-                debug_printf_exec("run_pipe_real return %d\n", rcode);
-                return rcode; // do we need to add '... & 0xff' ?
+                debug_printf_exec("run_pipe return %d\n", rcode);
+                return rcode;
         }
 
         if (single_fg && child->argv != NULL) {
@@ -1849,7 +1852,7 @@ static int run_pipe_real(struct pipe *pi)
                                 rcode = x->function(argv_expanded) & 0xff;
                                 free(argv_expanded);
                                 restore_redirects(squirrel);
-                                debug_printf_exec("run_pipe_real return %d\n", rcode);
+                                debug_printf_exec("run_pipe return %d\n", rcode);
                                 return rcode;
                         }
                 }
@@ -1866,20 +1869,21 @@ static int run_pipe_real(struct pipe *pi)
                                 rcode = run_nofork_applet_prime(&nofork_save, a, argv_expanded) & 0xff;
                                 free(argv_expanded);
                                 restore_redirects(squirrel);
-                                debug_printf_exec("run_pipe_real return %d\n", rcode);
+                                debug_printf_exec("run_pipe return %d\n", rcode);
                                 return rcode;
                         }
                 }
 #endif
         }
 
-        /* Going to fork a child per each pipe member */
-        pi->running_progs = 0;
-
         /* Disable job control signals for shell (parent) and
          * for initial child code after fork */
         set_jobctrl_sighandler(SIG_IGN);
 
+        /* Going to fork a child per each pipe member */
+        pi->running_progs = 0;
+        nextin = 0;
+
         for (i = 0; i < pi->num_progs; i++) {
                 child = &(pi->progs[i]);
                 if (child->argv)
@@ -1888,42 +1892,34 @@ static int run_pipe_real(struct pipe *pi)
                         debug_printf_exec(": pipe member with no argv\n");
 
                 /* pipes are inserted between pairs of commands */
-                if ((i + 1) < pi->num_progs) {
-                        pipe(pipefds);
-                        nextout = pipefds[1];
-                } else {
-                        nextout = 1;
-                        pipefds[0] = -1;
-                }
+                pipefds[0] = 0;
+                pipefds[1] = 1;
+                if ((i + 1) < pi->num_progs)
+                        xpipe(pipefds);
 
-                /* XXX test for failed fork()? */
-#if BB_MMU
-                child->pid = fork();
-#else
-                child->pid = vfork();
-#endif
+                child->pid = BB_MMU ? fork() : vfork();
                 if (!child->pid) { /* child */
-                        /* Every child adds itself to new process group
-                         * with pgid == pid of first child in pipe */
 #if ENABLE_HUSH_JOB
+                        /* Every child adds itself to new process group
+                         * with pgid == pid_of_first_child_in_pipe */
                         if (run_list_level == 1 && interactive_fd) {
+                                pid_t pgrp;
                                 /* Don't do pgrp restore anymore on fatal signals */
                                 set_fatal_sighandler(SIG_DFL);
-                                if (pi->pgrp < 0) /* true for 1st process only */
-                                        pi->pgrp = getpid();
-                                if (setpgid(0, pi->pgrp) == 0 && pi->followup != PIPE_BG) {
+                                pgrp = pi->pgrp;
+                                if (pgrp < 0) /* true for 1st process only */
+                                        pgrp = getpid();
+                                if (setpgid(0, pgrp) == 0 && pi->followup != PIPE_BG) {
                                         /* We do it in *every* child, not just first,
                                          * to avoid races */
-                                        tcsetpgrp(interactive_fd, pi->pgrp);
+                                        tcsetpgrp(interactive_fd, pgrp);
                                 }
                         }
 #endif
-                        /* in non-interactive case fatal sigs are already SIG_DFL */
                         xmove_fd(nextin, 0);
-                        xmove_fd(nextout, 1);
-                        if (pipefds[0] != -1) {
-                                close(pipefds[0]);  /* opposite end of our output pipe */
-                        }
+                        xmove_fd(pipefds[1], 1); /* write end */
+                        if (pipefds[0] > 1)
+                                close(pipefds[0]); /* read end */
                         /* Like bash, explicit redirects override pipes,
                          * and the pipe fd is available for dup'ing. */
                         setup_redirects(child, NULL);
@@ -1932,26 +1928,35 @@ static int run_pipe_real(struct pipe *pi)
                         set_jobctrl_sighandler(SIG_DFL);
                         set_misc_sighandler(SIG_DFL);
                         signal(SIGCHLD, SIG_DFL);
-                        pseudo_exec(child);
+                        pseudo_exec(child); /* does not return */
                 }
 
-                pi->running_progs++;
-
+                if (child->pid < 0) { /* [v]fork failed */
+                        /* Clearly indicate, was it fork or vfork */
+                        bb_perror_msg(BB_MMU ? "fork" : "vfork");
+                } else {
+                        pi->running_progs++;
 #if ENABLE_HUSH_JOB
-                /* Second and next children need to know pid of first one */
-                if (pi->pgrp < 0)
-                        pi->pgrp = child->pid;
+                        /* Second and next children need to know pid of first one */
+                        if (pi->pgrp < 0)
+                                pi->pgrp = child->pid;
 #endif
-                if (nextin != 0)
-                        close(nextin);
-                if (nextout != 1)
-                        close(nextout);
+                }
 
-                /* If there isn't another process, nextin is garbage
-                   but it doesn't matter */
+                if (i)
+                        close(nextin);
+                if ((i + 1) < pi->num_progs)
+                        close(pipefds[1]); /* write end */
+                /* Pass read (output) pipe end to next iteration */
                 nextin = pipefds[0];
         }
-        debug_printf_exec("run_pipe_real return -1\n");
+
+        if (!pi->running_progs) {
+                debug_printf_exec("run_pipe return 1 (all forks failed, no children)\n");
+                return 1;
+        }
+
+        debug_printf_exec("run_pipe return -1 (%u children started)\n", pi->running_progs);
         return -1;
 }
 
@@ -2020,7 +2025,7 @@ static void debug_print_tree(struct pipe *pi, int lvl)
 
 /* NB: called by pseudo_exec, and therefore must not modify any
  * global data until exec/_exit (we can be a child after vfork!) */
-static int run_list_real(struct pipe *pi)
+static int run_list(struct pipe *pi)
 {
         struct pipe *rpipe;
 #if ENABLE_HUSH_LOOPS
@@ -2029,7 +2034,6 @@ static int run_list_real(struct pipe *pi)
         char **for_list = NULL;
         int flag_rep = 0;
 #endif
-        int save_num_progs;
         int flag_skip = 1;
         int rcode = 0; /* probably for gcc only */
         int flag_restore = 0;
@@ -2041,7 +2045,7 @@ static int run_list_real(struct pipe *pi)
         reserved_style rword;
         reserved_style skip_more_for_this_rword = RES_XXXX;
 
-        debug_printf_exec("run_list_real start lvl %d\n", run_list_level + 1);
+        debug_printf_exec("run_list start lvl %d\n", run_list_level + 1);
 
 #if ENABLE_HUSH_LOOPS
         /* check syntax for "for" */
@@ -2050,7 +2054,7 @@ static int run_list_real(struct pipe *pi)
                  && (rpipe->next == NULL)
                 ) {
                         syntax("malformed for"); /* no IN or no commands after IN */
-                        debug_printf_exec("run_list_real lvl %d return 1\n", run_list_level);
+                        debug_printf_exec("run_list lvl %d return 1\n", run_list_level);
                         return 1;
                 }
                 if ((rpipe->res_word == RES_IN && rpipe->next->res_word == RES_IN && rpipe->next->progs[0].argv != NULL)
@@ -2058,7 +2062,7 @@ static int run_list_real(struct pipe *pi)
                 ) {
                         /* TODO: what is tested in the first condition? */
                         syntax("malformed for"); /* 2nd condition: not followed by IN */
-                        debug_printf_exec("run_list_real lvl %d return 1\n", run_list_level);
+                        debug_printf_exec("run_list lvl %d return 1\n", run_list_level);
                         return 1;
                 }
         }
@@ -2106,9 +2110,10 @@ static int run_list_real(struct pipe *pi)
                 signal_SA_RESTART(SIGTSTP, handler_ctrl_z);
                 signal(SIGINT, handler_ctrl_c);
         }
-#endif
+#endif /* JOB */
 
         for (; pi; pi = flag_restore ? rpipe : pi->next) {
+//why?          int save_num_progs;
                 rword = pi->res_word;
 #if ENABLE_HUSH_LOOPS
                 if (rword == RES_WHILE || rword == RES_UNTIL || rword == RES_FOR) {
@@ -2181,12 +2186,12 @@ static int run_list_real(struct pipe *pi)
 #endif
                 if (pi->num_progs == 0)
                         continue;
-                save_num_progs = pi->num_progs; /* save number of programs */
-                debug_printf_exec(": run_pipe_real with %d members\n", pi->num_progs);
-                rcode = run_pipe_real(pi);
+//why?          save_num_progs = pi->num_progs;
+                debug_printf_exec(": run_pipe with %d members\n", pi->num_progs);
+                rcode = run_pipe(pi);
                 if (rcode != -1) {
                         /* We only ran a builtin: rcode was set by the return value
-                         * of run_pipe_real(), and we don't need to wait for anything. */
+                         * of run_pipe(), and we don't need to wait for anything. */
                 } else if (pi->followup == PIPE_BG) {
                         /* What does bash do with attempts to background builtins? */
                         /* Even bash 3.2 doesn't do that well with nested bg:
@@ -2199,7 +2204,6 @@ static int run_list_real(struct pipe *pi)
                         rcode = EXIT_SUCCESS;
                 } else {
 #if ENABLE_HUSH_JOB
-                        /* Paranoia, just "interactive_fd" should be enough? */
                         if (run_list_level == 1 && interactive_fd) {
                                 /* waits for completion, then fg's main shell */
                                 rcode = checkjobs_and_fg_shell(pi);
@@ -2213,7 +2217,7 @@ static int run_list_real(struct pipe *pi)
                 }
                 debug_printf_exec(": setting last_return_code=%d\n", rcode);
                 last_return_code = rcode;
-                pi->num_progs = save_num_progs; /* restore number of programs */
+//why?          pi->num_progs = save_num_progs;
 #if ENABLE_HUSH_IF
                 if (rword == RES_IF || rword == RES_ELIF)
                         next_if_code = rcode;  /* can be overwritten a number of times */
@@ -2244,7 +2248,7 @@ static int run_list_real(struct pipe *pi)
                 signal(SIGINT, SIG_IGN);
         }
 #endif
-        debug_printf_exec("run_list_real lvl %d return %d\n", run_list_level + 1, rcode);
+        debug_printf_exec("run_list lvl %d return %d\n", run_list_level + 1, rcode);
         return rcode;
 }
 
@@ -2318,19 +2322,19 @@ static int free_pipe_list(struct pipe *head, int indent)
 }
 
 /* Select which version we will use */
-static int run_list(struct pipe *pi)
+static int run_and_free_list(struct pipe *pi)
 {
         int rcode = 0;
-        debug_printf_exec("run_list entered\n");
-        if (fake_mode == 0) {
-                debug_printf_exec(": run_list_real with %d members\n", pi->num_progs);
-                rcode = run_list_real(pi);
+        debug_printf_exec("run_and_free_list entered\n");
+        if (!fake_mode) {
+                debug_printf_exec(": run_list with %d members\n", pi->num_progs);
+                rcode = run_list(pi);
         }
         /* free_pipe_list has the side effect of clearing memory.
-         * In the long run that function can be merged with run_list_real,
+         * In the long run that function can be merged with run_list,
          * but doing that now would hobble the debugging effort. */
-        free_pipe_list(pi, 0);
-        debug_printf_exec("run_list return %d\n", rcode);
+        free_pipe_list(pi, /* indent: */ 0);
+        debug_printf_exec("run_nad_free_list return %d\n", rcode);
         return rcode;
 }
 
@@ -3224,15 +3228,17 @@ static FILE *generate_stream_from_list(struct pipe *head)
         int pid, channel[2];
 
         xpipe(channel);
-        pid = fork();
-        if (pid < 0) {
-                bb_perror_msg_and_die("fork");
-        } else if (pid == 0) {
+/* *** NOMMU WARNING *** */
+/* By using vfork here, we suspend parent till child exits or execs.
+ * If child will not do it before it fills the pipe, it can block forever
+ * in write(STDOUT_FILENO), and parent (shell) will be also stuck.
+ */
+        pid = BB_MMU ? fork() : vfork();
+        if (pid < 0)
+                bb_perror_msg_and_die(BB_MMU ? "fork" : "vfork");
+        if (pid == 0) { /* child */
                 close(channel[0]);
-                if (channel[1] != 1) {
-                        dup2(channel[1], 1);
-                        close(channel[1]);
-                }
+                xmove_fd(channel[1], 1);
                 /* Prevent it from trying to handle ctrl-z etc */
 #if ENABLE_HUSH_JOB
                 run_list_level = 1;
@@ -3244,11 +3250,12 @@ static FILE *generate_stream_from_list(struct pipe *head)
                  * everywhere outside actual command execution. */
                 /*set_jobctrl_sighandler(SIG_IGN);*/
                 set_misc_sighandler(SIG_DFL);
-                _exit(run_list_real(head));   /* leaks memory */
+                _exit(run_list(head));   /* leaks memory */
         }
         close(channel[1]);
         pf = fdopen(channel[0], "r");
         return pf;
+        /* head is freed by the caller */
 }
 
 /* Return code is exit status of the process that is run. */
@@ -3272,7 +3279,8 @@ static int process_command_subs(o_string *dest, struct p_context *ctx,
         b_free(&result);
 
         p = generate_stream_from_list(inner.list_head);
-        if (p == NULL) return 1;
+        if (p == NULL)
+                return 1;
         close_on_exec_on(fileno(p));
         setup_file_in_str(&pipe_str, p);
 
@@ -3297,7 +3305,7 @@ static int process_command_subs(o_string *dest, struct p_context *ctx,
          * at the same time.  That would be a lot of work, and contrary
          * to the KISS philosophy of this program. */
         retcode = fclose(p);
-        free_pipe_list(inner.list_head, 0);
+        free_pipe_list(inner.list_head, /* indent: */ 0);
         debug_printf("closed FILE from child, retcode=%d\n", retcode);
         return retcode;
 }
@@ -3677,8 +3685,8 @@ static int parse_and_run_stream(struct in_str *inp, int parse_flag)
                         done_word(&temp, &ctx);
                         done_pipe(&ctx, PIPE_SEQ);
                         debug_print_tree(ctx.list_head, 0);
-                        debug_printf_exec("parse_stream_outer: run_list\n");
-                        run_list(ctx.list_head);
+                        debug_printf_exec("parse_stream_outer: run_and_free_list\n");
+                        run_and_free_list(ctx.list_head);
                 } else {
                         if (ctx.old_flag != 0) {
                                 free(ctx.stack);
@@ -3687,7 +3695,7 @@ static int parse_and_run_stream(struct in_str *inp, int parse_flag)
                         temp.nonnull = 0;
                         temp.o_quote = 0;
                         inp->p = NULL;
-                        free_pipe_list(ctx.list_head, 0);
+                        free_pipe_list(ctx.list_head, /* indent: */ 0);
                 }
                 b_free(&temp);
         } while (rcode != -1 && !(parse_flag & PARSEFLAG_EXIT_FROM_LOOP));   /* loop on syntax errors, return on EOF */
@@ -3901,15 +3909,15 @@ int hush_main(int argc, char **argv)
 
         if (argv[optind] == NULL) {
                 opt = parse_and_run_file(stdin);
-                goto final_return;
+        } else {
+                debug_printf("\nrunning script '%s'\n", argv[optind]);
+                global_argv = argv + optind;
+                global_argc = argc - optind;
+                input = xfopen(argv[optind], "r");
+                fcntl(fileno(input), F_SETFD, FD_CLOEXEC);
+                opt = parse_and_run_file(input);
         }
 
-        debug_printf("\nrunning script '%s'\n", argv[optind]);
-        global_argv = argv + optind;
-        global_argc = argc - optind;
-        input = xfopen(argv[optind], "r");
-        opt = parse_and_run_file(input);
-
  final_return:
 
 #if ENABLE_FEATURE_CLEAN_UP
diff --git a/shell/msh.c b/shell/msh.c
index 9edf793ab..7a6ab2416 100644
--- a/shell/msh.c
+++ b/shell/msh.c
@@ -2825,11 +2825,13 @@ static int forkexec(struct op *t, int *pin, int *pout, int act, char **wp)
 
         if (pin != NULL) {
                 xmove_fd(pin[0], 0);
-                if (pin[1] != 0) close(pin[1]);
+                if (pin[1] != 0)
+                        close(pin[1]);
         }
         if (pout != NULL) {
                 xmove_fd(pout[1], 1);
-                if (pout[1] != 1) close(pout[0]);
+                if (pout[1] != 1)
+                        close(pout[0]);
         }
 
         iopp = t->ioact;
@@ -4162,7 +4164,7 @@ static int grave(int quoted)
                 return 0;
         }
         if (i != 0) {
-                waitpid(i, NULL, 0);
+                waitpid(i, NULL, 0); // safe_waitpid?
                 global_env.iop->argp->aword = ++cp;
                 close(pf[1]);
                 PUSHIO(afile, remap(pf[0]),
@@ -4181,7 +4183,8 @@ static int grave(int quoted)
          *  echo "$files" >zz
          */
         xmove_fd(pf[1], 1);
-        if (pf[0] != 1) close(pf[0]);
+        if (pf[0] != 1)
+                close(pf[0]);
 
         argument_list[0] = (char *) DEFAULT_SHELL;
         argument_list[1] = (char *) "-c";
@@ -4834,9 +4837,11 @@ static int filechar(struct ioarg *ap)
                 static int position = 0, size = 0;
 
                 while (size == 0 || position >= size) {
-                        read_line_input(current_prompt, filechar_cmdbuf, BUFSIZ, line_input_state);
-                        size = strlen(filechar_cmdbuf);
+                        size = read_line_input(current_prompt, filechar_cmdbuf, BUFSIZ, line_input_state);
+                        if (size < 0) /* Error/EOF */
+                                exit(0);
                         position = 0;
+                        /* if Ctrl-C, size == 0 and loop will repeat */
                 }
                 c = filechar_cmdbuf[position];
                 position++;
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index 8e1fbc384..f14f6df50 100644
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -64,9 +64,10 @@ int mkswap_main(int argc, char **argv)
         // Figure out how big the device is and announce our intentions.
 
         fd = xopen(argv[1], O_RDWR);
-        len = fdlength(fd);
+        len = lseek(fd, 0, SEEK_END);
+        lseek(fd, 0, SEEK_SET);
         pagesize = getpagesize();
-        printf("Setting up swapspace version 1, size = %"OFF_FMT"d bytes\n",
+        printf("Setting up swapspace version 1, size = %"OFF_FMT"u bytes\n",
                         len - pagesize);
         mkswap_selinux_setcontext(fd, argv[1]);