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

Sort out stdout before stdin/stderr in case the stdout side of the pipe got one

Browse Source 
of their fds.
This commit is contained in:
Nicholas Marriott 2009-10-20 22:15:32 +00:00
parent 480f5d3184
commit 6f2169037e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
job.c
View File

@ -153,6 +153,12 @@ job_run(struct job *job)
sigreset(); sigreset();
/* XXX environ? */ /* XXX environ? */
close(out[1]);
if (dup2(out[0], STDOUT_FILENO) == -1)
fatal("dup2 failed");
if (out[0] != STDOUT_FILENO)
close(out[0]);
nullfd = open(_PATH_DEVNULL, O_RDONLY, 0); nullfd = open(_PATH_DEVNULL, O_RDONLY, 0);
if (nullfd < 0) if (nullfd < 0)
fatal("open failed"); fatal("open failed");
@ -163,12 +169,6 @@ job_run(struct job *job)
if (nullfd != STDIN_FILENO && nullfd != STDERR_FILENO) if (nullfd != STDIN_FILENO && nullfd != STDERR_FILENO)
close(nullfd); close(nullfd);
close(out[1]);
if (dup2(out[0], STDOUT_FILENO) == -1)
fatal("dup2 failed");
if (out[0] != STDOUT_FILENO)
close(out[0]);
execl(_PATH_BSHELL, "sh", "-c", job->cmd, (char *) NULL); execl(_PATH_BSHELL, "sh", "-c", job->cmd, (char *) NULL);
fatal("execl failed"); fatal("execl failed");
default: /* parent */ default: /* parent */