X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=common-src%2Fpipespawn.c;fp=common-src%2Fpipespawn.c;h=d960c97803a089b4bbceea7d4cb4f3f3ed5ff7f6;hb=1194fb66aa28d9929c3f2bef3cc6c1c3f40a60a4;hp=8a8af5518f6b2a3cfe136cb002a1580288f48644;hpb=2df780bff19c457b0debb7adc29972a0bc2a5dc2;p=debian%2Famanda

diff --git a/common-src/pipespawn.c b/common-src/pipespawn.c
index 8a8af55..d960c97 100644
--- a/common-src/pipespawn.c
+++ b/common-src/pipespawn.c
@@ -5,6 +5,10 @@
 
 char skip_argument[1];
 
+/*
+ * this used to be a function in it's own write but became a wrapper around
+ * pipespawnv to eliminate redundancy...
+ */
 #ifdef STDC_HEADERS
 int pipespawn(char *prog, int pipedef, int *stdinfd, int *stdoutfd,
 	      int *stderrfd, ...)
@@ -17,165 +21,31 @@ va_dcl
 #endif
 {
     va_list ap;
-    int argc;
+    int argc = 0, pid, i;
     char **argv;
-    int pid, i, inpipe[2], outpipe[2], errpipe[2], passwdpipe[2];
-    char *passwdvar = NULL;
-    int *passwdfd = NULL;
-    char number[NUM_STR_SIZE];
-    char *arg;
-    char *e;
-    int ch;
-    char **env;
-    char **newenv;
 
-    /*
-     * Log the command line and count the args.
-     */
-    dbprintf(("%s: spawning %s in pipeline\n", debug_prefix_time(NULL), prog));
-    dbprintf(("%s: argument list:", debug_prefix(NULL)));
+    /* count args */
     arglist_start(ap, stderrfd);
-    if ((pipedef & PASSWD_PIPE) != 0) {
-	passwdvar = arglist_val(ap, char *);
-	passwdfd = arglist_val(ap, int *);
-    }
-    argc = 0;
-    while((arg = arglist_val(ap, char *)) != NULL) {
-	if (arg == skip_argument) {
-	    continue;
-	}
+    while(arglist_val(ap, char *) != NULL) {
 	argc++;
-	dbprintf((" "));
-	for(i = 0; (ch = arg[i]) != '\0' && isprint(ch) && ch != ' '; i++) {}
-	if(ch != '\0' || i == 0) {
-	    dbprintf(("\""));
-	}
-	dbprintf(("%s", arg));
-	if(ch != '\0' || i == 0) {
-	    dbprintf(("\""));
-	}
     }
     arglist_end(ap);
-    dbprintf(("\n"));
 
     /*
-     * Create the pipes
+     * Create the argument vector.
      */
-    if ((pipedef & STDIN_PIPE) != 0) {
-	if(pipe(inpipe) == -1) {
-	    error("error [open pipe to %s: %s]", prog, strerror(errno));
-	}
-    }
-    if ((pipedef & STDOUT_PIPE) != 0) {
-	if(pipe(outpipe) == -1) {
-	    error("error [open pipe to %s: %s]", prog, strerror(errno));
-	}
-    }
-    if ((pipedef & STDERR_PIPE) != 0) {
-	if(pipe(errpipe) == -1) {
-	    error("error [open pipe to %s: %s]", prog, strerror(errno));
-	}
-    }
-    if ((pipedef & PASSWD_PIPE) != 0) {
-	if(pipe(passwdpipe) == -1) {
-	    error("error [open pipe to %s: %s]", prog, strerror(errno));
-	}
+    arglist_start(ap, stderrfd);
+    argv = (char **)alloc((argc + 1) * sizeof(*argv));
+    i = 0;
+    while((argv[i] = arglist_val(ap, char *)) != NULL) {
+        if (argv[i] != skip_argument) {
+	    i++;
+        }
     }
+    arglist_end(ap);
 
-    /*
-     * Fork and set up the return or run the program.
-     */
-    switch(pid = fork()) {
-    case -1:
-	e = strerror(errno);
-	error("error [fork %s: %s]", prog, e);
-    default:	/* parent process */
-	if ((pipedef & STDIN_PIPE) != 0) {
-	    aclose(inpipe[0]);		/* close input side of pipe */
-	    *stdinfd = inpipe[1];
-	}
-	if ((pipedef & STDOUT_PIPE) != 0) {
-	    aclose(outpipe[1]);		/* close output side of pipe */
-	    *stdoutfd = outpipe[0];
-	}
-	if ((pipedef & STDERR_PIPE) != 0) {
-	    aclose(errpipe[1]);		/* close output side of pipe */
-	    *stderrfd = errpipe[0];
-	}
-	if ((pipedef & PASSWD_PIPE) != 0) {
-	    aclose(passwdpipe[0]);	/* close input side of pipe */
-	    *passwdfd = passwdpipe[1];
-	}
-	break;
-    case 0:		/* child process */
-	if ((pipedef & STDIN_PIPE) != 0) {
-	    aclose(inpipe[1]);		/* close output side of pipe */
-	} else {
-	    inpipe[0] = *stdinfd;
-	}
-	if ((pipedef & STDOUT_PIPE) != 0) {
-	    aclose(outpipe[0]);		/* close input side of pipe */
-	} else {
-	    outpipe[1] = *stdoutfd;
-	}
-	if ((pipedef & STDERR_PIPE) != 0) {
-	    aclose(errpipe[0]);		/* close input side of pipe */
-	} else {
-	    errpipe[1] = *stderrfd;
-	}
-	if ((pipedef & PASSWD_PIPE) != 0) {
-	    aclose(passwdpipe[1]);	/* close output side of pipe */
-	}
-
-	/*
-	 * Shift the pipes to the standard file descriptors as requested.
-	 */
-	if(dup2(inpipe[0], 0) == -1) {
-	    error("error [spawn %s: dup2 in: %s]", prog, strerror(errno));
-	}
-	if(dup2(outpipe[1], 1) == -1) {
-	    error("error [spawn %s: dup2 out: %s]", prog, strerror(errno));
-	}
-	if(dup2(errpipe[1], 2) == -1) {
-	    error("error [spawn %s: dup2 err: %s]", prog, strerror(errno));
-	}
-
-	/*
-	 * Create the argument vector.
-	 */
-	arglist_start(ap, stderrfd);
-	if ((pipedef & PASSWD_PIPE) != 0) {
-	    passwdvar = arglist_val(ap, char *);
-	    passwdfd = arglist_val(ap, int *);
-	}
-	argv = (char **)alloc((argc + 1) * sizeof(*argv));
-	i = 0;
-	while((argv[i] = arglist_val(ap, char *)) != NULL) {
-	    if (argv[i] != skip_argument) {
-		i++;
-	    }
-	}
-	arglist_end(ap);
-
-	/*
-	 * Get the "safe" environment.  If we are sending a password to
-	 * the child via a pipe, add the environment variable for that.
-	 */
-	env = safe_env();
-	if ((pipedef & PASSWD_PIPE) != 0) {
-	    for(i = 0; env[i] != NULL; i++) {}
-	    newenv = (char **)alloc((i + 1 + 1) * sizeof(*newenv));
-	    ap_snprintf(number, sizeof(number), "%d", passwdpipe[0]);
-	    newenv[0] = vstralloc(passwdvar, "=", number, NULL);
-	    for(i = 0; (newenv[i + 1] = env[i]) != NULL; i++) {}
-	    env = newenv;
-	}
-
-	execve(prog, argv, env);
-	e = strerror(errno);
-	error("error [exec %s: %s]", prog, e);
-	/* NOTREACHED */
-    }
+    pid = pipespawnv_passwd(prog, pipedef, stdinfd, stdoutfd, stderrfd, NULL, NULL, argv);
+    amfree(argv);
     return pid;
 }
 
@@ -184,11 +54,21 @@ char *prog;
 int pipedef;
 int *stdinfd, *stdoutfd, *stderrfd;
 char **my_argv;
+{
+    return pipespawnv_passwd(prog, pipedef, stdinfd, stdoutfd, stderrfd,
+	NULL, NULL, my_argv);
+}
+
+int pipespawnv_passwd(prog, pipedef, stdinfd, stdoutfd, stderrfd, passwdvar, passwdfd, my_argv)
+char *prog;
+int pipedef;
+int *stdinfd, *stdoutfd, *stderrfd;
+char *passwdvar;
+int *passwdfd;
+char **my_argv;
 {
     int argc;
     int pid, i, inpipe[2], outpipe[2], errpipe[2], passwdpipe[2];
-    char *passwdvar = NULL;
-    int *passwdfd = NULL;
     char number[NUM_STR_SIZE];
     char **arg;
     char *e;
@@ -288,6 +168,9 @@ char **my_argv;
 	} else {
 	    errpipe[1] = *stderrfd;
 	}
+        if ((pipedef & PASSWD_PIPE) != 0) { 
+            aclose(passwdpipe[1]);      /* close output side of pipe */
+        }
 
 	/*
 	 * Shift the pipes to the standard file descriptors as requested.
@@ -310,9 +193,10 @@ char **my_argv;
 	if ((pipedef & PASSWD_PIPE) != 0) {
 	    for(i = 0; env[i] != NULL; i++) {}
 	    newenv = (char **)alloc((i + 1 + 1) * sizeof(*newenv));
-	    ap_snprintf(number, sizeof(number), "%d", passwdpipe[0]);
+	    snprintf(number, sizeof(number), "%d", passwdpipe[0]);
 	    newenv[0] = vstralloc(passwdvar, "=", number, NULL);
 	    for(i = 0; (newenv[i + 1] = env[i]) != NULL; i++) {}
+	    amfree(env);
 	    env = newenv;
 	}