X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdout.c;h=4554145f3d24883e828c849e856e4eca2f428cc6;hp=92707ba97b86624b543c7fbaedea74b5ace7a6c3;hb=bd10c0f46e0b7eadfb8c6d5cd45581cec253d775;hpb=6e83b4bcdf55b8daa551a57923fe9bb01c870325

diff --git a/stdout.c b/stdout.c
index 92707ba9..4554145f 100644
--- a/stdout.c
+++ b/stdout.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -62,6 +62,12 @@ static int stdout_post_select(struct sched *s, struct task *t)
 	if (!FD_ISSET(STDOUT_FILENO, &s->wfds))
 		return 0;
 
+	if (sot->must_set_nonblock_flag) {
+		ret = mark_fd_nonblocking(STDOUT_FILENO);
+		if (ret < 0)
+			goto out;
+		sot->must_set_nonblock_flag = false;
+	}
 	for (;;) {
 		sz = btr_next_buffer(btrn, &buf);
 		if (sz == 0)
@@ -72,8 +78,11 @@ static int stdout_post_select(struct sched *s, struct task *t)
 		btr_consume(btrn, ret);
 	}
 out:
-	if (ret < 0)
+	if (ret < 0) {
 		btr_remove_node(&sot->btrn);
+		/* Revert to blocking mode if necessary. */
+		fcntl(STDOUT_FILENO, F_SETFL, sot->fd_flags);
+	}
 	return ret;
 }
 /**
@@ -82,19 +91,22 @@ out:
  * \param sot The stdout task structure.
  *
  * This fills in the pre/post select function pointers of the task structure
- * given by \a sot and sets the stdout file descriptor to nonblocking mode.
+ * given by \a sot.
  */
 void stdout_set_defaults(struct stdout_task *sot)
 {
 	int ret;
 
 	sot->task.pre_select = stdout_pre_select;
-	sot->task.new_post_select = stdout_post_select;
-	sot->task.post_select = NULL;
+	sot->task.post_select = stdout_post_select;
 	sprintf(sot->task.status, "stdout");
-	ret = mark_fd_nonblocking(STDOUT_FILENO);
-	if (ret >= 0)
-		return;
-	PARA_EMERG_LOG("%s\n", para_strerror(-ret));
-	exit(EXIT_FAILURE);
+
+	/* See 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;
 }