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

Getting the read and write ends of the pipe the right way round is usually

Browse Source 
recommended. DOH.
This commit is contained in:
Nicholas Marriott 2009-10-21 07:37:11 +00:00
parent bb625a76d9
commit 4afecbe400
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
job.c
View File

@ -1,4 +1,4 @@
/* $Id: job.c,v 1.6 2009-10-12 00:25:25 tcunha Exp $ */ /* $Id: job.c,v 1.7 2009-10-21 07:37:11 nicm Exp $ */
/* /*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@ -152,7 +152,13 @@ job_run(struct job *job)
sigreset(); sigreset();
/* XXX environ? */ /* XXX environ? */
nullfd = open(_PATH_DEVNULL, O_RDONLY, 0); if (dup2(out[1], STDOUT_FILENO) == -1)
fatal("dup2 failed");
if (out[1] != STDOUT_FILENO)
close(out[1]);
close(out[0]);
nullfd = open(_PATH_DEVNULL, O_RDWR, 0);
if (nullfd < 0) if (nullfd < 0)
fatal("open failed"); fatal("open failed");
if (dup2(nullfd, STDIN_FILENO) == -1) if (dup2(nullfd, STDIN_FILENO) == -1)
@ -162,18 +168,12 @@ 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 */
close(out[0]); close(out[1]);
job->fd = out[1]; job->fd = out[0];
if ((mode = fcntl(job->fd, F_GETFL)) == -1) if ((mode = fcntl(job->fd, F_GETFL)) == -1)
fatal("fcntl failed"); fatal("fcntl failed");
if (fcntl(job->fd, F_SETFL, mode|O_NONBLOCK) == -1) if (fcntl(job->fd, F_SETFL, mode|O_NONBLOCK) == -1)