X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/b9d7bcadee831e9b59fb785f2464a5fc1897bd1a..5a8afc787bcaafabd3aee68b6dac341962801b57:/unix/pty.c diff --git a/unix/pty.c b/unix/pty.c index 67addceb..63fe69e9 100644 --- a/unix/pty.c +++ b/unix/pty.c @@ -29,6 +29,7 @@ #include #include #include +#include #include "putty.h" @@ -68,13 +69,14 @@ #endif int pty_master_fd; +static void *pty_frontend; static char pty_name[FILENAME_MAX]; static int pty_stamped_utmp = 0; static int pty_child_pid; static int pty_utmp_helper_pid, pty_utmp_helper_pipe; static int pty_term_width, pty_term_height; -static sig_atomic_t pty_child_dead; -static int pty_exit_code; +static volatile sig_atomic_t pty_child_dead; +static volatile int pty_exit_code; #ifndef OMIT_UTMP static struct utmp utmp_entry; #endif @@ -162,18 +164,23 @@ static void cleanup_utmp(void) static void sigchld_handler(int signum) { + int save_errno = errno; pid_t pid; int status; - pid = waitpid(-1, &status, WNOHANG); - if (pid == pty_child_pid && (WIFEXITED(status) || WIFSIGNALED(status))) { - pty_exit_code = status; - pty_child_dead = TRUE; - } + + do { + pid = waitpid(-1, &status, WNOHANG); + if (pid == pty_child_pid && (WIFEXITED(status) || WIFSIGNALED(status))) { + pty_exit_code = status; + pty_child_dead = TRUE; + } + } while(pid > 0); + errno = save_errno; } static void fatal_sig_handler(int signum) { - signal(signum, SIG_DFL); + putty_signal(signum, SIG_DFL); cleanup_utmp(); setuid(getuid()); raise(signum); @@ -253,6 +260,9 @@ void pty_pre_init(void) pid_t pid; int pipefd[2]; + /* set the child signal handler straight away; it needs to be set + * before we ever fork. */ + putty_signal(SIGCHLD, sigchld_handler); pty_master_fd = -1; if (geteuid() != getuid() || getegid() != getgid()) { @@ -288,7 +298,7 @@ void pty_pre_init(void) ret = read(pipefd[0], buffer, lenof(buffer)); if (ret <= 0) { cleanup_utmp(); - exit(0); + _exit(0); } else if (!pty_stamped_utmp) { if (dlen < lenof(display)) memcpy(display+dlen, buffer, @@ -306,47 +316,45 @@ void pty_pre_init(void) * unfortunately unprotected against SIGKILL, * but that's life. */ - signal(SIGHUP, fatal_sig_handler); - signal(SIGINT, fatal_sig_handler); - signal(SIGQUIT, fatal_sig_handler); - signal(SIGILL, fatal_sig_handler); - signal(SIGABRT, fatal_sig_handler); - signal(SIGFPE, fatal_sig_handler); - signal(SIGPIPE, fatal_sig_handler); - signal(SIGALRM, fatal_sig_handler); - signal(SIGTERM, fatal_sig_handler); - signal(SIGSEGV, fatal_sig_handler); - signal(SIGUSR1, fatal_sig_handler); - signal(SIGUSR2, fatal_sig_handler); + putty_signal(SIGHUP, fatal_sig_handler); + putty_signal(SIGINT, fatal_sig_handler); + putty_signal(SIGQUIT, fatal_sig_handler); + putty_signal(SIGILL, fatal_sig_handler); + putty_signal(SIGABRT, fatal_sig_handler); + putty_signal(SIGFPE, fatal_sig_handler); + putty_signal(SIGPIPE, fatal_sig_handler); + putty_signal(SIGALRM, fatal_sig_handler); + putty_signal(SIGTERM, fatal_sig_handler); + putty_signal(SIGSEGV, fatal_sig_handler); + putty_signal(SIGUSR1, fatal_sig_handler); + putty_signal(SIGUSR2, fatal_sig_handler); #ifdef SIGBUS - signal(SIGBUS, fatal_sig_handler); + putty_signal(SIGBUS, fatal_sig_handler); #endif #ifdef SIGPOLL - signal(SIGPOLL, fatal_sig_handler); + putty_signal(SIGPOLL, fatal_sig_handler); #endif #ifdef SIGPROF - signal(SIGPROF, fatal_sig_handler); + putty_signal(SIGPROF, fatal_sig_handler); #endif #ifdef SIGSYS - signal(SIGSYS, fatal_sig_handler); + putty_signal(SIGSYS, fatal_sig_handler); #endif #ifdef SIGTRAP - signal(SIGTRAP, fatal_sig_handler); + putty_signal(SIGTRAP, fatal_sig_handler); #endif #ifdef SIGVTALRM - signal(SIGVTALRM, fatal_sig_handler); + putty_signal(SIGVTALRM, fatal_sig_handler); #endif #ifdef SIGXCPU - signal(SIGXCPU, fatal_sig_handler); + putty_signal(SIGXCPU, fatal_sig_handler); #endif #ifdef SIGXFSZ - signal(SIGXFSZ, fatal_sig_handler); + putty_signal(SIGXFSZ, fatal_sig_handler); #endif #ifdef SIGIO - signal(SIGIO, fatal_sig_handler); + putty_signal(SIGIO, fatal_sig_handler); #endif - /* Also clean up utmp on normal exit. */ - atexit(cleanup_utmp); setup_utmp(pty_name, display); } } @@ -355,7 +363,6 @@ void pty_pre_init(void) close(pipefd[0]); pty_utmp_helper_pid = pid; pty_utmp_helper_pipe = pipefd[1]; - signal(SIGCHLD, sigchld_handler); } #endif @@ -382,16 +389,18 @@ void pty_pre_init(void) * Also places the canonical host name into `realhost'. It must be * freed by the caller. */ -static char *pty_init(void *frontend, void **backend_handle, +static char *pty_init(void *frontend, void **backend_handle, Config *cfg, char *host, int port, char **realhost, int nodelay) { int slavefd; pid_t pid, pgrp; + long windowid; + pty_frontend = frontend; *backend_handle = NULL; /* we can't sensibly use this, sadly */ - pty_term_width = cfg.width; - pty_term_height = cfg.height; + pty_term_width = cfg->width; + pty_term_height = cfg->height; if (pty_master_fd < 0) pty_open_master(); @@ -403,7 +412,7 @@ static char *pty_init(void *frontend, void **backend_handle, { struct termios attrs; tcgetattr(pty_master_fd, &attrs); - attrs.c_cc[VERASE] = cfg.bksp_is_delete ? '\177' : '\010'; + attrs.c_cc[VERASE] = cfg->bksp_is_delete ? '\177' : '\010'; tcsetattr(pty_master_fd, TCSANOW, &attrs); } @@ -411,10 +420,10 @@ static char *pty_init(void *frontend, void **backend_handle, * Stamp utmp (that is, tell the utmp helper process to do so), * or not. */ - if (!cfg.stamp_utmp) + if (!cfg->stamp_utmp) close(pty_utmp_helper_pipe); /* just let the child process die */ else { - char *location = get_x_display(); + char *location = get_x_display(pty_frontend); int len = strlen(location)+1, pos = 0; /* +1 to include NUL */ while (pos < len) { int ret = write(pty_utmp_helper_pipe, location+pos, len - pos); @@ -427,6 +436,8 @@ static char *pty_init(void *frontend, void **backend_handle, } } + windowid = get_windowid(pty_frontend); + /* * Fork and execute the command. */ @@ -445,7 +456,7 @@ static char *pty_init(void *frontend, void **backend_handle, slavefd = open(pty_name, O_RDWR); if (slavefd < 0) { perror("slave pty: open"); - exit(1); + _exit(1); } close(pty_master_fd); @@ -464,23 +475,28 @@ static char *pty_init(void *frontend, void **backend_handle, for (i = 3; i < 1024; i++) close(i); { - char term_env_var[10 + sizeof(cfg.termtype)]; - sprintf(term_env_var, "TERM=%s", cfg.termtype); + char term_env_var[10 + sizeof(cfg->termtype)]; + sprintf(term_env_var, "TERM=%s", cfg->termtype); putenv(term_env_var); } + { + char windowid_env_var[40]; + sprintf(windowid_env_var, "WINDOWID=%ld", windowid); + putenv(windowid_env_var); + } /* * SIGINT and SIGQUIT may have been set to ignored by our * parent, particularly by things like sh -c 'pterm &' and * some window managers. Reverse this for our child process. */ - signal(SIGINT, SIG_DFL); - signal(SIGQUIT, SIG_DFL); + putty_signal(SIGINT, SIG_DFL); + putty_signal(SIGQUIT, SIG_DFL); if (pty_argv) execvp(pty_argv[0], pty_argv); else { char *shell = getenv("SHELL"); char *shellname; - if (cfg.login_shell) { + if (cfg->login_shell) { char *p = strrchr(shell, '/'); shellname = smalloc(2+strlen(shell)); p = p ? p+1 : shell; @@ -494,18 +510,31 @@ static char *pty_init(void *frontend, void **backend_handle, * If we're here, exec has gone badly foom. */ perror("exec"); - exit(127); + _exit(127); } else { - close(slavefd); pty_child_pid = pid; pty_child_dead = FALSE; - signal(SIGCHLD, sigchld_handler); - } + } return NULL; } /* + * Stub routine (we don't have any need to reconfigure this backend). + */ +static void pty_reconfig(void *handle, Config *cfg) +{ +} + +/* + * Stub routine (never called in pterm + */ +static void pty_free(void *handle) +{ +} + + +/* * Called to send data down the pty. */ static int pty_send(void *handle, char *buf, int len) @@ -554,8 +583,10 @@ static void pty_size(void *handle, int width, int height) size.ws_row = (unsigned short)pty_term_height; size.ws_col = (unsigned short)pty_term_width; - size.ws_xpixel = (unsigned short) pty_term_width * font_dimension(0); - size.ws_ypixel = (unsigned short) pty_term_height * font_dimension(1); + size.ws_xpixel = (unsigned short) pty_term_width * + font_dimension(pty_frontend, 0); + size.ws_ypixel = (unsigned short) pty_term_height * + font_dimension(pty_frontend, 1); ioctl(pty_master_fd, TIOCSWINSZ, (void *)&size); return; } @@ -594,6 +625,11 @@ static void pty_provide_ldisc(void *handle, void *ldisc) /* This is a stub. */ } +static void pty_provide_logctx(void *handle, void *logctx) +{ + /* This is a stub. */ +} + static int pty_exitcode(void *handle) { if (!pty_child_dead) @@ -604,6 +640,8 @@ static int pty_exitcode(void *handle) Backend pty_backend = { pty_init, + pty_free, + pty_reconfig, pty_send, pty_sendbuffer, pty_size, @@ -613,6 +651,7 @@ Backend pty_backend = { pty_sendok, pty_ldisc, pty_provide_ldisc, + pty_provide_logctx, pty_unthrottle, 1 };