X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=stdout.c;h=71c45f69518b349d07143823003dedac9a0f5e2f;hb=181beb316afad036ac01a778544c5dec0a8d51c7;hp=bb921ad12dd84acc71b5fb7a9c3944bc0d117732;hpb=879e52d49df6d00aa9eafe5cccb48bbd24ed4c81;p=paraslash.git

diff --git a/stdout.c b/stdout.c
index bb921ad1..71c45f69 100644
--- a/stdout.c
+++ b/stdout.c
@@ -1,13 +1,7 @@
-/*
- * Copyright (C) 2006-2014 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file stdout.c Functions that deal with writing to stdout. */
 
-#include <assert.h>
-
 #include "para.h"
 #include "list.h"
 #include "sched.h"
@@ -46,7 +40,7 @@ static int stdout_post_select(struct sched *s, void *context)
 		goto out;
 	if (ret == 0)
 		return 0;
-	if (!FD_ISSET(STDOUT_FILENO, &s->wfds))
+	if (!sched_write_ok(STDOUT_FILENO, s))
 		return 0;
 
 	if (sot->must_set_nonblock_flag) {
@@ -91,13 +85,14 @@ void stdout_task_register(struct stdout_task *sot, struct sched *s)
 		.name = "stdout",
 	};
 
-	/* See stdin.c for details. */
+	/* See \ref stdin.c for details. */
 	ret = fcntl(STDOUT_FILENO, F_GETFL);
 	if (ret < 0) {
 		PARA_EMERG_LOG("F_GETFL: %s\n", strerror(errno));
 		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);
 }