Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-31 23:28:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

command_not_found: Add special error for ENOTDIR

Browse source
This commit is contained in:
Fabian Boehm 2022-09-14 17:55:18 +02:00
parent 309fae9a12
commit cfecc4cc35
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/parse_execution.cpp
View file

@ -735,9 +735,23 @@ end_execution_reason_t parse_execution_context_t::handle_command_not_found(
// but this mainly applies to EACCES. We could also feasibly get: // but this mainly applies to EACCES. We could also feasibly get:
// ELOOP // ELOOP
// ENAMETOOLONG // ENAMETOOLONG
if (err_code == ENOTDIR) {
// If the original command did not include a "/", assume we found it via $PATH.
auto src = get_source(statement.command);
if (src.find(L"/") == wcstring::npos) {
return this->report_error(
STATUS_NOT_EXECUTABLE, statement.command,
_(L"Unknown command. A component of '%ls' is not a directory. Check your $PATH."), cmd);
} else {
return this->report_error(
STATUS_NOT_EXECUTABLE, statement.command,
_(L"Unknown command. A component of '%ls' is not a directory."), cmd);
}
}
return this->report_error( return this->report_error(
STATUS_NOT_EXECUTABLE, statement.command, STATUS_NOT_EXECUTABLE, statement.command,
_(L"Unknown command. '%ls' exists but is not an executable file."), cmd); _(L"Unknown command. '%ls' exists but is not an executable file."), cmd);
} }
// Handle unrecognized commands with standard command not found handler that can make better // Handle unrecognized commands with standard command not found handler that can make better