X-Git-Url: http://winboard.nl/cgi-bin?p=polyglot.git;a=blobdiff_plain;f=pipex_win32.c;h=41431b3a657dcc0a1f5ee7cefc13d44549dc2ea6;hp=0bbf990282a9c1195ae5c63ec638efc93f995c9c;hb=HEAD;hpb=471c4c42e267be298ce20951d5a352acd6b55190

diff --git a/pipex_win32.c b/pipex_win32.c
index 0bbf990..41431b3 100644
--- a/pipex_win32.c
+++ b/pipex_win32.c
@@ -98,7 +98,8 @@ void pipex_open(pipex_t *pipex,
             my_fatal("pipex_open(): no current directory: %s\n",
                      strerror(errno));
         if(_chdir(szWorkingDir)){
-            my_fatal("pipex_open(): cannot change directory: %s\n",
+            my_fatal("pipex_open(): %s: %s\n",
+		     szWorkingDir,
                      strerror(errno));
         }
        if(CreateProcess(NULL,
@@ -192,21 +193,47 @@ void pipex_send_eof(pipex_t *pipex)  {
 
 // pipex_exit()
 
-void pipex_exit(pipex_t *pipex) {
+/* This routine waits for kill_timeout milliseconds for 
+ * the process to exit by itself. If that doesn't
+ * happen it will kill the process.
+ */
+
+void pipex_exit(pipex_t *pipex, int kill_timeout) {
     DWORD lpexit;
+    int elapsed_time;
+    bool exited;
     CloseHandle(pipex->hInput);
     CloseHandle(pipex->hOutput);
+    //	ExitProcess(pipex->hProcess,0);
+
+    my_log("POLYGLOT Waiting for child process to exit.\n");
+    elapsed_time=0;
+    exited=FALSE;
+
+    while(elapsed_time<kill_timeout){
+	GetExitCodeProcess(pipex->hProcess,&lpexit);
+	if(lpexit==STILL_ACTIVE){
+	    my_log("POLYGLOT Child has not exited yet. Sleeping %dms.\n", WAIT_GRANULARITY);
+	    my_sleep(WAIT_GRANULARITY);
+	    elapsed_time+=WAIT_GRANULARITY;
+	}else{
+	    exited=TRUE;
+	    break;
+	}
+    }
+ 
+    if(!exited){
+      my_log("POLYGLOT Child wouldn't exit by itself. Terminating it.\n");
+      TerminateProcess(pipex->hProcess,lpexit);
+    }
+    CloseHandle(pipex->hProcess);    
+
     if(!pipex->quit_pending){
       // suppress further errors
       pipex->quit_pending=TRUE;
       my_fatal("pipex_exit(): %s: child exited unexpectedly.\n",pipex->command);
     }
-    if(GetExitCodeProcess(pipex->hProcess,&lpexit)){
-        if(lpexit==STILL_ACTIVE)
-                //must be java,hammer it down!
-            TerminateProcess(pipex->hProcess,lpexit);
-    }
-	CloseHandle(pipex->hProcess);
+
 }
 
 // pipex_eof_input()