diff options
| -rw-r--r-- | src/fe_utils/cancel.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/fe_utils/cancel.c b/src/fe_utils/cancel.c index 49bdc6aca19..d430866758f 100644 --- a/src/fe_utils/cancel.c +++ b/src/fe_utils/cancel.c @@ -43,6 +43,13 @@ static PGcancel *volatile cancelConn = NULL; /* + * Predetermined localized error strings --- needed to avoid trying + * to call gettext() from a signal handler. + */ +static const char *cancel_sent_msg = NULL; +static const char *cancel_not_sent_msg = NULL; + +/* * CancelRequested is set when we receive SIGINT (or local equivalent). * There is no provision in this module for resetting it; but applications * might choose to clear it after successfully recovering from a cancel. @@ -158,11 +165,11 @@ handle_sigint(SIGNAL_ARGS) { if (PQcancel(cancelConn, errbuf, sizeof(errbuf))) { - write_stderr(_("Cancel request sent\n")); + write_stderr(cancel_sent_msg); } else { - write_stderr(_("Could not send cancel request: ")); + write_stderr(cancel_not_sent_msg); write_stderr(errbuf); } } @@ -179,6 +186,9 @@ void setup_cancel_handler(void (*callback) (void)) { cancel_callback = callback; + cancel_sent_msg = _("Cancel request sent\n"); + cancel_not_sent_msg = _("Could not send cancel request: "); + pqsignal(SIGINT, handle_sigint); } @@ -203,11 +213,11 @@ consoleHandler(DWORD dwCtrlType) { if (PQcancel(cancelConn, errbuf, sizeof(errbuf))) { - write_stderr(_("Cancel request sent\n")); + write_stderr(cancel_sent_msg); } else { - write_stderr(_("Could not send cancel request: ")); + write_stderr(cancel_not_sent_msg); write_stderr(errbuf); } } @@ -225,6 +235,8 @@ void setup_cancel_handler(void (*callback) (void)) { cancel_callback = callback; + cancel_sent_msg = _("Cancel request sent\n"); + cancel_not_sent_msg = _("Could not send cancel request: "); InitializeCriticalSection(&cancelConnLock); |