X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Frun-program.c;h=d1d98e63503ed0057ab3c3a9e79cad0c66818803;hb=922fe0d6da0e4bdcd366f5101395670aabd14e62;hp=241db7ff8ad370328858114ddda2554201a10a85;hpb=d68f3f83e6c5b9bed9789279cbae346f240488cc;p=sbcl.git diff --git a/src/runtime/run-program.c b/src/runtime/run-program.c index 241db7f..d1d98e6 100644 --- a/src/runtime/run-program.c +++ b/src/runtime/run-program.c @@ -13,15 +13,18 @@ * files for more information. */ +#include "sbcl.h" + +#ifndef LISP_FEATURE_WIN32 + #include #include #include +#include #include #include #include -#if defined(SVR4) || defined(__linux__) #include -#endif #include #include @@ -31,85 +34,191 @@ * example code found at * http://www.yendor.com/programming/unix/apue/pty/main.c --brkint +-brkint */ -int set_noecho(int fd) +int set_noecho(int fd) { struct termios stermios; - + if (tcgetattr(fd, &stermios) < 0) return 0; - + stermios.c_lflag &= ~( ECHO | /* ECHOE | ECHOK | */ ECHONL); - stermios.c_oflag |= (ONLCR); + stermios.c_oflag |= (ONLCR); stermios.c_iflag &= ~(BRKINT); - stermios.c_iflag |= (ICANON|ICRNL); + stermios.c_iflag |= (ICANON|ICRNL); stermios.c_cc[VERASE]=0177; if (tcsetattr(fd, TCSANOW, &stermios) < 0) return 0; return 1; } -int spawn(char *program, char *argv[], char *envp[], char *pty_name, - int stdin, int stdout, int stderr) +extern char **environ; +int spawn(char *program, char *argv[], int sin, int sout, int serr, + int search, char *envp[], char *pty_name, int wait) { int pid = fork(); int fd; + sigset_t sset; if (pid != 0) - return pid; - - /* Put us in our own process group. */ -#if defined(hpux) - setsid(); -#elif defined(SVR4) || defined(__linux__) - setpgrp(); + return pid; + + /* Put us in our own process group, but only if we need not + * share stdin with our parent. In the latter case we claim + * control of the terminal. */ + if (sin >= 0) { +#if defined(LISP_FEATURE_HPUX) + setsid(); +#elif defined(LISP_FEATURE_DARWIN) + setpgid(0, getpid()); +#elif defined(SVR4) || defined(__linux__) || defined(__osf__) + setpgrp(); #else - setpgrp(0, getpid()); + setpgrp(0, getpid()); #endif + } else { + tcsetpgrp(0, getpgrp()); + } + + /* unblock signals */ + sigemptyset(&sset); + sigprocmask(SIG_SETMASK, &sset, NULL); /* If we are supposed to be part of some other pty, go for it. */ if (pty_name) { -#if !defined(hpux) && !defined(SVR4) - fd = open("/dev/tty", O_RDWR, 0); - if (fd >= 0) { - ioctl(fd, TIOCNOTTY, 0); - close(fd); - } +#if !defined(LISP_FEATURE_HPUX) && !defined(SVR4) + fd = open("/dev/tty", O_RDWR, 0); + if (fd >= 0) { + ioctl(fd, TIOCNOTTY, 0); + close(fd); + } #endif - fd = open(pty_name, O_RDWR, 0); - dup2(fd, 0); - set_noecho(0); - dup2(fd, 1); - dup2(fd, 2); - close(fd); + fd = open(pty_name, O_RDWR, 0); + dup2(fd, 0); + set_noecho(0); + dup2(fd, 1); + dup2(fd, 2); + close(fd); } else{ /* Set up stdin, stdout, and stderr */ - if (stdin >= 0) - dup2(stdin, 0); - if (stdout >= 0) - dup2(stdout, 1); - if (stderr >= 0) - dup2(stderr, 2); + if (sin >= 0) + dup2(sin, 0); + if (sout >= 0) + dup2(sout, 1); + if (serr >= 0) + dup2(serr, 2); } /* Close all other fds. */ #ifdef SVR4 for (fd = sysconf(_SC_OPEN_MAX)-1; fd >= 3; fd--) - close(fd); + close(fd); #else for (fd = getdtablesize()-1; fd >= 3; fd--) - close(fd); + close(fd); #endif + environ = envp; /* Exec the program. */ - execve(program, argv, envp); + if (search) + execvp(program, argv); + else + execv(program, argv); - /* It didn't work, so try /bin/sh. */ - argv[0] = program; - argv[-1] = "sh"; - execve("/bin/sh", argv-1, envp); + exit (1); +} +#else /* !LISP_FEATURE_WIN32 */ + +# include +# include +# include +# include +# include +# include + +#define READ_HANDLE 0 +#define WRITE_HANDLE 1 + +/* These functions do not attempt to deal with wchar_t variations. */ - /* The exec didn't work, flame out. */ - exit(1); +/* 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 search, + char *envp, + char *ptyname, + 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*/ + if (search) + hProcess = (HANDLE) spawnvp ( wait_mode, program, argv ); + else + hProcess = (HANDLE) spawnv ( 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 */