Merge commit 'da4441c44f6efccb6f7b7588404d9c6bfb7b6af8' into merge

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

1 files changed, 26 insertions, 35 deletions

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);