clearlinux/hyperstart
2
0
Fork 0
mirror of https://github.com/clearlinux/hyperstart.git synced 2026-09-03 12:11:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #61 from laijs/ptys

Browse Source 
fix symlink leek
This commit is contained in:
Gao feng
2016-04-02 01:04:19 -05:00
parent 53cd58a121 1ad3ffcf63
commit 5ca0595e4f
1 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/exec.c
+22 -19
View File
@@ -290,12 +290,8 @@ int hyper_setup_exec_tty(struct hyper_exec *e)
e->stdinev.fd = ptymaster;
e->stdoutev.fd = dup(ptymaster);
done:
e->stdinfd = e->ptyfd;
e->stdoutfd = e->ptyfd;
if (e->errseq == 0) {
e->stderrev.fd = dup(e->stdoutev.fd);
e->stderrfd = e->ptyfd;
}
fprintf(stdout, "%s pts event %p, fd %d %d\n",
__func__, &e->stdinev, ptymaster, e->ptyfd);
@@ -309,9 +305,22 @@ int hyper_dup_exec_tty(int to, struct hyper_exec *e)
fprintf(stdout, "%s\n", __func__);
setsid();
if (e->tty && (ioctl(e->ptyfd, TIOCSCTTY, NULL) < 0)) {
perror("ioctl pty device for execcmd failed");
goto out;
if (e->tty) {
char ptmx[512];
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) {
perror("ioctl pty device for execcmd failed");
goto out;
}
e->stdinfd = e->ptyfd;
e->stdoutfd = e->ptyfd;
if (e->errseq == 0)
e->stderrfd = e->ptyfd;
close(e->stdinev.fd);
close(e->stdoutev.fd);
close(e->stderrev.fd);
}
fflush(stdout);
@@ -602,12 +611,9 @@ out:
return ret;
close_tty:
close(exec->ptyfd);
if (exec->stdinfd != exec->ptyfd)
close(exec->stdinfd);
if (exec->stdoutfd != exec->ptyfd)
close(exec->stdoutfd);
if (exec->stderrfd != exec->ptyfd)
close(exec->stderrfd);
close(exec->stdinfd);
close(exec->stdoutfd);
close(exec->stderrfd);
close(exec->stdinev.fd);
close(exec->stdoutev.fd);
close(exec->stderrev.fd);
@@ -738,14 +744,11 @@ int hyper_handle_exec_exit(struct hyper_pod *pod, int pid, uint8_t code)
close(exec->ptyfd);
exec->ptyfd = -1;
if (exec->stdinfd != exec->ptyfd)
close(exec->stdinfd);
close(exec->stdinfd);
exec->stdinfd = -1;
if (exec->stdoutfd != exec->ptyfd)
close(exec->stdoutfd);
close(exec->stdoutfd);
exec->stdoutfd = -1;
if (exec->stderrfd != exec->ptyfd)
close(exec->stderrfd);
close(exec->stderrfd);
exec->stderrfd = -1;
hyper_release_exec(exec, pod);