tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

forkpty: set the output fd to -1 on the slave side.

Browse source 
glibc, FreeBSD, OpenBSD, and Darwin all just leave the fd unchanged and
possibly uninitialized. Setting it to -1 seems friendlier, though.

Bug: http://b/27506278
Change-Id: I7acdc8eecbea4404d5fb4ba0b4d572245a323886
This commit is contained in:
Josh Gao 2016-03-04 18:04:41 -08:00
parent 5e57039c24
commit 6d7c1ee9ff
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libc/bionic/pty.cpp
View file

@ -151,22 +151,24 @@ int openpty(int* master, int* slave, char* name, const termios* t, const winsize
return 0; return 0;
} }
int forkpty(int* master, char* name, const termios* t, const winsize* ws) { int forkpty(int* amaster, char* name, const termios* t, const winsize* ws) {
int master;
int slave; int slave;
if (openpty(master, &slave, name, t, ws) == -1) { if (openpty(&master, &slave, name, t, ws) == -1) {
return -1; return -1;
} }
pid_t pid = fork(); pid_t pid = fork();
if (pid == -1) { if (pid == -1) {
close(*master); close(master);
close(slave); close(slave);
return -1; return -1;
} }
if (pid == 0) { if (pid == 0) {
// Child. // Child.
close(*master); *amaster = -1;
close(master);
if (login_tty(slave) == -1) { if (login_tty(slave) == -1) {
_exit(1); _exit(1);
} }
@ -174,6 +176,7 @@ int forkpty(int* master, char* name, const termios* t, const winsize* ws) {
} }
// Parent. // Parent.
*amaster = master;
close(slave); close(slave);
return pid; return pid;
} }