From 9e6274e0a3b60e77a42784c3fb6ef2aa3cfc071a Mon Sep 17 00:00:00 2001 From: Dmitriy Anisimkov Date: Wed, 15 Dec 2021 19:26:50 +0600 Subject: [PATCH] [Ada] Fix exit status of GNAT.Expect.Close call on running process gcc/ada/ * expect.c (__gnat_waitpid): Use macros WIFEXITED, WEXITSTATUS, WIFSIGNALED, WTERMSIG, WIFSTOPPED, WSTOPSIG to get exit status or signal that caused the child process to terminate/stop. Do not process exit status in case of error in waitpid call. * adaint.c (__gnat_kill): Use of GenerateConsoleCtrlEvent is removed in Windows variant as it actually is not working and was terminating the calling process. Set signal number into exit code parameter of TerminateProcess to work the same like in Linux. --- gcc/ada/adaint.c | 14 ++------------ gcc/ada/expect.c | 13 +++++++++++-- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c index 6781728..2db3528 100644 --- a/gcc/ada/adaint.c +++ b/gcc/ada/adaint.c @@ -3562,18 +3562,8 @@ __gnat_kill (int pid, int sig, int close ATTRIBUTE_UNUSED) HANDLE h = OpenProcess (PROCESS_ALL_ACCESS, FALSE, pid); if (h == NULL) return; - if (sig == 9) - { - TerminateProcess (h, 1); - } - else if (sig == SIGINT) - GenerateConsoleCtrlEvent (CTRL_C_EVENT, pid); - else if (sig == SIGBREAK) - GenerateConsoleCtrlEvent (CTRL_BREAK_EVENT, pid); - /* ??? The last two alternatives don't really work. SIGBREAK requires setting - up process groups at start time which we don't do; treating SIGINT is just - not possible apparently. So we really only support signal 9. Fortunately - that's all we use in GNAT.Expect */ + + TerminateProcess (h, sig); CloseHandle (h); #elif defined (__vxworks) diff --git a/gcc/ada/expect.c b/gcc/ada/expect.c index a92c465..86cbcba 100644 --- a/gcc/ada/expect.c +++ b/gcc/ada/expect.c @@ -345,8 +345,17 @@ __gnat_waitpid (int pid) { int status = 0; - waitpid (pid, &status, 0); - status = WEXITSTATUS (status); + if (waitpid (pid, &status, 0) == -1) { + return -1; + } + + if WIFEXITED (status) { + status = WEXITSTATUS (status); + } else if WIFSIGNALED (status) { + status = WTERMSIG (status); + } else if WIFSTOPPED (status) { + status = WSTOPSIG (status); + } return status; } -- 2.7.4