github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-01-20 10:52:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

source: Actually check if stdin is a tty, not just redirected

Browse Source 
This broke fishtape, which did

    somestuff | fish -c "source"

Because `source` didn't have a redirection, it refused to read from
stdin.

So, to keep the common issue of `source (command that does not print)`
from seeminly stopping fish, we instead actually check if stdin is a terminal.
This commit is contained in:
Fabian Homborg 2018-11-26 23:38:02 +01:00
parent 9e7034c903
commit a1c481c06a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/builtin_source.cpp
View File

@ -41,7 +41,7 @@ int builtin_source(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
if (argc == optind || wcscmp(argv[optind], L"-") == 0) { if (argc == optind || wcscmp(argv[optind], L"-") == 0) {
// Either a bare `source` which means to implicitly read from stdin or an explicit `-`. // Either a bare `source` which means to implicitly read from stdin or an explicit `-`.
if (argc == optind && !streams.stdin_is_directly_redirected) { if (argc == optind && isatty(streams.stdin_fd)) {
// Don't implicitly read from the terminal. // Don't implicitly read from the terminal.
return STATUS_CMD_ERROR; return STATUS_CMD_ERROR;
} }

2
tests/test1.in
View File

@ -214,7 +214,7 @@ echo 'echo "source argv {$argv}"' | source -
echo 'echo "source argv {$argv}"' | source - abc echo 'echo "source argv {$argv}"' | source - abc
echo 'echo "source argv {$argv}"' | source - abc def echo 'echo "source argv {$argv}"' | source - abc def
# This hangs if it fails! # This hangs if it fails!
source source </dev/tty
echo $status echo $status
always_fails always_fails