f7da756566
When disable_bits() changes the terminal attributes it uses
sigchain_push_common() to restore the terminal if a signal is received
before restore_term() is called. However there is no corresponding
call to sigchain_pop_common() when the settings are restored so the
signal handler is left on the sigchain stack. This leaves the stack
unbalanced so code such as
sigchain_push_common(my_handler);
...
read_key_without_echo(...);
...
sigchain_pop_common();
pops the handler pushed by disable_bits() rather than the one it
intended to. Additionally "git add -p" changes the terminal settings
every time it reads a key press so the stack can grow significantly.
In order to fix this save_term() now sets up the signal handler so
restore_term() can unconditionally call sigchain_pop_common(). There
are no callers of save_term() outside of terminal.c as the only
external caller was removed by e3f7e01b50 ("Revert "editor: save and
reset terminal after calling EDITOR"", 2021-11-22). Any future callers
of save_term() should benefit from having the signal handler set up
for them.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
21 lines
669 B
C
21 lines
669 B
C
#ifndef COMPAT_TERMINAL_H
|
|
#define COMPAT_TERMINAL_H
|
|
|
|
/*
|
|
* Save the terminal attributes so they can be restored later by a
|
|
* call to restore_term(). Note that every successful call to
|
|
* save_term() must be matched by a call to restore_term() even if the
|
|
* attributes have not been changed. Returns 0 on success, -1 on
|
|
* failure.
|
|
*/
|
|
int save_term(int full_duplex);
|
|
/* Restore the terminal attributes that were saved with save_term() */
|
|
void restore_term(void);
|
|
|
|
char *git_terminal_prompt(const char *prompt, int echo);
|
|
|
|
/* Read a single keystroke, without echoing it to the terminal */
|
|
int read_key_without_echo(struct strbuf *buf);
|
|
|
|
#endif /* COMPAT_TERMINAL_H */
|