Merge branch 'origin/master' (early part)

2 files changed, 4 insertions, 5 deletions

diff --git a/debianutils/mktemp.c b/debianutils/mktemp.c
index c40211476..2c4e19670 100644
--- a/debianutils/mktemp.c
+++ b/debianutils/mktemp.c
@@ -50,7 +50,8 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv)
         opts = getopt32(argv, "dqtp:", &path);
 
         chp = argv[optind] ? argv[optind] : xstrdup("tmp.XXXXXX");
-        chp = concat_path_file(path, chp);
+        if (chp[0] != '/' || (opts & 8))
+                chp = concat_path_file(path, chp);
 
         if (opts & 1) { /* -d */
                 if (mkdtemp(chp) == NULL)
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index 0a0802575..665f38fbd 100644
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -409,9 +409,7 @@ int start_stop_daemon_main(int argc UNUSED_PARAM, char **argv)
                 /* DAEMON_DEVNULL_STDIO is superfluous -
                  * it's always done by bb_daemonize() */
 #else
-                pid_t pid = vfork();
-                if (pid < 0) /* error */
-                        bb_perror_msg_and_die("vfork");
+                pid_t pid = xvfork();
                 if (pid != 0) {
                         /* parent */
                         /* why _exit? the child may have changed the stack,
@@ -448,5 +446,5 @@ int start_stop_daemon_main(int argc UNUSED_PARAM, char **argv)
         }
 #endif
         execvp(startas, argv);
-        bb_perror_msg_and_die("can't start %s", startas);
+        bb_perror_msg_and_die("can't execute '%s'", startas);
 }