v/tmate-ssh-server
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate-ssh-server.git synced 2020-11-18 19:53:51 -08:00
Code Issues Releases Wiki Activity

I broke last change, fix so it works, from J Raynor.

Browse Source
This commit is contained in:
Nicholas Marriott 2014-09-23 10:50:11 +01:00
parent 054a825ee2
commit 16670410ca
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compat/forkpty-aix.c
View File

@ -30,7 +30,7 @@
pid_t pid_t
forkpty(int *master, unused char *name, struct termios *tio, struct winsize *ws) forkpty(int *master, unused char *name, struct termios *tio, struct winsize *ws)
{ {
int slave, fd, pipe_fd[2]; int slave = -1, fd, pipe_fd[2];
char *path, dummy; char *path, dummy;
pid_t pid; pid_t pid;
@ -38,7 +38,7 @@ forkpty(int *master, unused char *name, struct termios *tio, struct winsize *ws)
return (-1); return (-1);
if ((*master = open("/dev/ptc", O_RDWR|O_NOCTTY)) == -1) if ((*master = open("/dev/ptc", O_RDWR|O_NOCTTY)) == -1)
return (-1); goto out;
if ((path = ttyname(*master)) == NULL) if ((path = ttyname(*master)) == NULL)
goto out; goto out;
@ -95,19 +95,19 @@ forkpty(int *master, unused char *name, struct termios *tio, struct winsize *ws)
return (0); return (0);
} }
close(slave);
close(pipe_fd[0]); close(pipe_fd[0]);
close(pipe_fd[1]); close(pipe_fd[1]);
close(slave);
return (pid); return (pid);
out: out:
close(pipe_fd[0]);
close(pipe_fd[1]);
if (*master != -1) if (*master != -1)
close(*master); close(*master);
if (slave != -1) if (slave != -1)
close(slave); close(slave);
close(pipe_fd[0]);
close(pipe_fd[1]);
return (-1); return (-1);
} }