int master_fd, slave_fd;
void *frontend;
char name[FILENAME_MAX];
- int child_pid;
+ pid_t child_pid;
int term_width, term_height;
int child_dead, finished;
int exit_code;
static int pty_find_by_pid(void *av, void *bv)
{
- int a = *(int *)av;
+ pid_t a = *(pid_t *)av;
Pty b = (Pty)bv;
if (a < b->child_pid)
static Pty single_pty = NULL;
#ifndef OMIT_UTMP
-static int pty_utmp_helper_pid, pty_utmp_helper_pipe;
+static pid_t pty_utmp_helper_pid;
+static int pty_utmp_helper_pipe;
static int pty_stamped_utmp;
static struct utmpx utmp_entry;
#endif
static void sigchld_handler(int signum)
{
- write(pty_signal_pipe[1], "x", 1);
+ if (write(pty_signal_pipe[1], "x", 1) <= 0)
+ /* not much we can do about it */;
}
#ifndef OMIT_UTMP
/*
* Set the pty master into non-blocking mode.
*/
- int i = 1;
- ioctl(pty->master_fd, FIONBIO, &i);
+ int fl;
+ fl = fcntl(pty->master_fd, F_GETFL);
+ if (fl != -1 && !(fl & O_NONBLOCK))
+ fcntl(pty->master_fd, F_SETFL, fl | O_NONBLOCK);
}
if (!ptys_by_fd)
if (fd == pty_signal_pipe[0]) {
pid_t pid;
- int ipid;
int status;
char c[1];
- read(pty_signal_pipe[0], c, 1); /* ignore its value; it'll be `x' */
+ if (read(pty_signal_pipe[0], c, 1) <= 0)
+ /* ignore error */;
+ /* ignore its value; it'll be `x' */
do {
pid = waitpid(-1, &status, WNOHANG);
- ipid = pid;
pty = find234(ptys_by_pid, &pid, pty_find_by_pid);
if (pty)
ioctl(0, TIOCSCTTY, 1);
#endif
pgrp = getpid();
- tcsetpgrp(slavefd, pgrp);
+ tcsetpgrp(0, pgrp);
setpgid(pgrp, pgrp);
close(open(pty->name, O_WRONLY, 0));
setpgid(pgrp, pgrp);
pty_provide_logctx,
pty_unthrottle,
pty_cfg_info,
- 1
+ "pty",
+ -1,
+ 0
};