X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Frun-program.c;h=08feaa19322622b3ef35c9220ab0a70567a5b351;hb=7137cb0872e17772f26c432384da5eefa3e645d7;hp=64e4797245aed1bc68fa33de348e3a6f5a03ea1f;hpb=d2054d96f0c8200decf8b6b8560d754d3c541cd7;p=sbcl.git

diff --git a/src/runtime/run-program.c b/src/runtime/run-program.c
index 64e4797..08feaa1 100644
--- a/src/runtime/run-program.c
+++ b/src/runtime/run-program.c
@@ -13,6 +13,10 @@
  * files for more information.
  */
 
+#include "sbcl.h"
+
+#ifndef LISP_FEATURE_WIN32
+
 #include <stdlib.h>
 #include <sys/file.h>
 #include <sys/types.h>
@@ -63,6 +67,8 @@ int spawn(char *program, char *argv[], char *envp[], char *pty_name,
     /* Put us in our own process group. */
 #if defined(hpux)
     setsid();
+#elif defined(LISP_FEATURE_DARWIN)
+    setpgid(0, getpid());
 #elif defined(SVR4) || defined(__linux__) || defined(__osf__)
     setpgrp();
 #else
@@ -117,3 +123,91 @@ int spawn(char *program, char *argv[], char *envp[], char *pty_name,
     /* The exec didn't work, flame out. */
     exit(1);
 }
+#else  /* !LISP_FEATURE_WIN32 */
+
+#  include <windows.h>
+#  include <process.h>
+#  include <stdio.h>
+#  include <stdlib.h>
+#  include <fcntl.h>
+#  include <io.h>
+
+#define   READ_HANDLE  0
+#define   WRITE_HANDLE 1
+
+/* These functions do not attempt to deal with wchar_t variations. */
+
+/* Get the value of _environ maintained by MSVCRT */
+char **msvcrt_environ ( void ) {
+    return ( _environ );
+}
+
+/* Set up in, out, err pipes and spawn a program, waiting or otherwise. */
+HANDLE spawn (
+    const char *program,
+    const char *const *argv,
+    int in,
+    int out,
+    int err,
+    int wait
+    )
+{
+    int stdout_backup, stdin_backup, stderr_backup, wait_mode;
+    HANDLE hProcess;
+    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 ) {
+        wait_mode = P_NOWAIT;
+    } else {
+        wait_mode = P_WAIT;
+    }
+
+    /* Spawn process given on the command line*/
+    hProcess = (HANDLE) spawnvp ( wait_mode, program, argv );
+
+    /* Now that the process is launched, replace the original
+     * 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 );
+
+    return hReturn;
+
+}
+
+
+#endif /* !LISP_FEATURE_WIN32 */