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

diff --git a/pipex_posix.c b/pipex_posix.c
index 5d2edfa..737f9ce 100644
--- a/pipex_posix.c
+++ b/pipex_posix.c
@@ -4,6 +4,8 @@
 
 #include <string.h>
 #include <errno.h>
+#include <wordexp.h>
+#include <sys/wait.h>
 #include "pipex.h"
 
 // constants
@@ -19,15 +21,22 @@ static void my_dup2(int old_fd, int new_fd) ;
 
 // pipex_open()
 
-void pipex_open(pipex_t *pipex, const char *name, const char *command){
+void pipex_open(pipex_t *pipex,
+                const char *name,
+                const char *working_dir,
+                const char *command){
     char string[StringSize];
     int argc;
     char * ptr;
     char * argv[256];
     int from_child[2], to_child[2];
+    wordexp_t p;
+    int i,ret;
 
     pipex->pid=-1;
     pipex->io->name=name;
+    pipex->quit_pending=FALSE;
+    pipex->command=command;
     
     if(command==NULL){
         pipex->io->in_fd = STDIN_FILENO;
@@ -40,7 +49,7 @@ void pipex_open(pipex_t *pipex, const char *name, const char *command){
     }else{
     
         // parse the command line and create the argument list
-    
+#if 0    
         if (strlen(command) >= StringSize) my_fatal("pipex_open(): buffer overflow\n");
         strcpy(string,command);
         argc = 0;
@@ -50,7 +59,27 @@ void pipex_open(pipex_t *pipex, const char *name, const char *command){
         }
 
         argv[argc] = NULL;
-        
+#else
+	//printf("command=[%s]\n",command);
+	//Buffer overflow alert
+	ret=wordexp(command, &p, 0);
+	if(ret!=0){
+	  my_fatal("pipex_open(): %s: Unable to parse command.\n",command);
+	}
+	argc = p.we_wordc;
+	if(argc>=256-2){
+	  my_fatal("pipex_open(): %s: Too many arguments.\n",command);
+	}
+	for(i=0;i<argc;i++){
+	  argv[i] = p.we_wordv[i];
+	}
+	//	int i;
+	//for(i=0;i<argc;i++){
+	//  printf("[%s]",argv[i]);
+	//}
+	//printf("\n");
+	argv[argc] = NULL;
+#endif        
       // create the pipes
         
         if (pipe(from_child) == -1) {
@@ -93,13 +122,18 @@ void pipex_open(pipex_t *pipex, const char *name, const char *command){
             
            /* my_dup2(STDOUT_FILENO,STDERR_FILENO); */
             
-                // launch the new executable file
+            if(chdir(working_dir)){
+                my_fatal("pipex_open(): cannot change directory: %s\n",
+                         strerror(errno));
+            }
             
+            // launch the new executable file
+
             execvp(argv[0],&argv[0]);
             
                 // execvp() only returns when an error has occured
             
-            my_fatal("engine_open(): execvp(): %s\n",strerror(errno));
+            my_fatal("engine_open(): execvp(): %s: %s\n",argv[0],strerror(errno));
             
         } else { // pid > 0
             
@@ -195,7 +229,26 @@ void pipex_send_eof(pipex_t *pipex){
 // pipex_exit()
 
 void pipex_exit(pipex_t *pipex){
-        // NOOP for now
+    int status;
+    my_log("POLYGLOT Waiting for child process to exit.\n");
+    waitpid(pipex->pid,&status,0);
+    if(WIFEXITED(status)){
+      if(pipex->quit_pending){
+	my_log("POLYGLOT Child exited with status %d.\n",WEXITSTATUS(status));
+      }else{
+	// Suppress further messages.
+	pipex->quit_pending=TRUE;
+	my_fatal("pipex_exit(): %s: child exited with status %d.\n",pipex->command,WEXITSTATUS(status));
+      }
+    }else if(WIFSIGNALED(status)){
+      if(pipex->quit_pending){
+	my_log("POLYGLOT pipex_exit(): %s: child terminated with signal %d.\n",pipex->command,WTERMSIG(status));
+      }else{
+	// Suppress further messages.
+	pipex->quit_pending=TRUE;
+	  my_fatal("pipex_exit(): %s: child terminated with signal %d.\n",pipex->command,WTERMSIG(status));
+      }
+    }
     return;
 }
 
@@ -226,6 +279,13 @@ bool pipex_readln_nb(pipex_t *pipex, char *string){
     }
 }
 
+// pipex_write()
+
+void pipex_write(pipex_t *pipex, const char *string){
+       io_send_queue(pipex->io,"%s",string);
+}
+
+
 // pipex_writeln()
 
 void pipex_writeln(pipex_t *pipex, const char *string){