From 30fee3aade16f297aa86e9010d6b1844ba375cbc Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Tue, 10 Apr 2012 09:26:52 -0400 Subject: [PATCH] Open /proc/pid/fd/[0-2] in non-blocking mode just in case we might block in open. --- src/ttyname.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ttyname.c b/src/ttyname.c index b73325a64..6178ddb83 100644 --- a/src/ttyname.c +++ b/src/ttyname.c @@ -165,7 +165,7 @@ get_process_ttyname(void) ppid = getppid(); for (i = STDIN_FILENO; i < STDERR_FILENO && tty == NULL; i++) { snprintf(path, sizeof(path), "/proc/%d/fd/%d", (int)ppid, i); - fd = open(path, O_RDONLY|O_NOCTTY, 0); + fd = open(path, O_RDONLY|O_NOCTTY|O_NONBLOCK, 0); if (fd != -1) { tty = ttyname(fd); close(fd);