clearlinux/hyperstart
2
0
Fork 0
mirror of https://github.com/clearlinux/hyperstart.git synced 2026-10-03 23:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

use ptyslave instead of e->ptyfd to make code clean

Browse Source 
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
This commit is contained in:
Lai Jiangshan
2016-09-23 23:25:13 +08:00
parent da72799c96
commit 2360c4dc3f
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/exec.c
+11 -6
View File
@@ -417,17 +417,18 @@ static int hyper_dup_exec_tty(struct hyper_exec *e)
if (e->tty) {
char ptmx[512];
int ptyslave;
sprintf(ptmx, "/dev/pts/%d", e->ptyno);
// reopen slave ptyfd for correcting the symlink path of the /dev/fd/1
e->ptyfd = open(ptmx, O_RDWR | O_CLOEXEC);
if (e->ptyfd < 0 || ioctl(e->ptyfd, TIOCSCTTY, NULL) < 0) {
ptyslave = open(ptmx, O_RDWR | O_CLOEXEC);
if (ptyslave < 0 || ioctl(ptyslave, TIOCSCTTY, NULL) < 0) {
perror("ioctl pty device for execcmd failed");
goto out;
}
e->stdinfd = e->ptyfd;
e->stdoutfd = e->ptyfd;
e->stdinfd = ptyslave;
e->stdoutfd = ptyslave;
if (e->errseq == 0)
e->stderrfd = e->ptyfd;
e->stderrfd = ptyslave;
close(e->stdinev.fd);
close(e->stdoutev.fd);
close(e->stderrev.fd);
@@ -450,6 +451,10 @@ static int hyper_dup_exec_tty(struct hyper_exec *e)
goto out;
}
/*
* we are going to execvp(), all of the e->stdinfd, e->stdoutfd and
* e->stderrfd are O_CLOEXEC, we don't need to close them explicitly
*/
ret = 0;
out:
return ret;