*: introduce and use xfork() and xvfork()

function                                             old     new   delta
launch_helper                                        170     169      -1
setup_heredoc                                        312     302     -10
handle_dir_common                                    367     354     -13
expand_vars_to_list                                 2456    2443     -13
open_transformer                                      89      74     -15
data_extract_to_command                              439     423     -16
do_ipaddr                                           1406    1389     -17
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/7 up/down: 0/-85)             Total: -85 bytes

Signed-off-by: Pascal Bellard <pascal.bellard@ads-lu.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 4 insertions, 11 deletions

diff --git a/shell/hush.c b/shell/hush.c
index 29ff3c442..831443e2e 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -3208,15 +3208,11 @@ static void setup_heredoc(struct redir_struct *redir)
 #if !BB_MMU
         to_free = NULL;
 #endif
-        pid = vfork();
-        if (pid < 0)
-                bb_perror_msg_and_die("vfork");
+        pid = xvfork();
         if (pid == 0) {
                 /* child */
                 disable_restore_tty_pgrp_on_exit();
-                pid = BB_MMU ? fork() : vfork();
-                if (pid < 0)
-                        bb_perror_msg_and_die(BB_MMU ? "fork" : "vfork");
+                pid = BB_MMU ? xfork() : xvfork();
                 if (pid != 0)
                         _exit(0);
                 /* grandchild */
@@ -4450,7 +4446,7 @@ static NOINLINE int run_pipe(struct pipe *pi)
                 argv_expanded = NULL;
                 if (command->pid < 0) { /* [v]fork failed */
                         /* Clearly indicate, was it fork or vfork */
-                        bb_perror_msg(BB_MMU ? "fork" : "vfork");
+                        bb_perror_msg(BB_MMU ? "vfork"+1 : "vfork");
                 } else {
                         pi->alive_cmds++;
 #if ENABLE_HUSH_JOB
@@ -5586,10 +5582,7 @@ static FILE *generate_stream_from_string(const char *s, pid_t *pid_p)
 # endif
 
         xpipe(channel);
-        pid = BB_MMU ? fork() : vfork();
-        if (pid < 0)
-                bb_perror_msg_and_die(BB_MMU ? "fork" : "vfork");
-
+        pid = BB_MMU ? xfork() : xvfork();
         if (pid == 0) { /* child */
                 disable_restore_tty_pgrp_on_exit();
                 /* Process substitution is not considered to be usual