Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-30 14:53:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use _POSIX_VDISABLE instead of \0 to disable control functions

Browse source 
Prior to this commit, fish used NUL ('\0') to disable control
functions (for example, the function that generates SIGTSTP).
However NUL may in fact be bindable and is on macOS via
control-space.

Use instead _POSIX_VDISABLE if defined and not -1.
This commit is contained in:
ridiculousfish 2020-07-01 22:33:31 -07:00
parent 77f412af1b
commit 90d8df8128
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/reader.cpp
View file

@ -656,12 +656,20 @@ static void term_fix_modes(struct termios *modes) {
modes->c_cc[VMIN] = 1; modes->c_cc[VMIN] = 1;
modes->c_cc[VTIME] = 0; modes->c_cc[VTIME] = 0;
unsigned char disabling_char = '\0';
// Prefer to use _POSIX_VDISABLE to disable control functions.
// This permits separately binding nul (typically control-space).
// POSIX calls out -1 as a special value which should be ignored.
#ifdef _POSIX_VDISABLE
if (_POSIX_VDISABLE != -1) disabling_char = _POSIX_VDISABLE;
#endif
// We ignore these anyway, so there is no need to sacrifice a character. // We ignore these anyway, so there is no need to sacrifice a character.
modes->c_cc[VSUSP] = '\0'; modes->c_cc[VSUSP] = disabling_char;
// (these two are already disabled because of IXON/IXOFF) // (these two are already disabled because of IXON/IXOFF)
modes->c_cc[VSTOP] = '\0'; modes->c_cc[VSTOP] = disabling_char;
modes->c_cc[VSTART] = '\0'; modes->c_cc[VSTART] = disabling_char;
} }
/// Tracks a currently pending exit. This may be manipulated from a signal handler. /// Tracks a currently pending exit. This may be manipulated from a signal handler.