Merge branch 'origin/master' (early part)

20 files changed, 190 insertions, 177 deletions

diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index 2a50a1ae3..a4f77414b 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -4,6 +4,8 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.
 
+libbb/appletlib.o: include/usage_compressed.h
+
 lib-y:=
 
 INSERT
@@ -30,8 +32,6 @@ lib-y += create_icmp_socket.o
 lib-y += default_error_retval.o
 lib-y += device_open.o
 lib-y += dump.o
-lib-y += error_msg.o
-lib-y += error_msg_and_die.o
 lib-y += execable.o
 lib-y += fclose_nonstdin.o
 lib-y += fflush_stdout_and_exit.o
@@ -44,7 +44,6 @@ lib-y += get_line_from_file.o
 lib-y += getopt32.o
 lib-y += get_volsize.o
 lib-y += herror_msg.o
-lib-y += herror_msg_and_die.o
 lib-y += human_readable.o
 lib-y += info_msg.o
 lib-y += inode_hash.o
@@ -63,7 +62,6 @@ lib-y += obscure.o
 lib-y += parse_mode.o
 lib-y += parse_config.o
 lib-y += perror_msg.o
-lib-y += perror_msg_and_die.o
 lib-y += perror_nomsg.o
 lib-y += perror_nomsg_and_die.o
 lib-y += pidfile.o
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 922f7d26b..cae7da48a 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -61,11 +61,11 @@
 static const char usage_messages[] ALIGN1 = UNPACKED_USAGE;
 #else
 # define usage_messages 0
-#endif /* SHOW_USAGE */
+#endif
 
 #if ENABLE_FEATURE_COMPRESS_USAGE
 
