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

terminal: set VMIN and VTIME in non-canonical mode

Browse Source 
If VMIN and VTIME are both set to zero then the terminal performs
non-blocking reads which means that read_key_without_echo() returns
EOF if there is no key press pending. This results in the user being
unable to select anything when running "git add -p".  Fix this by
explicitly setting VMIN and VTIME when enabling non-canonical mode.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Phillip Wood 2022-02-22 18:53:34 +00:00 committed by Junio C Hamano
parent f7da756566
commit 2c6860211f
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compat/terminal.c
View File

@ -57,6 +57,10 @@ static int disable_bits(tcflag_t bits)
t = old_term; t = old_term;
t.c_lflag &= ~bits; t.c_lflag &= ~bits;
if (bits & ICANON) {
t.c_cc[VMIN] = 1;
t.c_cc[VTIME] = 0;
}
if (!tcsetattr(term_fd, TCSAFLUSH, &t)) if (!tcsetattr(term_fd, TCSAFLUSH, &t))
return 0; return 0;
@ -159,7 +163,11 @@ static int disable_bits(DWORD bits)
if (bits & ENABLE_LINE_INPUT) { if (bits & ENABLE_LINE_INPUT) {
string_list_append(&stty_restore, "icanon"); string_list_append(&stty_restore, "icanon");
strvec_push(&cp.args, "-icanon"); /*
* POSIX allows VMIN and VTIME to overlap with VEOF and
* VEOL - let's hope that is not the case on windows.
*/
strvec_pushl(&cp.args, "-icanon", "min", "1", "time", "0", NULL);
} }
if (bits & ENABLE_ECHO_INPUT) { if (bits & ENABLE_ECHO_INPUT) {