Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use an at exit handler to restore console state

Browse Source 
Py_Main() does not return if an unhandled SystemExit is raised
This commit is contained in:
Kovid Goyal 2019-12-04 20:03:40 +05:30
parent 55713682f2
commit 8fc745c7fb
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bypy/run-python.h
View File

@ -38,17 +38,18 @@ log_error(const char *fmt, ...) {
} }
static bool stdout_is_a_tty = false, stderr_is_a_tty = false; static bool stdout_is_a_tty = false, stderr_is_a_tty = false;
DWORD console_old_mode = 0; static DWORD console_old_mode = 0;
static UINT code_page = CP_UTF8;
static bool console_mode_changed = false; static bool console_mode_changed = false;
static void static void
detect_tty() { detect_tty(void) {
stdout_is_a_tty = _isatty(_fileno(stdout)); stdout_is_a_tty = _isatty(_fileno(stdout));
stderr_is_a_tty = _isatty(_fileno(stderr)); stderr_is_a_tty = _isatty(_fileno(stderr));
} }
static void static void
setup_vt_terminal_mode() { setup_vt_terminal_mode(void) {
if (stdout_is_a_tty || stderr_is_a_tty) { if (stdout_is_a_tty || stderr_is_a_tty) {
HANDLE h = GetStdHandle(stdout_is_a_tty ? STD_OUTPUT_HANDLE : STD_ERROR_HANDLE); HANDLE h = GetStdHandle(stdout_is_a_tty ? STD_OUTPUT_HANDLE : STD_ERROR_HANDLE);
if (h != INVALID_HANDLE_VALUE) { if (h != INVALID_HANDLE_VALUE) {
@ -61,9 +62,15 @@ setup_vt_terminal_mode() {
} }
static void static void
restore_vt_terminal_mode() { restore_vt_terminal_mode(void) {
if (console_mode_changed) SetConsoleMode(GetStdHandle(stdout_is_a_tty ? STD_OUTPUT_HANDLE : STD_ERROR_HANDLE), console_old_mode); if (console_mode_changed) SetConsoleMode(GetStdHandle(stdout_is_a_tty ? STD_OUTPUT_HANDLE : STD_ERROR_HANDLE), console_old_mode);
} }
static void
cleanup_console_state() {
if (code_page != CP_UTF8) SetConsoleOutputCP(CP_UTF8);
restore_vt_terminal_mode();
}
#else #else
static void static void
log_error(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); log_error(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
@ -253,17 +260,14 @@ run_interpreter() {
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
UINT code_page = GetConsoleOutputCP(); code_page = GetConsoleOutputCP();
if (code_page != CP_UTF8) SetConsoleOutputCP(CP_UTF8); if (code_page != CP_UTF8) SetConsoleOutputCP(CP_UTF8);
setup_vt_terminal_mode(); setup_vt_terminal_mode();
Py_AtExit(cleanup_console_state);
#endif #endif
int ret = Py_RunMain(); int ret = Py_RunMain();
PyConfig_Clear(&config); PyConfig_Clear(&config);
#ifdef _WIN32
if (code_page != CP_UTF8) SetConsoleOutputCP(CP_UTF8);
restore_vt_terminal_mode();
#endif
exit(ret); exit(ret);
#undef CHECK_STATUS #undef CHECK_STATUS
} }