X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Frun-program.c;h=61ad7617bd871f974c4a846654d21d79e85d19d4;hb=2cb068e245e00505076e9c325424df2a1260bfb1;hp=76f39b9015649bd792d373573c68fafd79a72f90;hpb=568daf6b160280428701670b921f419aabd9eba0;p=sbcl.git

diff --git a/src/runtime/run-program.c b/src/runtime/run-program.c
index 76f39b9..61ad761 100644
--- a/src/runtime/run-program.c
+++ b/src/runtime/run-program.c
@@ -150,30 +150,32 @@ HANDLE spawn (
     int wait
     )
 {
-    int fdOut, fdIn, fdErr, fdInPipe[2], fdOutPipe[2], fdErrPipe[2], wait_mode;
+    int stdout_backup, stdin_backup, stderr_backup, wait_mode;
     HANDLE hProcess;
-
-    /* Make pipes to be passed to the spawned process as in/out/err */
-    if ( _pipe ( fdOutPipe, 512, O_TEXT | O_NOINHERIT ) == -1 ) return (HANDLE)-1;
-    if ( _pipe ( fdInPipe,  512, O_TEXT | O_NOINHERIT ) == -1 ) return (HANDLE)-1;
-    if ( _pipe ( fdErrPipe, 512, O_TEXT | O_NOINHERIT ) == -1 ) return (HANDLE)-1;
-
-    /* Duplicate and save original in/out/err handles */
-    fdOut = _dup ( out );
-    fdIn  = _dup ( in );
-    fdErr = _dup ( err );
-
-    /* Duplicate write end of new pipes to current out/err handles,
-     * read to in */
-    if ( _dup2 ( fdOutPipe[WRITE_HANDLE], out ) != 0 ) return (HANDLE)-1;
-    if ( _dup2 ( fdInPipe[READ_HANDLE],   in  ) != 0 ) return (HANDLE)-1;
-    if ( _dup2 ( fdErrPipe[WRITE_HANDLE], err ) != 0 ) return (HANDLE)-1;
-
-
-    /* Close the duplicated handles to the new pipes */
-    close ( fdOutPipe[WRITE_HANDLE] );
-    close ( fdInPipe[READ_HANDLE] );
-    close ( fdErrPipe[WRITE_HANDLE] );
+    HANDLE hReturn;
+
+    /* Duplicate and save the original stdin/out/err handles. */
+    stdout_backup = _dup (  _fileno ( stdout ) );
+    stdin_backup  = _dup (  _fileno ( stdin  ) );
+    stderr_backup = _dup (  _fileno ( stderr ) );
+
+    /* If we are not using stdin/out/err
+     * then duplicate the new pipes to current stdin/out/err handles.
+     *
+     * Default std fds are used if in, out or err parameters
+     * are -1. */
+
+    hReturn = (HANDLE)-1;
+    hProcess = (HANDLE)-1;
+    if ( ( out >= 0 ) && ( out != _fileno ( stdout ) ) ) {
+        if ( _dup2 ( out, _fileno ( stdout ) ) != 0 ) goto error_exit;
+    }
+    if ( ( in >= 0 ) && ( in != _fileno ( stdin ) ) ) {
+        if ( _dup2 ( in,  _fileno ( stdin )  ) != 0 ) goto error_exit_out;
+    }
+    if ( ( err >= 0 ) && ( err != _fileno ( stderr ) ) ) {
+        if ( _dup2 ( err, _fileno ( stderr ) ) != 0 ) goto error_exit_in;
+    }
 
     /* Set the wait mode. */
     if ( 0 == wait ) {
@@ -186,17 +188,23 @@ HANDLE spawn (
     hProcess = (HANDLE) spawnvp ( wait_mode, program, argv );
 
     /* Now that the process is launched, replace the original
-     * in/out/err handles */
-    if ( _dup2 ( fdOut, out ) != 0 ) return (HANDLE)-1;
-    if ( _dup2 ( fdIn,  in )  != 0 ) return (HANDLE)-1;
-    if ( _dup2 ( fdErr, err ) != 0 ) return (HANDLE)-1;
+     * in/out/err handles and close the backups. */
+
+    if ( _dup2 ( stderr_backup, _fileno ( stderr ) ) != 0 ) goto error_exit;
+ error_exit_in:
+    if ( _dup2 ( stdin_backup,  _fileno ( stdin )  ) != 0 ) goto error_exit;
+ error_exit_out:
+    if ( _dup2 ( stdout_backup, _fileno ( stdout ) ) != 0 ) goto error_exit;
+
+    hReturn = hProcess;
+
+ error_exit:
+    close ( stdout_backup );
+    close ( stdin_backup  );
+    close ( stderr_backup );
 
-    /* Close duplicates */
-    close(fdOut);
-    close(fdIn);
-    close(fdErr);
+    return hReturn;
 
-    return ( hProcess );
 }