X-Git-Url: https://ruderich.org/simon/gitweb/?p=ptyas%2Fptyas.git;a=blobdiff_plain;f=ptyas.c;h=9fc7997269a23b756f8a173f399f8bbad771df26;hp=2d0614d8865936de8548f3d497d53298ebd668f1;hb=dad601b98c99c7597d7d6e1df85028d884051a90;hpb=f345aeadd2754d2cd1fd4c616f9a88ef8c9ea513 diff --git a/ptyas.c b/ptyas.c index 2d0614d..9fc7997 100644 --- a/ptyas.c +++ b/ptyas.c @@ -82,9 +82,11 @@ static void open_pty_or_die(int *pty_master, int *pty_slave, uid_t uid) { if (*pty_slave == -1) { die("open slave tty"); } - /* The user must be able to write to the new TTY. Normally grantpt() would + /* + * The user must be able to write to the new TTY. Normally grantpt() would * do this for us, but we don't trust the user and thus don't want to pass - * the pty_master to a process running under that uid. */ + * the pty_master to a process running under that uid. + */ if (chown(slave_path, uid, (gid_t)-1) != 0) { die("chown slave tty"); } @@ -268,10 +270,12 @@ static void proxy_input_between_ttys(int pty_master, int ctty, volatile pid_t *p static volatile pid_t pid_to_wait_for; static int pid_to_wait_for_status; -static void sigchld_handler() { +static void sigchld_handler(int signal) { int status; pid_t pid; + (void)signal; + while ((pid = waitpid(-1, &status, WNOHANG)) > 0) { if (pid == pid_to_wait_for) { /* Mark that our child has died and we should exit as well. */