Unix bux fixes

diff --git a/variable.c b/variable.c
index 6900cb01ec49e4b2bee97925bd49aeac9728e9ba..4ee60ef956041dff50ff45824f622e99c6babf3a 100644 (file)
--- a/variable.c
+++ b/variable.c
@@ -332,9 +332,11 @@ static char *func_shell (const char *filename, unsigned long line_no, char *inpu
     
     }
     
+    input = skip_whitespace (input);
+    
     if (pid == 0) {
     
-        char *name = skip_whitespace (input), *space, *slash;
+        char *name = input, *space = 0, *slash;
         
         if ((space = strchr (name, ' '))) {
             name = xstrndup (name, space - name);
@@ -345,7 +347,7 @@ static char *func_shell (const char *filename, unsigned long line_no, char *inpu
         close (pipefd[0]);
         close (pipefd[1]);
         
-        execl (name, (slash = strrchr (name, '/')) ? (slash + 1) : name, skip_whitespace (space), NULL);
+        execlp (name, (slash = strrchr (name, '/')) ? (slash + 1) : name, space ? skip_whitespace (space) : NULL, NULL);
         
         fprintf (stderr, "%s: %s:%lu: %s: %s\n", program_name, filename, line_no, name, strerror (errno));
         exit (EXIT_FAILURE);
@@ -398,7 +400,9 @@ static char *func_shell (const char *filename, unsigned long line_no, char *inpu
     
     if (status) {
     
-        fprintf (stderr, "%s\n", lbuf.start);
+        char *p = (lbuf.start = skip_whitespace (lbuf.start));
+        if (*p != '\0') { fprintf (stderr, "%s\n", p); }
+        
         exit (EXIT_FAILURE);
     
     }

diff --git a/xmake.c b/xmake.c
index 7481b44ce64c5d6ed3e902063ff65a2a893a722f..300da5a6e159fb63ba8d37a47c2dca3cace6c846 100644 (file)
--- a/xmake.c
+++ b/xmake.c
@@ -208,6 +208,9 @@ static void pipe_command (const char *filename, unsigned long line_no, char *inp
 
     int pipefd[2], pid, status;
     
+    struct linebuf lbuf;
+    FILE *cmd_output;
+    
     if (pipe (pipefd) < 0) {
     
         perror ("pipe");
@@ -222,21 +225,63 @@ static void pipe_command (const char *filename, unsigned long line_no, char *inp
     
     }
     
+    input = skip_whitespace (input);
+    
     if (pid == 0) {
     
-        char *name = skip_whitespace (input), *space, *slash;
+        char *name = input, *space = 0, *slash;
         
         if ((space = strchr (name, ' '))) {
             name = xstrndup (name, space - name);
         }
         
-        execl (name, (slash = strrchr (name, '/')) ? (slash + 1) : name, skip_whitespace (space), NULL);
+        dup2 (pipefd[1], STDOUT_FILENO);
+        
+        close (pipefd[0]);
+        close (pipefd[1]);
         
-        fprintf (stderr, "%s: %s:%lu: %s: %s\n", program_name, filename, line_no, name, strerror (errno));
+        execlp (name, (slash = strrchr (name, '/')) ? (slash + 1) : name, space ? skip_whitespace (space) : NULL, NULL);
         exit (EXIT_FAILURE);
     
     }
     
+    close (pipefd[1]);
+    
+    if (!(cmd_output = fdopen (pipefd[0], "r"))) {
+    
+        perror ("fdopen");
+        exit (EXIT_FAILURE);
+    
+    }
+    
+    lbuf.start = xmalloc (lbuf.size = 256);
+    
+    {
+    
+        char *end = lbuf.start + lbuf.size;
+        char *p = lbuf.start;
+        
+        while (fgets (p, end - p, cmd_output)) {
+        
+            size_t offset;
+            p += strlen (p);
+            
+            offset = p - lbuf.start;
+            
+            if (end - p >= 80) {
+                continue;
+            }
+            
+            lbuf.size *= 2;
+            lbuf.start = xrealloc (lbuf.start, lbuf.size);
+            
+            p = lbuf.start + offset;
+            end = lbuf.start + lbuf.size;
+        
+        }
+    
+    }
+    
     if (waitpid (pid, &status, 0) == -1) {
     
         perror ("waitpid");