Changeset 501 in kBuild for vendor/gnumake/current/w32/subproc/sub_proc.c

Timestamp:

Sep 15, 2006 2:30:32 AM (18 years ago)

Author:

bird

Message:

Load make-3.81/ into vendor/gnumake/current.

File:

• vendor/gnumake/current/w32/subproc/sub_proc.c (modified) (26 diffs)

vendor/gnumake/current/w32/subproc/sub_proc.c

@@ +1 @@
+/* Process handling for Windows.
+Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+2006 Free Software Foundation, Inc.
+This file is part of GNU Make.
+
+GNU Make is free software; you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the Free Software
+Foundation; either version 2, or (at your option) any later version.
+
+GNU Make is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+GNU Make; see the file COPYING.  If not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.  */
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <process.h>  /* for msvc _beginthreadex, _endthreadex */
+#include <signal.h>
 #include <windows.h>
 
@@ -31 +49 @@
 
 /* keep track of children so we can implement a waitpid-like routine */
-static sub_process *proc_array[256];
+static sub_process *proc_array[MAXIMUM_WAIT_OBJECTS];
 static int proc_index = 0;
 static int fake_exits_pending = 0;
@@ -66 +84 @@
 process_wait_for_any_private(void)
 {
-        HANDLE handles[256];
+        HANDLE handles[MAXIMUM_WAIT_OBJECTS];
         DWORD retval, which;
         int i;
@@ -120 +138 @@
 process_register(HANDLE proc)
 {
-        proc_array[proc_index++] = (sub_process *) proc;
+        if (proc_index < MAXIMUM_WAIT_OBJECTS)
+                proc_array[proc_index++] = (sub_process *) proc;
+}
+
+/*
+ * Return the number of processes that we are still waiting for.
+ */
+int
+process_used_slots(void)
+{
+        return proc_index;
 }
 
@@ -163 +191 @@
 
 long
-process_errno(HANDLE proc)
-{
-        return (((sub_process *)proc)->lerrno);
+process_signal(HANDLE proc)
+{
+        if (proc == INVALID_HANDLE_VALUE) return 0;
+        return (((sub_process *)proc)->signal);
 }
 
 long
-process_signal(HANDLE proc)
-{
-        return (((sub_process *)proc)->signal);
-}
-
-        long
 process_last_err(HANDLE proc)
 {
+        if (proc == INVALID_HANDLE_VALUE) return ERROR_INVALID_HANDLE;
         return (((sub_process *)proc)->last_err);
 }
 
-        long
+long
 process_exit_code(HANDLE proc)
 {
+        if (proc == INVALID_HANDLE_VALUE) return EXIT_FAILURE;
         return (((sub_process *)proc)->exit_code);
 }
 
-        char *
+/*
+2006-02:
+All the following functions are currently unused.
+All of them would crash gmake if called with argument INVALID_HANDLE_VALUE.
+Hence whoever wants to use one of this functions must invent and implement
+a reasonable error handling for this function.
+
+char *
 process_outbuf(HANDLE proc)
 {
@@ -192 +224 @@
 }
 
-        char *
+char *
 process_errbuf(HANDLE proc)
 {
@@ -198 +230 @@
 }
 
-        int
+int
 process_outcnt(HANDLE proc)
 {
@@ -204 +236 @@
 }
 
-        int
+int
 process_errcnt(HANDLE proc)
 {
@@ -210 +242 @@
 }
 
-        void
+void
 process_pipes(HANDLE proc, int pipes[3])
 {
@@ -218 +250 @@
         return;
 }
-
+*/
 
         HANDLE
@@ -369 +401 @@
  * Description:   Create the child process to be helped
  *
- * Returns:
+ * Returns: success <=> 0
  *
  * Notes/Dependencies:
@@ -523 +555 @@
                         pproc->last_err = GetLastError();
                         pproc->lerrno = E_FORK;
-                        fprintf(stderr, "process_begin: CreateProcess(%s, %s, ...) failed.\n", exec_path, command_line);
+                        fprintf(stderr, "process_begin: CreateProcess(%s, %s, ...) failed.\n",
+                                exec_path ? exec_path : "NULL", command_line);
                         if (envblk) free(envblk);
                         free( command_line );
@@ -535 +568 @@
 
         /* Close the halves of the pipes we don't need */
-        if (pproc->sv_stdin) {
-                CloseHandle((HANDLE)pproc->sv_stdin[1]);
-                (HANDLE)pproc->sv_stdin[1] = 0;
-        }
-        if (pproc->sv_stdout) {
-                CloseHandle((HANDLE)pproc->sv_stdout[1]);
-                (HANDLE)pproc->sv_stdout[1] = 0;
-        }
-        if (pproc->sv_stderr) {
-                CloseHandle((HANDLE)pproc->sv_stderr[1]);
-                (HANDLE)pproc->sv_stderr[1] = 0;
-        }
+        CloseHandle((HANDLE)pproc->sv_stdin[1]);
+        CloseHandle((HANDLE)pproc->sv_stdout[1]);
+        CloseHandle((HANDLE)pproc->sv_stderr[1]);
+        pproc->sv_stdin[1] = 0;
+        pproc->sv_stdout[1] = 0;
+        pproc->sv_stderr[1] = 0;
 
         free( command_line );
@@ -658 +685 @@
         bool_t stdin_eof = FALSE, stdout_eof = FALSE, stderr_eof = FALSE;
         HANDLE childhand = (HANDLE) pproc->pid;
-        HANDLE tStdin, tStdout, tStderr;
-        DWORD dwStdin, dwStdout, dwStderr;
+        HANDLE tStdin = NULL, tStdout = NULL, tStderr = NULL;
+        unsigned int dwStdin, dwStdout, dwStderr;
         HANDLE wait_list[4];
         DWORD wait_count;
@@ -675 +702 @@
                 stdin_eof = TRUE;
                 CloseHandle((HANDLE)pproc->sv_stdin[0]);
-                (HANDLE)pproc->sv_stdin[0] = 0;
+                pproc->sv_stdin[0] = 0;
         } else {
                 tStdin = (HANDLE) _beginthreadex( 0, 1024,
-                        (unsigned (__stdcall *) (void *))proc_stdin_thread, pproc, 0,
-                        (unsigned int *) &dwStdin);
+                        (unsigned (__stdcall *) (void *))proc_stdin_thread,
+                                                  pproc, 0, &dwStdin);
                 if (tStdin == 0) {
                         pproc->last_err = GetLastError();
@@ -692 +719 @@
         tStdout = (HANDLE) _beginthreadex( 0, 1024,
                 (unsigned (__stdcall *) (void *))proc_stdout_thread, pproc, 0,
-                (unsigned int *) &dwStdout);
+                &dwStdout);
         tStderr = (HANDLE) _beginthreadex( 0, 1024,
                 (unsigned (__stdcall *) (void *))proc_stderr_thread, pproc, 0,
-                (unsigned int *) &dwStderr);
+                &dwStderr);
 
         if (tStdout == 0 || tStderr == 0) {
@@ -740 +767 @@
                 if (ready_hand == tStdin) {
                         CloseHandle((HANDLE)pproc->sv_stdin[0]);
-                        (HANDLE)pproc->sv_stdin[0] = 0;
+                        pproc->sv_stdin[0] = 0;
                         CloseHandle(tStdin);
                         tStdin = 0;
@@ -748 +775 @@
 
                         CloseHandle((HANDLE)pproc->sv_stdout[0]);
-                        (HANDLE)pproc->sv_stdout[0] = 0;
+                        pproc->sv_stdout[0] = 0;
                         CloseHandle(tStdout);
                         tStdout = 0;
@@ -756 +783 @@
 
                         CloseHandle((HANDLE)pproc->sv_stderr[0]);
-                        (HANDLE)pproc->sv_stderr[0] = 0;
+                        pproc->sv_stderr[0] = 0;
                         CloseHandle(tStderr);
                         tStderr = 0;
@@ -763 +790 @@
                 } else if (ready_hand == childhand) {
 
-                        GetExitCodeResult = GetExitCodeProcess(childhand, (DWORD*)&pproc->exit_code);
+                        DWORD ierr;
+                        GetExitCodeResult = GetExitCodeProcess(childhand, &ierr);
+                        if (ierr == CONTROL_C_EXIT) {
+                                pproc->signal = SIGINT;
+                        } else {
+                                pproc->exit_code = ierr;
+                        }
                         if (GetExitCodeResult == FALSE) {
                                 pproc->last_err = GetLastError();
@@ -812 +845 @@
         DWORD wait_return;
         BOOL GetExitCodeResult;
+        DWORD ierr;
 
         if (proc == NULL)
@@ -855 +889 @@
         }
 
-        GetExitCodeResult = GetExitCodeProcess(childhand, (DWORD*)&pproc->exit_code);
+        GetExitCodeResult = GetExitCodeProcess(childhand, &ierr);
+        if (ierr == CONTROL_C_EXIT) {
+                pproc->signal = SIGINT;
+        } else {
+                pproc->exit_code = ierr;
+        }
         if (GetExitCodeResult == FALSE) {
                 pproc->last_err = GetLastError();
@@ -1156 +1195 @@
   HANDLE hProcess;
 
+  if (proc_index >= MAXIMUM_WAIT_OBJECTS) {
+        DB (DB_JOBS, ("process_easy: All process slots used up\n"));
+        return INVALID_HANDLE_VALUE;
+  }
   if (DuplicateHandle(GetCurrentProcess(),
                       GetStdHandle(STD_INPUT_HANDLE),
@@ -1164 +1207 @@
                       DUPLICATE_SAME_ACCESS) == FALSE) {
     fprintf(stderr,
-            "process_easy: DuplicateHandle(In) failed (e=%d)\n",
+            "process_easy: DuplicateHandle(In) failed (e=%ld)\n",
             GetLastError());
     return INVALID_HANDLE_VALUE;
@@ -1176 +1219 @@
                       DUPLICATE_SAME_ACCESS) == FALSE) {
     fprintf(stderr,
-           "process_easy: DuplicateHandle(Out) failed (e=%d)\n",
+           "process_easy: DuplicateHandle(Out) failed (e=%ld)\n",
            GetLastError());
     return INVALID_HANDLE_VALUE;
@@ -1188 +1231 @@
                       DUPLICATE_SAME_ACCESS) == FALSE) {
     fprintf(stderr,
-            "process_easy: DuplicateHandle(Err) failed (e=%d)\n",
+            "process_easy: DuplicateHandle(Err) failed (e=%ld)\n",
             GetLastError());
     return INVALID_HANDLE_VALUE;