Skip to content

Console.Unix: fix missing terminal configuration on SIGINT/SIGQUIT/SGCONT. #64200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 7, 2022
Merged

Console.Unix: fix missing terminal configuration on SIGINT/SIGQUIT/SGCONT. #64200

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/native/libs/System.Native/pal_signal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,16 @@ int32_t InitializeSignalHandlingCore()
return 0;
}

#ifdef HAS_CONSOLE_SIGNALS
// Unconditionally register signals for terminal configuration.
bool installed = InstallSignalHandler(SIGINT, SA_RESTART);
assert(installed);
installed = InstallSignalHandler(SIGQUIT, SA_RESTART);
assert(installed);
installed = InstallSignalHandler(SIGCONT, SA_RESTART);
assert(installed);
#endif

return 1;
}

Expand Down Expand Up @@ -612,7 +622,12 @@ void SystemNative_DisablePosixSignalHandling(int signalCode)
{
g_hasPosixSignalRegistrations[signalCode - 1] = false;

if (!(g_consoleTtouHandler && signalCode == SIGTTOU) &&
// Don't restore handler when something other than posix handling needs the signal.
if (
#ifdef HAS_CONSOLE_SIGNALS
signalCode != SIGINT && signalCode != SIGQUIT && signalCode != SIGCONT &&
#endif
!(g_consoleTtouHandler && signalCode == SIGTTOU) &&
!(g_sigChldCallback && signalCode == SIGCHLD) &&
!(g_terminalInvalidationCallback && (signalCode == SIGCONT ||
signalCode == SIGCHLD ||
Expand Down