Merge branch 'maint'

* maint:
  stdin/stdout: Only set nonblock flags for non-tty fds.

diff --git a/stdin.c b/stdin.c
index e5c40bcb092a1faa59a91a33bd2d7b1975f1f3e7..7b70690b9a5f80626ad979595ee211bcf0037ded 100644 (file)
--- a/stdin.c
+++ b/stdin.c
@@ -114,6 +114,7 @@ void stdin_task_register(struct stdin_task *sit, struct sched *s)
                exit(EXIT_FAILURE);
        }
        sit->fd_flags = ret;
-       sit->must_set_nonblock_flag = (sit->fd_flags & O_NONBLOCK) == 0;
+       sit->must_set_nonblock_flag = (sit->fd_flags & O_NONBLOCK) == 0
+               && !isatty(STDIN_FILENO);
        sit->task = task_register(&ti, s);
 }

diff --git a/stdout.c b/stdout.c
index 43e194dbca5d672936997ac97b94820892ca5a12..9fc20ed0253d91f9ecb3fe3591843feb48b82eb3 100644 (file)
--- a/stdout.c
+++ b/stdout.c
@@ -96,6 +96,7 @@ void stdout_task_register(struct stdout_task *sot, struct sched *s)
                exit(EXIT_FAILURE);
        }
        sot->fd_flags = ret;
-       sot->must_set_nonblock_flag = (sot->fd_flags & O_NONBLOCK) == 0;
+       sot->must_set_nonblock_flag = (sot->fd_flags & O_NONBLOCK) == 0
+               && !isatty(STDOUT_FILENO);
        sot->task = task_register(&ti, s);
 }