circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-03 16:46:18 +00:00
Code Issues Projects Releases Wiki Activity

Synchronize forkpty master and child to avoid hang on AIX with fast exiting

Browse Source 
child and output left in the queue, from J Raynor.
This commit is contained in:
Nicholas Marriott
2014-09-22 14:07:00 +01:00
parent 938d91d2c3
commit 4d53fd98a6
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
compat/forkpty-aix.c
View File

@@ -23,16 +23,20 @@
#include <stdlib.h>
#include <stropts.h>
#include <unistd.h>
#include <errno.h>
#include "tmux.h"
pid_t
forkpty(int *master, unused char *name, struct termios *tio, struct winsize *ws)
{
int slave, fd;
char *path;
int slave, fd, pipe_fd[2];
char *path, dummy;
pid_t pid;
if (pipe(pipe_fd) == -1)
return (-1);
if ((*master = open("/dev/ptc", O_RDWR|O_NOCTTY)) == -1)
return (-1);
@@ -47,6 +51,13 @@ forkpty(int *master, unused char *name, struct termios *tio, struct winsize *ws)
case 0:
close(*master);
close(pipe_fd[1]);
while (read(pipe_fd[0], &dummy, 1) == -1) {
if (errno != EINTR)
break;
}
close(pipe_fd[0]);
fd = open(_PATH_TTY, O_RDWR|O_NOCTTY);
if (fd >= 0) {
ioctl(fd, TIOCNOTTY, NULL);
@@ -80,13 +91,20 @@ forkpty(int *master, unused char *name, struct termios *tio, struct winsize *ws)
dup2(slave, 2);
if (slave > 2)
close(slave);
return (0);
}
close(pipe_fd[0]);
close(pipe_fd[1]);
close(slave);
return (pid);
out:
close(pipe_fd[0]);
close(pipe_fd[1]);
if (*master != -1)
close(*master);
if (slave != -1)