X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdout.c;h=babed7525e53db3997d7c792bb75f7b72b881a75;hp=84f2f7cacd3935fd1f60245ff171cbd9f986607d;hb=b76e950a38435a10d7d85a1c0ea95fa7c2917a96;hpb=471684761a2039bbc89aa1e3c33c62de6bef86cf

diff --git a/stdout.c b/stdout.c
index 84f2f7ca..babed752 100644
--- a/stdout.c
+++ b/stdout.c
@@ -6,6 +6,9 @@
 
 /** \file stdout.c functions that deal with writing to stdout */
 
+#include <dirent.h> /* readdir() */
+#include <assert.h>
+
 #include "para.h"
 #include "string.h"
 #include "list.h"
@@ -23,15 +26,15 @@
  * This function is always successful. If there is data available in the input
  * buffer, it adds \p STDOUT_FILENO to the write fd set of \a s.
  */
-void stdout_pre_select(struct sched *s, struct task *t)
+static void stdout_pre_select(struct sched *s, struct task *t)
 {
 	struct stdout_task *sot = t->private_data;
 
 	t->ret = 1;
 	sot->check_fd = 0;
 	if (!*sot->loaded) {
-		if (*sot->input_eof) {
-			t->ret = -E_STDOUT_EOF;
+		if (*sot->input_error) {
+			t->ret = *sot->input_error;
 			s->timeout.tv_sec = 0;
 			s->timeout.tv_usec = 1;
 		}
@@ -52,15 +55,15 @@ void stdout_pre_select(struct sched *s, struct task *t)
  * appeears to be writable, the data loaded in the input buffer is written to
  * stdout.
  */
-void stdout_post_select(struct sched *s, struct task *t)
+static void stdout_post_select(struct sched *s, struct task *t)
 {
 	struct stdout_task *sot = t->private_data;
 	ssize_t ret;
 
 	t->ret = 1;
 	if (!sot->check_fd) {
-		if (*sot->input_eof)
-			t->ret = -E_STDOUT_EOF;
+		if (*sot->input_error)
+			t->ret = *sot->input_error;
 		return;
 	}
 	if (!FD_ISSET(STDOUT_FILENO, &s->wfds))
@@ -96,7 +99,7 @@ void stdout_set_defaults(struct stdout_task *sot)
 	sot->task.pre_select = stdout_pre_select;
 	sot->task.post_select = stdout_post_select;
 	sot->task.event_handler = stdout_default_event_handler;
-	sot->eof = 0;
-	mark_fd_nonblock(STDOUT_FILENO);
+	sot->error = 0;
+	mark_fd_nonblocking(STDOUT_FILENO);
 	sprintf(sot->task.status, "stdout writer");
 }