squash! kill: Handle Win32 console processes' children, too

kill: kill Win32 processes more gently

This change is the equivalent to the change to the Ctrl+C handling we
just made.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

winsup/utils/kill.cc

@@ -17,6 +17,7 @@ details. */
 #include <cygwin/version.h>
 #include <getopt.h>
 #include <limits.h>
+#include <cygwin/exit_process.h>
 
 static char *prog_name;
 
@@ -162,7 +163,10 @@ forcekill (int pid, int sig, int wait)
   if (pid > 0)
     p = (external_pinfo *) cygwin_internal (CW_GETPINFO_FULL, pid);
   DWORD dwpid = p ? p->dwProcessId : (DWORD) pid;
-  HANDLE h = OpenProcess (PROCESS_TERMINATE, FALSE, (DWORD) dwpid);
+  HANDLE h = OpenProcess (PROCESS_CREATE_THREAD | PROCESS_QUERY_INFORMATION |
+			  PROCESS_VM_OPERATION | PROCESS_VM_WRITE |
+			  PROCESS_VM_READ | PROCESS_TERMINATE,
+			  FALSE, (DWORD) dwpid);
   if (!h)
     {
       if (!wait || GetLastError () != ERROR_INVALID_PARAMETER)
@@ -173,7 +177,7 @@ forcekill (int pid, int sig, int wait)
   if (!wait || WaitForSingleObject (h, 200) != WAIT_OBJECT_0)
     {
       if (sig == SIGINT || sig == SIGTERM)
-        kill_process_tree (dwpid, sig);
+        exit_process (h, 128 + sig);
       else if (sig && !TerminateProcess (h, sig << 8)
           && WaitForSingleObject (h, 200) != WAIT_OBJECT_0)
         fprintf (stderr, "%s: couldn't kill pid %u, %u\n",