#include <fcntl.h>
#include <sys/ioctl.h>
#include <unistd.h>
-
+#include <sys/wait.h>
#include <sys/ioctl.h>
#include <termios.h>
+#include <errno.h>
+#ifdef LISP_FEATURE_OPENBSD
+/* FIXME: there has to be a better way to avoid ./util.h here */
+#include </usr/include/util.h>
+#endif
/* borrowed from detachtty's detachtty.c, in turn borrowed from APUE
* example code found at
return 1;
}
+#if defined(LISP_FEATURE_OPENBSD)
+
+int
+set_pty(char *pty_name)
+{
+ int fd;
+
+ if ((fd = open(pty_name, O_RDWR, 0)) == -1 ||
+ login_tty(fd) == -1)
+ return (0);
+ return (set_noecho(STDIN_FILENO));
+}
+
+#else /* !LISP_FEATURE_OPENBSD */
+
+int
+set_pty(char *pty_name)
+{
+ int 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
+ if ((fd = open(pty_name, O_RDWR, 0)) == -1)
+ return (-1);
+ dup2(fd, 0);
+ set_noecho(0);
+ dup2(fd, 1);
+ dup2(fd, 2);
+ close(fd);
+ return (0);
+}
+
+#endif /* !LISP_FEATURE_OPENBSD */
+
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 search, char *envp[], char *pty_name, int wait, char *pwd)
{
- int pid = fork();
+ pid_t pid;
int fd;
+ int channel[2];
sigset_t sset;
+ int failure_code = 2;
+
+ channel[0] = -1;
+ channel[1] = -1;
+ if (!pipe(channel)) {
+ if (-1==fcntl(channel[1], F_SETFD, FD_CLOEXEC)) {
+ close(channel[1]);
+ channel[1] = -1;
+ }
+ }
- if (pid != 0)
+ pid = fork();
+ if (pid) {
+ if ((-1 != pid) && (-1 != channel[1])) {
+ int child_errno = 0;
+ int bytes = sizeof(int);
+ int n;
+ char *p = (char*)&child_errno;
+ close(channel[1]);
+ /* Try to read child errno from channel. */
+ while ((bytes > 0) &&
+ (n = read(channel[0], p, bytes))) {
+ if (-1 == n) {
+ if (EINTR == errno) {
+ continue;
+ } else {
+ break;
+ }
+ } else {
+ bytes -= n;
+ p += n;
+ }
+ }
+ close(channel[0]);
+ if (child_errno) {
+ int status;
+ waitpid(pid, &status, 0);
+ /* Our convention to tell Lisp that it was the exec or
+ chdir that failed, not the fork. */
+ /* FIXME: there are other values waitpid(2) can return. */
+ if (WIFEXITED(status)) {
+ pid = -WEXITSTATUS(status);
+ }
+ errno = child_errno;
+ }
+ }
return pid;
-
- /* Put us in our own process group. */
-#if defined(LISP_FEATURE_HPUX)
- setsid();
+ }
+ close (channel[0]);
+
+ /* 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) || defined(LISP_FEATURE_OPENBSD)
+ setsid();
#elif defined(LISP_FEATURE_DARWIN)
- setpgid(0, getpid());
+ setpgid(0, getpid());
#elif defined(SVR4) || defined(__linux__) || defined(__osf__)
- setpgrp();
+ 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(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);
- } else{
+ if (pty_name)
+ set_pty(pty_name);
+ else {
/* Set up stdin, stdout, and stderr */
if (sin >= 0)
dup2(sin, 0);
/* Close all other fds. */
#ifdef SVR4
for (fd = sysconf(_SC_OPEN_MAX)-1; fd >= 3; fd--)
- close(fd);
+ if (fd != channel[1]) close(fd);
#else
for (fd = getdtablesize()-1; fd >= 3; fd--)
- close(fd);
+ if (fd != channel[1]) close(fd);
#endif
- environ = envp;
- /* Exec the program. */
- if (search)
- execvp(program, argv);
- else
- execv(program, argv);
+ if (pwd && chdir(pwd) < 0) {
+ failure_code = 3;
+ } else {
+ if (envp) {
+ environ = envp;
+ }
+ /* Exec the program. */
+ if (search)
+ execvp(program, argv);
+ else
+ execv(program, argv);
+ }
- exit (1);
+ /* When exec or chdir fails and channel is available, send the errno value. */
+ if (-1 != channel[1]) {
+ int our_errno = errno;
+ int bytes = sizeof(int);
+ int n;
+ char *p = (char*)&our_errno;
+ while ((bytes > 0) &&
+ (n = write(channel[1], p, bytes))) {
+ if (-1 == n) {
+ if (EINTR == errno) {
+ continue;
+ } else {
+ break;
+ }
+ } else {
+ bytes -= n;
+ p += n;
+ }
+ }
+ close(channel[1]);
+ }
+ _exit(failure_code);
}
#else /* !LISP_FEATURE_WIN32 */
int search,
char *envp,
char *ptyname,
- int wait
+ int wait,
+ char *pwd
)
{
int stdout_backup, stdin_backup, stderr_backup, wait_mode;
wait_mode = P_WAIT;
}
+ /* Change working directory if supplied. */
+ if (pwd) {
+ if (chdir(pwd) < 0) {
+ goto error_exit;
+ }
+ }
+
/* Spawn process given on the command line*/
if (search)
- hProcess = (HANDLE) spawnvp ( wait_mode, program, argv );
+ hProcess = (HANDLE) spawnvp ( wait_mode, program, (char* const* )argv );
else
- hProcess = (HANDLE) spawnv ( wait_mode, program, argv );
+ hProcess = (HANDLE) spawnv ( wait_mode, program, (char* const* )argv );
/* Now that the process is launched, replace the original
* in/out/err handles and close the backups. */
projects / sbcl.git / blobdiff