projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.9.4.23:
[sbcl.git]
/
src
/
runtime
/
run-program.c
diff --git
a/src/runtime/run-program.c
b/src/runtime/run-program.c
index
5e3bd8f
..
64e4797
100644
(file)
--- a/
src/runtime/run-program.c
+++ b/
src/runtime/run-program.c
@@
-16,6
+16,7
@@
#include <stdlib.h>
#include <sys/file.h>
#include <sys/types.h>
#include <stdlib.h>
#include <sys/file.h>
#include <sys/types.h>
+#include <signal.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/ioctl.h>
@@
-29,20
+30,20
@@
* example code found at
* http://www.yendor.com/programming/unix/apue/pty/main.c
* 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;
{
struct termios stermios;
-
+
if (tcgetattr(fd, &stermios) < 0) return 0;
if (tcgetattr(fd, &stermios) < 0) return 0;
-
+
stermios.c_lflag &= ~( ECHO | /* ECHOE | ECHOK | */ ECHONL);
stermios.c_lflag &= ~( ECHO | /* ECHOE | ECHOK | */ ECHONL);
- stermios.c_oflag |= (ONLCR);
+ stermios.c_oflag |= (ONLCR);
stermios.c_iflag &= ~(BRKINT);
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;
stermios.c_cc[VERASE]=0177;
if (tcsetattr(fd, TCSANOW, &stermios) < 0) return 0;
@@
-50,54
+51,59
@@
int set_noecho(int fd)
}
int spawn(char *program, char *argv[], char *envp[], char *pty_name,
}
int spawn(char *program, char *argv[], char *envp[], char *pty_name,
- int stdin, int stdout, int stderr)
+ int stdin, int stdout, int stderr)
{
int pid = fork();
int fd;
{
int pid = fork();
int fd;
+ sigset_t sset;
if (pid != 0)
if (pid != 0)
- return pid;
+ return pid;
/* Put us in our own process group. */
#if defined(hpux)
setsid();
/* Put us in our own process group. */
#if defined(hpux)
setsid();
-#elif defined(SVR4) || defined(__linux__)
+#elif defined(SVR4) || defined(__linux__) || defined(__osf__)
setpgrp();
#else
setpgrp(0, getpid());
#endif
setpgrp();
#else
setpgrp(0, getpid());
#endif
+ /* 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)
/* 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);
- }
+ fd = open("/dev/tty", O_RDWR, 0);
+ if (fd >= 0) {
+ ioctl(fd, TIOCNOTTY, 0);
+ close(fd);
+ }
#endif
#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)
} else{
/* Set up stdin, stdout, and stderr */
if (stdin >= 0)
- dup2(stdin, 0);
+ dup2(stdin, 0);
if (stdout >= 0)
if (stdout >= 0)
- dup2(stdout, 1);
+ dup2(stdout, 1);
if (stderr >= 0)
if (stderr >= 0)
- dup2(stderr, 2);
+ dup2(stderr, 2);
}
/* Close all other fds. */
#ifdef SVR4
for (fd = sysconf(_SC_OPEN_MAX)-1; fd >= 3; fd--)
}
/* 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--)
#else
for (fd = getdtablesize()-1; fd >= 3; fd--)
- close(fd);
+ close(fd);
#endif
/* Exec the program. */
#endif
/* Exec the program. */