3 files changed, 42 insertions, 34 deletions

diff --git a/libbb/execable.c b/libbb/execable.c
index 5c7ac16a2..82241cd81 100644
--- a/libbb/execable.c
+++ b/libbb/execable.c
@@ -76,3 +76,11 @@ int FAST_FUNC bb_execvp(const char *file, char *const argv[])
                                         argv);
 }
 #endif
+
+int FAST_FUNC BB_EXECVP_or_die(char **argv)
+{
+        BB_EXECVP(argv[0], argv);
+        /* SUSv3-mandated exit codes */
+        xfunc_error_retval = (errno == ENOENT) ? 127 : 126;
+        bb_perror_msg_and_die("can't execute '%s'", argv[0]);
+}
diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index 082f0f63e..8102ea2dc 100644
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -67,40 +67,6 @@ pid_t FAST_FUNC xspawn(char **argv)
         return pid;
 }
 
-pid_t FAST_FUNC safe_waitpid(pid_t pid, int *wstat, int options)
-{
-        pid_t r;
-
-        do
-                r = waitpid(pid, wstat, options);
-        while ((r == -1) && (errno == EINTR));
-        return r;
-}
-
-pid_t FAST_FUNC wait_any_nohang(int *wstat)
-{
-        return safe_waitpid(-1, wstat, WNOHANG);
-}
-
-// Wait for the specified child PID to exit, returning child's error return.
-int FAST_FUNC wait4pid(pid_t pid)
-{
-        int status;
-
-        if (pid <= 0) {
-                /*errno = ECHILD; -- wrong. */
-                /* we expect errno to be already set from failed [v]fork/exec */
-                return -1;
-        }
-        if (safe_waitpid(pid, &status, 0) == -1)
-                return -1;
-        if (WIFEXITED(status))
-                return WEXITSTATUS(status);
-        if (WIFSIGNALED(status))
-                return WTERMSIG(status) + 0x180;
-        return 0;
-}
-
 #if ENABLE_FEATURE_PREFER_APPLETS
 void FAST_FUNC save_nofork_data(struct nofork_save_area *save)
 {
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 65437211d..275dd4b62 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -268,3 +268,37 @@ int FAST_FUNC tcsetattr_stdin_TCSANOW(const struct termios *tp)
 {
         return tcsetattr(STDIN_FILENO, TCSANOW, tp);
 }
+
+pid_t FAST_FUNC safe_waitpid(pid_t pid, int *wstat, int options)
+{
+        pid_t r;
+
+        do
+                r = waitpid(pid, wstat, options);
+        while ((r == -1) && (errno == EINTR));
+        return r;
+}
+
+pid_t FAST_FUNC wait_any_nohang(int *wstat)
+{
+        return safe_waitpid(-1, wstat, WNOHANG);
+}
+
+// Wait for the specified child PID to exit, returning child's error return.
+int FAST_FUNC wait4pid(pid_t pid)
+{
+        int status;
+
+        if (pid <= 0) {
+                /*errno = ECHILD; -- wrong. */
+                /* we expect errno to be already set from failed [v]fork/exec */
+                return -1;
+        }
+        if (safe_waitpid(pid, &status, 0) == -1)
+                return -1;
+        if (WIFEXITED(status))
+                return WEXITSTATUS(status);
+        if (WIFSIGNALED(status))
+                return WTERMSIG(status) + 0x180;
+        return 0;
+}