github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-30 16:35:16 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix for https://github.com/fish-shell/fish-shell/issues/209

Browse Source 
Don't hang if stdin is closed and we have no bindings
This commit is contained in:
ridiculousfish 2012-07-06 16:25:10 -07:00
parent 232ed91ec7
commit ee8fd21d28
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
input.cpp
View File

@ -545,7 +545,14 @@ wint_t input_readch()
No action to take on specified character, ignore it No action to take on specified character, ignore it
and move to next one. and move to next one.
*/ */
input_common_readch( 0 ); } wchar_t c = input_common_readch( 0 );
/* If it's closed, then just return */
if (c == R_EOF)
{
return WEOF;
}
}
} }
void input_mapping_get_names( wcstring_list_t &lst ) void input_mapping_get_names( wcstring_list_t &lst )

2
share/functions/__fish_print_help.fish
View File

@ -23,7 +23,7 @@ function __fish_print_help --description "Print help message for the specified f
set -l sed_cmd -e $cmd1 -e $cmd2 -e $cmd3 set -l sed_cmd -e $cmd1 -e $cmd2 -e $cmd3
# Render help output, save output into the variable 'help' # Render help output, save output into the variable 'help'
set -l help (nroff -man $__fish_datadir/man/man1/$item.1) set -l help (nroff -man "$__fish_datadir/man/man1/$item.1")
set -l lines (count $help) set -l lines (count $help)
# Print an empty line first # Print an empty line first