diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2022-03-16 18:54:03 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-03-16 12:24:43 -0700 |
| commit | e4938ce3cc5967c2366db289ca854b0b796a5afd (patch) | |
| tree | fa8c0bc04216d5a688c9140b6de8b2b0af1011a1 /compat/terminal.h | |
| parent | 02af15dec5bf0114b03c4c3bec5d8f60890a1c58 (diff) | |
| download | git-e4938ce3cc5967c2366db289ca854b0b796a5afd.tar.gz | |
terminal: don't assume stdin is /dev/tty
read_key_without_echo() reads from stdin but uses /dev/tty when it
disables echo. This is unfortunate as there no guarantee that stdin is
the same device as /dev/tty. The perl version of "add -p" uses stdin
when it sets the terminal mode, this commit does the same for the
builtin version. There is still a difference between the perl and
builtin versions though - the perl version will ignore any errors when
setting the terminal mode[1] and will still read single bytes when
stdin is not a terminal. The builtin version displays a warning if
setting the terminal mode fails and switches to reading a line at a
time.
[1] https://github.com/jonathanstowe/TermReadKey/blob/b061c913bbf7ff9bad9b4eea6caae189eacd6063/ReadKey.xs#L1090
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/terminal.h')
| -rw-r--r-- | compat/terminal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compat/terminal.h b/compat/terminal.h index aeb24c9478..79ed00cf61 100644 --- a/compat/terminal.h +++ b/compat/terminal.h @@ -4,6 +4,8 @@ enum save_term_flags { /* Save input and output settings */ SAVE_TERM_DUPLEX = 1 << 0, + /* Save stdin rather than /dev/tty (fails if stdin is not a terminal) */ + SAVE_TERM_STDIN = 1 << 1, }; /* |