-static const char packed_usage[] = { PACKED_USAGE };
+static const char packed_usage[] ALIGN1 = { PACKED_USAGE };
 # include "unarchive.h"
 static const char *unpack_usage_messages(void)
 {
@@ -195,7 +195,11 @@ void lbb_prepare(const char *applet
 #if ENABLE_FEATURE_INDIVIDUAL
         /* Redundant for busybox (run_applet_and_exit covers that case)
          * but needed for "individual applet" mode */
-        if (argv[1] && !argv[2] && strcmp(argv[1], "--help") == 0) {
+        if (argv[1]
+         && !argv[2]
+         && strcmp(argv[1], "--help") == 0
+         && strncmp(applet, "busybox", 7) != 0
+        ) {
                 /* Special case. POSIX says "test --help"
                  * should be no different from e.g. "test --foo".  */
                 if (!ENABLE_TEST || strcmp(applet_name, "test") != 0)
diff --git a/libbb/copyfd.c b/libbb/copyfd.c
index f42eb7623..82622c06f 100644
--- a/libbb/copyfd.c
+++ b/libbb/copyfd.c
@@ -9,19 +9,29 @@
 
 #include "libbb.h"
 
-/* Used by NOFORK applets (e.g. cat) - must not use xmalloc */
-
+/* Used by NOFORK applets (e.g. cat) - must not use xmalloc.
+ * size < 0 means "ignore write errors", used by tar --to-command
+ * size = 0 means "copy till EOF"
+ */
 static off_t bb_full_fd_action(int src_fd, int dst_fd, off_t size)
 {
         int status = -1;
         off_t total = 0;
+        bool continue_on_write_error = 0;
 #if CONFIG_FEATURE_COPYBUF_KB <= 4
         char buffer[CONFIG_FEATURE_COPYBUF_KB * 1024];
         enum { buffer_size = sizeof(buffer) };
 #else
         char *buffer;
         int buffer_size;
+#endif
 
+        if (size < 0) {
+                size = -size;
+                continue_on_write_error = 1;
+        }
+
+#if CONFIG_FEATURE_COPYBUF_KB > 4
         if (size > 0 && size <= 4 * 1024)
                 goto use_small_buf;
         /* We want page-aligned buffer, just in case kernel is clever
@@ -63,8 +73,11 @@ static off_t bb_full_fd_action(int src_fd, int dst_fd, off_t size)
                 if (dst_fd >= 0) {
                         ssize_t wr = full_write(dst_fd, buffer, rd);
                         if (wr < rd) {
-                                bb_perror_msg(bb_msg_write_error);
-                                break;
+                                if (!continue_on_write_error) {
+                                        bb_perror_msg(bb_msg_write_error);
+                                        break;
+                                }
+                                dst_fd = -1;
                         }
                 }
                 total += rd;
@@ -108,7 +121,7 @@ off_t FAST_FUNC bb_copyfd_size(int fd1, int fd2, off_t size)
 void FAST_FUNC bb_copyfd_exact_size(int fd1, int fd2, off_t size)
 {
         off_t sz = bb_copyfd_size(fd1, fd2, size);
-        if (sz == size)
+        if (sz == (size >= 0 ? size : -size))
                 return;
         if (sz != -1)
                 bb_error_msg_and_die("short read");
diff --git a/libbb/error_msg.c b/libbb/error_msg.c
deleted file mode 100644
index 802fd5715..000000000
--- a/libbb/error_msg.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Utility routines.
- *
- * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
- *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- */
-
-#include "libbb.h"
-
-void FAST_FUNC bb_error_msg(const char *s, ...)
-{
-        va_list p;
-
-        va_start(p, s);
-        bb_verror_msg(s, p, NULL);
-        va_end(p);
-}
diff --git a/libbb/error_msg_and_die.c b/libbb/error_msg_and_die.c
deleted file mode 100644
index 243433b2d..000000000
--- a/libbb/error_msg_and_die.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Utility routines.
- *
- * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
- *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- */
-
-#include "libbb.h"
-
-void FAST_FUNC bb_error_msg_and_die(const char *s, ...)
-{
-        va_list p;
-
-        va_start(p, s);
-        bb_verror_msg(s, p, NULL);
-        va_end(p);
-        xfunc_die();
-}
diff --git a/libbb/execable.c b/libbb/execable.c
index 06b1c534b..de368fad0 100644
--- a/libbb/execable.c
+++ b/libbb/execable.c
@@ -109,3 +109,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/herror_msg.c b/libbb/herror_msg.c
index 7e4f64045..ca9274cf7 100644
--- a/libbb/herror_msg.c
+++ b/libbb/herror_msg.c
@@ -6,7 +6,6 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
-
 #include "libbb.h"
 
 void FAST_FUNC bb_herror_msg(const char *s, ...)
@@ -17,3 +16,13 @@ void FAST_FUNC bb_herror_msg(const char *s, ...)
         bb_verror_msg(s, p, hstrerror(h_errno));
         va_end(p);
 }
+
+void FAST_FUNC bb_herror_msg_and_die(const char *s, ...)
+{
+        va_list p;
+
+        va_start(p, s);
+        bb_verror_msg(s, p, hstrerror(h_errno));
+        va_end(p);
+        xfunc_die();
+}
diff --git a/libbb/herror_msg_and_die.c b/libbb/herror_msg_and_die.c
deleted file mode 100644
index 230fe645a..000000000
--- a/libbb/herror_msg_and_die.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Utility routines.
- *
- * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
- *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- */
-
-#include "libbb.h"
-
-void FAST_FUNC bb_herror_msg_and_die(const char *s, ...)
-{
-        va_list p;
-
-        va_start(p, s);
-        bb_verror_msg(s, p, hstrerror(h_errno));
-        va_end(p);
-        xfunc_die();
-}
diff --git a/libbb/parse_config.c b/libbb/parse_config.c
index c511d97fb..b7c3a00e0 100644
--- a/libbb/parse_config.c
+++ b/libbb/parse_config.c
@@ -128,8 +128,8 @@ int FAST_FUNC config_read(parser_t *parser, char **tokens, unsigned flags, const
         int ntokens, mintokens;
         int t, len;
 
-        ntokens = flags & 0xFF;
-        mintokens = (flags & 0xFF00) >> 8;
+        ntokens = (uint8_t)flags;
+        mintokens = (uint8_t)(flags >> 8);
 
         if (parser == NULL)
                 return 0;
@@ -159,7 +159,8 @@ again:
                 parser->data = xstrdup(line);
 
         /* Tokenize the line */
-        for (t = 0; *line && *line != delims[0] && t < ntokens; t++) {
+        t = 0;
+        do {
                 /* Pin token */
                 tokens[t] = line;
 
@@ -179,10 +180,10 @@ again:
                 }
 
                 /* Token not terminated? */
-                if (line[0] == delims[0])
+                if (*line == delims[0])
                         *line = '\0';
-                else if (line[0] != '\0')
-                        *(line++) = '\0';
+                else if (*line != '\0')
+                        *line++ = '\0';
 
 #if 0 /* unused so far */
                 if (flags & PARSE_ESCAPE) {
@@ -201,17 +202,20 @@ again:
                         *to = '\0';
                 }
 #endif
-
                 /* Skip possible delimiters */
                 if (flags & PARSE_COLLAPSE)
                         line += strspn(line, delims + 1);
-        }
+
+                t++;
+        } while (*line && *line != delims[0] && t < ntokens);
 
         if (t < mintokens) {
                 bb_error_msg("bad line %u: %d tokens found, %d needed",
                                 parser->lineno, t, mintokens);
                 if (flags & PARSE_MIN_DIE)
                         xfunc_die();
+                if (flags & PARSE_KEEP_COPY)
+                        free(parser->data);
                 goto again;
         }
 
diff --git a/libbb/perror_msg.c b/libbb/perror_msg.c
index 6c8e1b51e..cbba805fb 100644
--- a/libbb/perror_msg.c
+++ b/libbb/perror_msg.c
@@ -6,7 +6,6 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
-
 #include "libbb.h"
 
 void FAST_FUNC bb_perror_msg(const char *s, ...)
@@ -19,7 +18,23 @@ void FAST_FUNC bb_perror_msg(const char *s, ...)
         va_end(p);
 }
 
+void FAST_FUNC bb_perror_msg_and_die(const char *s, ...)
+{
+        va_list p;
+
+        va_start(p, s);
+        /* Guard against "<error message>: Success" */
+        bb_verror_msg(s, p, errno ? strerror(errno) : NULL);
+        va_end(p);
+        xfunc_die();
+}
+
 void FAST_FUNC bb_simple_perror_msg(const char *s)
 {
         bb_perror_msg("%s", s);
 }
+
+void FAST_FUNC bb_simple_perror_msg_and_die(const char *s)
+{
+        bb_perror_msg_and_die("%s", s);
+}
diff --git a/libbb/perror_msg_and_die.c b/libbb/perror_msg_and_die.c
deleted file mode 100644
index 15615fa22..000000000
--- a/libbb/perror_msg_and_die.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Utility routines.
- *
- * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
- *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- */
-
-#include "libbb.h"
-
-void FAST_FUNC bb_perror_msg_and_die(const char *s, ...)
-{
-        va_list p;
-
-        va_start(p, s);
-        /* Guard against "<error message>: Success" */
-        bb_verror_msg(s, p, errno ? strerror(errno) : NULL);
-        va_end(p);
-        xfunc_die();
-}
-
-void FAST_FUNC bb_simple_perror_msg_and_die(const char *s)
-{
-        bb_perror_msg_and_die("%s", s);
-}
diff --git a/libbb/platform.c b/libbb/platform.c
index 8642337d4..67048648f 100644
--- a/libbb/platform.c
+++ b/libbb/platform.c
@@ -120,3 +120,30 @@ char* FAST_FUNC strcasestr(const char *s, const char *pattern)
         return 0;
 }
 #endif
+
+#ifndef HAVE_STRSEP
+/* Copyright (C) 2004 Free Software Foundation, Inc. */
+char* FAST_FUNC strsep(char **stringp, const char *delim)
+{
+        char *start = *stringp;
+        char *ptr;
+
+        if (!start)
+                return NULL;
+
+        if (!*delim)
+                ptr = start + strlen(start);
+        else {
+                ptr = strpbrk(start, delim);
+                if (!ptr) {
+                        *stringp = NULL;
+                        return start;
+                }
+        }
+
+        *ptr = '\0';
+        *stringp = ptr + 1;
+
+        return start;
+}
+#endif
diff --git a/libbb/read_printf.c b/libbb/read_printf.c
index 53f528f5a..1b215f97a 100644
--- a/libbb/read_printf.c
+++ b/libbb/read_printf.c
@@ -265,7 +265,7 @@ void FAST_FUNC setup_unzip_on_fd(int fd /*, int fail_if_not_detected*/)
 
         /* .gz and .bz2 both have 2-byte signature, and their
          * unpack_XXX_stream wants this header skipped. */
-        xread(fd, magic.b16, sizeof(magic.b16));
+        xread(fd, magic.b16, sizeof(magic.b16[0]));
         if (ENABLE_FEATURE_SEAMLESS_GZ
          && magic.b16[0] == GZIP_MAGIC
         ) {
@@ -289,15 +289,13 @@ void FAST_FUNC setup_unzip_on_fd(int fd /*, int fail_if_not_detected*/)
         if (ENABLE_FEATURE_SEAMLESS_XZ
          && magic.b16[0] == XZ_MAGIC1
         ) {
-                /* .xz signature: 0xfd, '7', 'z', 'X', 'Z', 0x00 */
-                /* More info at: http://tukaani.org/xz/xz-file-format.txt */
                 offset = -6;
-                xread(fd, magic.b32, sizeof(magic.b32));
+                xread(fd, magic.b32, sizeof(magic.b32[0]));
                 if (magic.b32[0] == XZ_MAGIC2) {
 # if BB_MMU
                         xformer = unpack_xz_stream;
-                        /* unpack_xz_stream wants fd at position 0 */
-                        xlseek(fd, offset, SEEK_CUR);
+                        /* unpack_xz_stream wants fd at position 6, no need to seek */
+                        //xlseek(fd, offset, SEEK_CUR);
 # else
                         xformer_prog = "unxz";
 # endif
diff --git a/libbb/run_shell.c b/libbb/run_shell.c
index 6f98bd695..4d92c3caa 100644
--- a/libbb/run_shell.c
+++ b/libbb/run_shell.c
@@ -49,15 +49,14 @@ void FAST_FUNC set_current_security_context(security_context_t sid)
 
 #endif
 
-/* Run SHELL, or DEFAULT_SHELL if SHELL is empty.
-   If COMMAND is nonzero, pass it to the shell with the -c option.
-   If ADDITIONAL_ARGS is nonzero, pass it to the shell as more
-   arguments.  */
-
+/* Run SHELL, or DEFAULT_SHELL if SHELL is "" or NULL.
+ * If COMMAND is nonzero, pass it to the shell with the -c option.
+ * If ADDITIONAL_ARGS is nonzero, pass it to the shell as more
+ * arguments.  */
 void FAST_FUNC run_shell(const char *shell, int loginshell, const char *command, const char **additional_args)
 {
         const char **args;
-        int argno = 1;
+        int argno;
         int additional_args_cnt = 0;
 
         for (args = additional_args; args && *args; args++)
@@ -65,11 +64,13 @@ void FAST_FUNC run_shell(const char *shell, int loginshell, const char *command,
 
         args = xmalloc(sizeof(char*) * (4 + additional_args_cnt));
 
-        args[0] = bb_get_last_path_component_nostrip(xstrdup(shell));
+        if (!shell || !shell[0])
+                shell = DEFAULT_SHELL;
 
+        args[0] = bb_get_last_path_component_nostrip(shell);
         if (loginshell)
                 args[0] = xasprintf("-%s", args[0]);
-
+        argno = 1;
         if (command) {
                 args[argno++] = "-c";
                 args[argno++] = command;
@@ -79,6 +80,7 @@ void FAST_FUNC run_shell(const char *shell, int loginshell, const char *command,
                         args[argno++] = *additional_args;
         }
         args[argno] = NULL;
+
 #if ENABLE_SELINUX
         if (current_sid)
                 setexeccon(current_sid);
@@ -86,5 +88,5 @@ void FAST_FUNC run_shell(const char *shell, int loginshell, const char *command,
                 freecon(current_sid);
 #endif
         execv(shell, (char **) args);
-        bb_perror_msg_and_die("can't run '%s'", shell);
+        bb_perror_msg_and_die("can't execute '%s'", shell);
 }
diff --git a/libbb/setup_environment.c b/libbb/setup_environment.c
index 13e60d8e4..a95fbc5bf 100644
--- a/libbb/setup_environment.c
+++ b/libbb/setup_environment.c
@@ -43,7 +43,7 @@ void FAST_FUNC setup_environment(const char *shell, int flags, const struct pass
                 const char *term;
 
                 /* Leave TERM unchanged. Set HOME, SHELL, USER, LOGNAME, PATH.
-                   Unset all other environment variables.  */
+                 * Unset all other environment variables.  */
                 term = getenv("TERM");
                 clearenv();
                 if (term)
@@ -57,7 +57,7 @@ void FAST_FUNC setup_environment(const char *shell, int flags, const struct pass
                 //xsetenv("SHELL",   shell);
         } else if (flags & SETUP_ENV_CHANGEENV) {
                 /* Set HOME, SHELL, and if not becoming a super-user,
-                   USER and LOGNAME.  */
+                 * USER and LOGNAME.  */
                 if (pw->pw_uid) {
  shortcut:
                         xsetenv("USER",    pw->pw_name);
diff --git a/libbb/verror_msg.c b/libbb/verror_msg.c
index 613432906..c5fbc380c 100644
--- a/libbb/verror_msg.c
+++ b/libbb/verror_msg.c
@@ -76,12 +76,9 @@ void FAST_FUNC bb_verror_msg(const char *s, va_list p, const char* strerr)
         free(msg);
 }
 
-
 #ifdef VERSION_WITH_WRITEV
-
 /* Code size is approximately the same, but currently it's the only user
  * of writev in entire bbox. __libc_writev in uclibc is ~50 bytes. */
-
 void FAST_FUNC bb_verror_msg(const char *s, va_list p, const char* strerr)
 {
         int strerr_len, msgeol_len;
@@ -139,3 +136,23 @@ void FAST_FUNC bb_verror_msg(const char *s, va_list p, const char* strerr)
         free(msgc);
 }
 #endif
+
+
+void FAST_FUNC bb_error_msg_and_die(const char *s, ...)
+{
+        va_list p;
+
+        va_start(p, s);
+        bb_verror_msg(s, p, NULL);
+        va_end(p);
+        xfunc_die();
+}
+
+void FAST_FUNC bb_error_msg(const char *s, ...)
+{
+        va_list p;
+
+        va_start(p, s);
+        bb_verror_msg(s, p, NULL);
+        va_end(p);
+}
diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index 08d9199c1..2b6ee9e74 100644
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -70,40 +70,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)
 {
@@ -252,7 +218,7 @@ void FAST_FUNC re_exec(char **argv)
          * "we have (already) re-execed, don't do it again" flag */
         argv[0][0] |= 0x80;
         execv(bb_busybox_exec_path, argv);
-        bb_perror_msg_and_die("exec %s", bb_busybox_exec_path);
+        bb_perror_msg_and_die("can't execute '%s'", bb_busybox_exec_path);
 }
 
 pid_t FAST_FUNC fork_or_rexec(char **argv)
@@ -261,26 +227,12 @@ pid_t FAST_FUNC fork_or_rexec(char **argv)
         /* Maybe we are already re-execed and come here again? */
         if (re_execed)
                 return 0;
-        pid = vfork();
-        if (pid < 0) /* wtf? */
-                bb_perror_msg_and_die("vfork");
+        pid = xvfork();
         if (pid) /* parent */
                 return pid;
         /* child - re-exec ourself */
         re_exec(argv);
 }
-#else
-/* Dance around (void)...*/
-#undef fork_or_rexec
-pid_t FAST_FUNC fork_or_rexec(void)
-{
-        pid_t pid;
-        pid = fork();
-        if (pid < 0) /* wtf? */
-                bb_perror_msg_and_die("fork");
-        return pid;
-}
-#define fork_or_rexec(argv) fork_or_rexec()
 #endif
 
 /* Due to a #define in libbb.h on MMU systems we actually have 1 argument -
diff --git a/libbb/xconnect.c b/libbb/xconnect.c
index c3ee633e4..2de6de7c5 100644
--- a/libbb/xconnect.c
+++ b/libbb/xconnect.c
@@ -7,6 +7,7 @@
  * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 
+#include <sys/types.h>
 #include <sys/socket.h> /* netinet/in.h needs it */
 #include <netinet/in.h>
 #include <net/if.h>
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;
+}
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index 7feb58036..3e189c2d1 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -337,6 +337,11 @@ void FAST_FUNC bb_unsetenv(const char *var)
         free(tp);
 }
 
+void FAST_FUNC bb_unsetenv_and_free(char *var)
+{
+        bb_unsetenv(var);
+        free(var);
+}
 
 // Die with an error message if we can't set gid.  (Because resource limits may
 // limit this user to a given number of processes, and if that fills up the
@@ -598,3 +603,14 @@ void FAST_FUNC generate_uuid(uint8_t *buf)
         /* variant = 10x */
         buf[4 + 2 + 2] = (buf[4 + 2 + 2] & 0x3f) | 0x80;
 }
+
+#if BB_MMU
+pid_t FAST_FUNC xfork(void)
+{
+        pid_t pid;
+        pid = fork();
+        if (pid < 0) /* wtf? */
+                bb_perror_msg_and_die("vfork"+1);
+        return pid;
+}
+#endif