From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 6 Aug 2017 21:02:17 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v0.6.1~40
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=1f12ea375358a0b30689e01efe82796ea4fcb14f;hp=7649f22106cec2c6eb8bb10f279401e1af5451d0;p=paraslash.git

Merge branch 'maint'

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

diff --git a/stdin.c b/stdin.c
index e5c40bcb..7b70690b 100644
--- 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 43e194db..9fc20ed0 100644
--- 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);
 }