[PATCH] run-command.c: Accept EACCES as command not found
- From
Frans Klaver <fransklaver@gmail.com>
- Date
- Nov 21, 2011, 21:53 UTC
- Message-ID
- <1321912387-4569-1-git-send-email-fransklaver@gmail.com>
execvp returns ENOENT if a command was not found after searching PATH. If path contains a directory that current user has insufficient privileges to, EACCES is returned. This may still mean the program wasn't found.
If the latter case is encountered, git errors out without giving aliases a try, which breaks t0001.3 and alias handling in general.
This can be fixed by handling the EACCES case equally to the ENOENT case.
Signed-off-by: Frans Klaver <fransklaver@gmail.com> ---
I'm actually not too happy about the location of the tests. I couldn't find out from the available tests and the documentation where I would have to create the new ones. For now, I've added the tests to the same set that I found the issue with.
run-command.c | 10 ++++++++-- t/t0001-init.sh | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/run-command.c b/run-command.c index 1c51043..ad3c120 100644 --- a/run-command.c +++ b/run-command.c @@ -280,12 +280,18 @@ fail_pipe: } else { execvp(cmd->argv[0], (char *const*) cmd->argv); } - if (errno == ENOENT) { + switch (errno) { + case ENOENT: if (!cmd->silent_exec_failure) error("cannot run %s: %s", cmd->argv[0], strerror(ENOENT)); exit(127); - } else { + case EACCES: + if (!cmd->silent_exec_failure) + error("fatal: cannot exec '%s': %s", cmd->argv[0], + strerror(EACCES)); + exit(127); + default: die_errno("cannot exec '%s'", cmd->argv[0]); } } diff --git a/t/t0001-init.sh b/t/t0001-init.sh index ad66410..d40966a 100755 --- a/t/t0001-init.sh +++ b/t/t0001-init.sh @@ -63,6 +63,54 @@ test_expect_success 'plain through aliased command, outside any git repo' ' check_config plain-aliased/.git false unset ' +test_expect_success 'plain through aliased command, inaccessible path, outside any git repo' ' + ( + sane_unset GIT_DIR GIT_WORK_TREE && + HOME=$(pwd)/alias-config-path && + export HOME && + mkdir alias-config-path && + echo "[alias] aliasedinit = init" >alias-config-path/.gitconfig && + + GIT_CEILING_DIRECTORIES=$(pwd) && + export GIT_CEILING_DIRECTORIES && + + mkdir searchpath && + chmod 400 searchpath && + PATH=$(pwd)/searchpath:$PATH && + export PATH && + + mkdir plain-aliased-path && + cd plain-aliased-path && + git aliasedinit + ) && + check_config plain-aliased-path/.git false unset +' + +test_expect_success 'plain through aliased command, inaccessible command, outside any git repo' ' + ( + sane_unset GIT_DIR GIT_WORK_TREE && + HOME=$(pwd)/alias-config-cmd && + export HOME && + mkdir alias-config-cmd && + echo "[alias] aliasedinit = init" >alias-config-cmd/.gitconfig && + + GIT_CEILING_DIRECTORIES=$(pwd) && + export GIT_CEILING_DIRECTORIES && + + mkdir searchpathcmd && + chmod 755 searchpathcmd && + PATH=$(pwd)/searchpathcmd:$PATH && + export PATH && + + touch searchpathcmd/git-aliasedinit && + + mkdir plain-aliased-cmd && + cd plain-aliased-cmd && + git aliasedinit + ) && + check_config plain-aliased-cmd/.git false unset +' + test_expect_failure 'plain nested through aliased command' ' ( sane_unset GIT_DIR GIT_WORK_TREE &&
-- 1.7.7