mirror of
https://github.com/tmate-io/tmate-ssh-server.git
synced 2020-11-18 19:53:51 -08:00
I broke last change, fix so it works, from J Raynor.
This commit is contained in:
parent
054a825ee2
commit
16670410ca
@ -30,7 +30,7 @@
|
||||
pid_t
|
||||
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;
|
||||
pid_t pid;
|
||||
|
||||
@ -38,7 +38,7 @@ forkpty(int *master, unused char *name, struct termios *tio, struct winsize *ws)
|
||||
return (-1);
|
||||
|
||||
if ((*master = open("/dev/ptc", O_RDWR|O_NOCTTY)) == -1)
|
||||
return (-1);
|
||||
goto out;
|
||||
|
||||
if ((path = ttyname(*master)) == NULL)
|
||||
goto out;
|
||||
@ -95,19 +95,19 @@ forkpty(int *master, unused char *name, struct termios *tio, struct winsize *ws)
|
||||
return (0);
|
||||
}
|
||||
|
||||
close(slave);
|
||||
|
||||
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)
|
||||
close(slave);
|
||||
|
||||
close(pipe_fd[0]);
|
||||
close(pipe_fd[1]);
|
||||
return (-1);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user