undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/run-command-notdot'

Browse Source 
The implementation of run_command() API on the UNIX platforms had a
bug that caused a command not on $PATH to be found in the current
directory.

* jk/run-command-notdot:
  run-command: mark path lookup errors with ENOENT
This commit is contained in:
Junio C Hamano 2018-10-30 15:43:41 +09:00
commit 17809a98f9
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
run-command.c
View File

@ -380,7 +380,7 @@ static void child_err_spew(struct child_process *cmd, struct child_err *cerr)
set_error_routine(old_errfn); set_error_routine(old_errfn);
} }
static void prepare_cmd(struct argv_array *out, const struct child_process *cmd) static int prepare_cmd(struct argv_array *out, const struct child_process *cmd)
{ {
if (!cmd->argv[0]) if (!cmd->argv[0])
BUG("command is empty"); BUG("command is empty");
@ -403,16 +403,22 @@ static void prepare_cmd(struct argv_array *out, const struct child_process *cmd)
/* /*
* If there are no '/' characters in the command then perform a path * If there are no '/' characters in the command then perform a path
* lookup and use the resolved path as the command to exec. If there * lookup and use the resolved path as the command to exec. If there
* are no '/' characters or if the command wasn't found in the path, * are '/' characters, we have exec attempt to invoke the command
* have exec attempt to invoke the command directly. * directly.
*/ */
if (!strchr(out->argv[1], '/')) { if (!strchr(out->argv[1], '/')) {
char *program = locate_in_PATH(out->argv[1]); char *program = locate_in_PATH(out->argv[1]);
if (program) { if (program) {
free((char *)out->argv[1]); free((char *)out->argv[1]);
out->argv[1] = program; out->argv[1] = program;
} else {
argv_array_clear(out);
errno = ENOENT;
return -1;
} }
} }
return 0;
} }
static char **prep_childenv(const char *const *deltaenv) static char **prep_childenv(const char *const *deltaenv)
@ -719,6 +725,12 @@ fail_pipe:
struct child_err cerr; struct child_err cerr;
struct atfork_state as; struct atfork_state as;
if (prepare_cmd(&argv, cmd) < 0) {
failed_errno = errno;
cmd->pid = -1;
goto end_of_spawn;
}
if (pipe(notify_pipe)) if (pipe(notify_pipe))
notify_pipe[0] = notify_pipe[1] = -1; notify_pipe[0] = notify_pipe[1] = -1;
@ -729,7 +741,6 @@ fail_pipe:
set_cloexec(null_fd); set_cloexec(null_fd);
} }
prepare_cmd(&argv, cmd);
childenv = prep_childenv(cmd->env); childenv = prep_childenv(cmd->env);
atfork_prepare(&as); atfork_prepare(&as);
@ -857,6 +868,8 @@ fail_pipe:
argv_array_clear(&argv); argv_array_clear(&argv);
free(childenv); free(childenv);
} }
end_of_spawn:
#else #else
{ {
int fhin = 0, fhout = 1, fherr = 2; int fhin = 0, fhout = 1, fherr = 2;

13
t/t0061-run-command.sh
View File

@ -12,10 +12,14 @@ cat >hello-script <<-EOF
cat hello-script cat hello-script
EOF EOF
test_expect_success 'start_command reports ENOENT' ' test_expect_success 'start_command reports ENOENT (slash)' '
test-tool run-command start-command-ENOENT ./does-not-exist test-tool run-command start-command-ENOENT ./does-not-exist
' '
test_expect_success 'start_command reports ENOENT (no slash)' '
test-tool run-command start-command-ENOENT does-not-exist
'
test_expect_success 'run_command can run a command' ' test_expect_success 'run_command can run a command' '
cat hello-script >hello.sh && cat hello-script >hello.sh &&
chmod +x hello.sh && chmod +x hello.sh &&
@ -25,6 +29,13 @@ test_expect_success 'run_command can run a command' '
test_must_be_empty err test_must_be_empty err
' '
test_expect_success 'run_command is restricted to PATH' '
write_script should-not-run <<-\EOF &&
echo yikes
EOF
test_must_fail test-tool run-command run-command should-not-run
'
test_expect_success !MINGW 'run_command can run a script without a #! line' ' test_expect_success !MINGW 'run_command can run a script without a #! line' '
cat >hello <<-\EOF && cat >hello <<-\EOF &&
cat hello-script cat hello-script