X-Git-Url: http://winboard.nl/cgi-bin?p=polyglot.git;a=blobdiff_plain;f=pipex_posix.c;h=9ce06f3533adba85c80c5bf5cf248cdbf0a8d530;hp=737f9ce66b9d99c106f3b1509eb409c3b3f707d8;hb=HEAD;hpb=471c4c42e267be298ce20951d5a352acd6b55190

diff --git a/pipex_posix.c b/pipex_posix.c
index 737f9ce..9ce06f3 100644
--- a/pipex_posix.c
+++ b/pipex_posix.c
@@ -3,15 +3,12 @@
 // includes
 
 #include <string.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <wordexp.h>
 #include <sys/wait.h>
 #include "pipex.h"
 
-// constants
-
-static const unsigned int StringSize = 4096;
-
 // prototypes
 
 static void my_close(int fd);
@@ -90,7 +87,7 @@ void pipex_open(pipex_t *pipex,
             my_fatal("pipex_open(): pipe(): %s\n",strerror(errno));
         }
         
-            // create the child process
+            // create the child process 
         
         pipex->pid = fork();
         
@@ -120,11 +117,14 @@ void pipex_open(pipex_t *pipex,
                 // attach standard error to standard output
                 // commenting this out gives error messages on the console
             
-           /* my_dup2(STDOUT_FILENO,STDERR_FILENO); */
+            my_dup2(STDOUT_FILENO,STDERR_FILENO); 
             
             if(chdir(working_dir)){
-                my_fatal("pipex_open(): cannot change directory: %s\n",
-                         strerror(errno));
+                printf("%s pipex_open(): %s: %s\n",
+		       PIPEX_MAGIC,
+		       working_dir,
+		       strerror(errno));
+		goto wait_for_eof;
             }
             
             // launch the new executable file
@@ -132,8 +132,14 @@ void pipex_open(pipex_t *pipex,
             execvp(argv[0],&argv[0]);
             
                 // execvp() only returns when an error has occured
-            
-            my_fatal("engine_open(): execvp(): %s: %s\n",argv[0],strerror(errno));
+
+	    printf("%s pipex_open(): execvp(): %s: %s\n",
+		   PIPEX_MAGIC,
+		   argv[0],
+		   strerror(errno));
+	wait_for_eof:
+	    while(fgets(string,StringSize,stdin));
+	    exit(EXIT_SUCCESS);
             
         } else { // pid > 0
             
@@ -188,7 +194,9 @@ void pipex_wait_event(pipex_t *pipex[]){
    q=pipex;
    if (val > 0) {
        while((p=*(q++))!=NULL){
-           if (FD_ISSET(p->io->in_fd,set)) io_get_update(p->io); 
+           if (FD_ISSET(p->io->in_fd,set) /*&& !io_line_ready(p->io)*/){
+	       io_get_update(p->io); 
+	   }
        }
    }    
 }
@@ -228,10 +236,40 @@ 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){
     int status;
+    int elapsed_time;
+    bool exited;
+    int ret;
+
     my_log("POLYGLOT Waiting for child process to exit.\n");
-    waitpid(pipex->pid,&status,0);
+
+    elapsed_time=0;
+    exited=FALSE;
+    ret=0;
+    while(elapsed_time<kill_timeout){
+      ret=waitpid(pipex->pid,&status,WNOHANG);
+      if(ret==0){
+	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");
+      kill(pipex->pid,SIGKILL);
+      waitpid(pipex->pid,&status,0);    
+    }
     if(WIFEXITED(status)){
       if(pipex->quit_pending){
 	my_log("POLYGLOT Child exited with status %d.\n",WEXITSTATUS(status));
@@ -252,18 +290,26 @@ void pipex_exit(pipex_t *pipex){
     return;
 }
 
+// pipex_get_buffer()
+
+char * pipex_get_buffer(pipex_t *pipex){
+  return pipex->io->in_buffer;
+}
+
 // pipex_readln()
 
 bool pipex_readln(pipex_t *pipex, char *string){
     while (!io_line_ready(pipex->io)) {
-      io_get_update(pipex->io);
+	io_get_update(pipex->io);
    }
    if (!io_get_line(pipex->io,string,StringSize)) { // EOF
        string[0]='\0';
        pipex->state|=PIPEX_EOF;
        return FALSE;
    }
-   
+   if(strncmp(PIPEX_MAGIC,string,strlen(PIPEX_MAGIC))==0){
+     my_fatal("%s\n",string+strlen(PIPEX_MAGIC)+1);
+   }
 
    return TRUE;
 }
@@ -271,12 +317,21 @@ bool pipex_readln(pipex_t *pipex, char *string){
 // pipex_readln_nb()
 
 bool pipex_readln_nb(pipex_t *pipex, char *string){
-    if(io_line_ready(pipex->io)){
-        return pipex_readln(pipex,string);
-    }else{  
-        string[0]='\0';
-        return FALSE;
-    }
+
+    while(!pipex->io->in_eof && !io_line_ready(pipex->io) && io_peek(pipex->io)){
+      io_get_update(pipex->io);
+  }
+  
+  if(io_line_ready(pipex->io)){
+    return pipex_readln(pipex,string);
+  }else if(pipex->io->in_eof){
+    string[0]='\0';
+    pipex->state|=PIPEX_EOF;
+    return FALSE;
+  }else {  
+    string[0]='\0';
+    return FALSE;
+  }
 }
 
 // pipex_write()