2 files changed, 3 insertions, 6 deletions

diff --git a/runit/runsv.c b/runit/runsv.c
index f83d58283..4155b8f43 100644
--- a/runit/runsv.c
+++ b/runit/runsv.c
@@ -251,7 +251,6 @@ static unsigned custom(struct svdir *s, char c)
         int w;
         char a[10];
         struct stat st;
-        char *prog[2];
 
         if (s->islog) return 0;
         strcpy(a, "control/?");
@@ -267,13 +266,11 @@ static unsigned custom(struct svdir *s, char c)
                                 /* child */
                                 if (haslog && dup2(logpipe.wr, 1) == -1)
                                         warn_cannot("setup stdout for control/?");
-                                prog[0] = a;
-                                prog[1] = NULL;
-                                execv(a, prog);
+                                execl(a, a, (char *) NULL);
                                 fatal_cannot("run control/?");
                         }
                         /* parent */
-                        while (safe_waitpid(pid, &w, 0) == -1) {
+                        if (safe_waitpid(pid, &w, 0) == -1) {
                                 warn_cannot("wait for child control/?");
                                 return 0;
                         }
diff --git a/runit/runsvdir.c b/runit/runsvdir.c
index 7b054e410..a77bc3fd8 100644
--- a/runit/runsvdir.c
+++ b/runit/runsvdir.c
@@ -119,7 +119,7 @@ static NOINLINE pid_t runsv(const char *name)
                         | (1 << SIGTERM)
                         , SIG_DFL);
 #endif
-                execlp("runsv", "runsv", name, NULL);
+                execlp("runsv", "runsv", name, (char *) NULL);
                 fatal2_cannot("start runsv ", name);
         }
         return pid;