X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Frun-program.c;h=241db7ff8ad370328858114ddda2554201a10a85;hb=2495095104de841f12a17aeb94207055f75ed897;hp=a4bfbf1f457b6fe3b40e1a915aa5a8afa32565c2;hpb=d4aacd80215d0376af6f866a922854f83797ff59;p=sbcl.git diff --git a/src/runtime/run-program.c b/src/runtime/run-program.c index a4bfbf1..241db7f 100644 --- a/src/runtime/run-program.c +++ b/src/runtime/run-program.c @@ -13,17 +13,44 @@ * files for more information. */ -/* - * $Header$ - */ - +#include #include -#include +#include +#include +#include #include -#ifdef SVR4 +#if defined(SVR4) || defined(__linux__) #include #endif +#include +#include + + +/* borrowed from detachtty's detachtty.c, in turn borrowed from APUE + * example code found at + * http://www.yendor.com/programming/unix/apue/pty/main.c + +-brkint + + */ + +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_iflag &= ~(BRKINT); + 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) { @@ -36,7 +63,7 @@ int spawn(char *program, char *argv[], char *envp[], char *pty_name, /* Put us in our own process group. */ #if defined(hpux) setsid(); -#elif defined(SVR4) +#elif defined(SVR4) || defined(__linux__) setpgrp(); #else setpgrp(0, getpid()); @@ -51,14 +78,13 @@ int spawn(char *program, char *argv[], char *envp[], char *pty_name, close(fd); } #endif - 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); @@ -66,7 +92,7 @@ int spawn(char *program, char *argv[], char *envp[], char *pty_name, dup2(stdout, 1); if (stderr >= 0) dup2(stderr, 2); - + } /* Close all other fds. */ #ifdef SVR4 for (fd = sysconf(_SC_OPEN_MAX)-1; fd >= 3; fd--)