run-command: rework interface to pass program path directly

2 files changed, 5 insertions, 5 deletions

diff --git a/libbb/mingw.c b/libbb/mingw.c
index e3ec2782c..4b267e2ba 100644
--- a/libbb/mingw.c
+++ b/libbb/mingw.c
@@ -812,12 +812,12 @@ static int spawn_gitbox_shell(struct child_process *cp, const char *cmd, const c
 
         while (argv[argc]) argc++;
         argv2 = xmalloc(sizeof(*argv) * (argc+3));
-        argv2[0] = CONFIG_BUSYBOX_EXEC_PATH;
-        argv2[1] = "sh";
-        argv2[2] = cmd;
-        memcpy(&argv2[3], &argv[1], sizeof(*argv)*argc);
+        argv2[0] = "sh";
+        argv2[1] = cmd;
+        memcpy(&argv2[2], &argv[1], sizeof(*argv)*argc);
 
         memset(cp, 0, sizeof(*cp));
+        cp->cmd = CONFIG_BUSYBOX_EXEC_PATH;
         cp->argv = argv2;
         ret = start_command(cp);
         free(argv2);
diff --git a/libbb/run-command.c b/libbb/run-command.c
index d4d78e9bc..bac8f0e66 100644
--- a/libbb/run-command.c
+++ b/libbb/run-command.c
@@ -174,7 +174,7 @@ int start_command(struct child_process *cmd)
         }
 #endif
 
-        cmd->pid = mingw_spawnvpe(cmd->argv[0], cmd->argv, env);
+        cmd->pid = mingw_spawnvpe(cmd->cmd ? cmd->cmd : cmd->argv[0], cmd->argv, env);
 
         if (cmd->env)
                 free_environ(env);