spawn: implement spawn_and_give_stdout()

diff --git a/src/spawn.c b/src/spawn.c
index a6748ea388b9f8ae80f9573902b8ca812bba762b..fef83ef10e32abe0b7a7562d074184fd5c905b4e 100644 (file)
--- a/src/spawn.c
+++ b/src/spawn.c
@@ -233,9 +233,6 @@ spawn_enq(const char *name, int pid)
   return s;
 }
 
-
-
-
 /**
  * Execute the given program and return its output in a malloc()ed buffer
  * 
@@ -310,6 +307,77 @@ spawn_and_store_stdout(const char *prog, char *argv[], char **outp)
   return file_readall(fd[0], outp);
 }
 
+/**
+ * Execute the given program and return its standard output as file-descriptor (pipe).
+ */
+
+int
+spawn_and_give_stdout(const char *prog, char *argv[], int *rd, int redir_stderr)
+{
+  pid_t p;
+  int fd[2], f;
+  char bin[256];
+  const char *local_argv[2] = { NULL, NULL };
+
+  if (*prog != '/' && *prog != '.') {
+    if (!find_exec(prog, bin, sizeof(bin))) return -1;
+    prog = bin;
+  }
+
+  if(!argv) argv = (void *)local_argv;
+  if (!argv[0]) argv[0] = (char*)prog;
+
+  pthread_mutex_lock(&fork_lock);
+
+  if(pipe(fd) == -1) {
+    pthread_mutex_unlock(&fork_lock);
+    return -1;
+  }
+
+  p = fork();
+
+  if(p == -1) {
+    pthread_mutex_unlock(&fork_lock);
+    tvherror("spawn", "Unable to fork() for \"%s\" -- %s",
+             prog, strerror(errno));
+    return -1;
+  }
+
+  if(p == 0) {
+    close(0);
+    close(2);
+    close(fd[0]);
+    dup2(fd[1], 1);
+    close(fd[1]);
+
+    f = open("/dev/null", O_RDWR);
+    if(f == -1) {
+      spawn_error("pid %d cannot open /dev/null for redirect %s -- %s",
+                  getpid(), prog, strerror(errno));
+      exit(1);
+    }
+
+    dup2(f, 0);
+    dup2(redir_stderr ? spawn_pipe_error.wr : f, 2);
+    close(f);
+
+    spawn_info("Executing \"%s\"\n", prog);
+
+    execve(prog, argv, environ);
+    spawn_error("pid %d cannot execute %s -- %s\n",
+                getpid(), prog, strerror(errno));
+    exit(1);
+  }
+
+  pthread_mutex_unlock(&fork_lock);
+
+  spawn_enq(prog, p);
+
+  close(fd[1]);
+
+  *rd = fd[0];
+  return 0;
+}
 
 /**
  * Execute the given program with arguments

diff --git a/src/spawn.h b/src/spawn.h
index 36ae3226ca39b3c496417ed81d16c3d11b273ad0..b81a1151d7cbd67b599f1e80f32de29d432a4b98 100644 (file)
--- a/src/spawn.h
+++ b/src/spawn.h
@@ -27,6 +27,8 @@ int find_exec ( const char *name, char *out, size_t len );
 
 int spawn_and_store_stdout(const char *prog, char *argv[], char **outp);
 
+int spawn_and_give_stdout(const char *prog, char *argv[], int *rd, int redir_stderr);
+
 int spawnv(const char *prog, char *argv[]);
 
 int spawn_reap(char *stxt, size_t stxtlen);