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

diff --git a/stdout.c b/stdout.c
index a2ee2aca..92707ba9 100644
--- a/stdout.c
+++ b/stdout.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,7 +7,6 @@
 /** \file stdout.c Functions that deal with writing to stdout. */
 
 #include <assert.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
@@ -31,7 +30,6 @@ static void stdout_pre_select(struct sched *s, struct task *t)
 	struct stdout_task *sot = container_of(t, struct stdout_task, task);
 	int ret;
 
-	t->error = 0;
 	ret = btr_node_status(sot->btrn, 0, BTR_NT_LEAF);
 	if (ret > 0)
 		para_fd_set(STDOUT_FILENO, &s->wfds, &s->max_fileno);
@@ -48,7 +46,7 @@ static void stdout_pre_select(struct sched *s, struct task *t)
  * This function writes input data from the buffer tree to stdout if \p
  * STDOUT_FILENO is writable.
  */
-static void stdout_post_select(struct sched *s, struct task *t)
+static int stdout_post_select(struct sched *s, struct task *t)
 {
 	struct stdout_task *sot = container_of(t, struct stdout_task, task);
 	struct btr_node *btrn = sot->btrn;
@@ -56,28 +54,27 @@ static void stdout_post_select(struct sched *s, struct task *t)
 	char *buf;
 	size_t sz;
 
-	t->error = 0;
 	ret = btr_node_status(btrn, 0, BTR_NT_LEAF);
 	if (ret < 0)
 		goto out;
 	if (ret == 0)
-		return;
+		return 0;
 	if (!FD_ISSET(STDOUT_FILENO, &s->wfds))
-		return;
+		return 0;
 
 	for (;;) {
 		sz = btr_next_buffer(btrn, &buf);
 		if (sz == 0)
 			break;
-		ret = write_nonblock(STDOUT_FILENO, buf, sz);
+		ret = xwrite(STDOUT_FILENO, buf, sz);
 		if (ret <= 0)
 			break;
 		btr_consume(btrn, ret);
 	}
 out:
 	if (ret < 0)
-		btr_remove_node(btrn);
-	t->error = ret;
+		btr_remove_node(&sot->btrn);
+	return ret;
 }
 /**
  * Initialize a stdout task structure with default values.
@@ -92,7 +89,8 @@ void stdout_set_defaults(struct stdout_task *sot)
 	int ret;
 
 	sot->task.pre_select = stdout_pre_select;
-	sot->task.post_select = stdout_post_select;
+	sot->task.new_post_select = stdout_post_select;
+	sot->task.post_select = NULL;
 	sprintf(sot->task.status, "stdout");
 	ret = mark_fd_nonblocking(STDOUT_FILENO);
 	if (ret >= 0)