X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdin.c;h=40f02c1cef0a945546966fef4f2cea033d54fc17;hp=4b7a962d259658184d2ac12ff66885d9a4e0635f;hb=c73d23911d78ed10179c12ef8f79a3fcf3bbcdaf;hpb=f8b73704e27c5b5fad77cfddd06951dabcc6bf56

diff --git a/stdin.c b/stdin.c
index 4b7a962d..40f02c1c 100644
--- a/stdin.c
+++ b/stdin.c
@@ -41,7 +41,7 @@ static void stdin_pre_select(struct sched *s, struct task *t)
 
 static void stdin_default_event_handler(struct task *t)
 {
-	PARA_NOTICE_LOG("%p: %s\n", t, PARA_STRERROR(-t->ret));
+	PARA_NOTICE_LOG("%p: %s\n", t, para_strerror(-t->ret));
 	unregister_task(t);
 }
 
@@ -75,7 +75,7 @@ static void stdin_post_select(struct sched *s, struct task *t)
 	} else
 		t->ret = -E_STDIN_EOF;
 	if (t->ret < 0)
-		sit->eof = 1;
+		sit->error = t->ret;
 }
 
 /**
@@ -92,11 +92,11 @@ void stdin_set_defaults(struct stdin_task *sit)
 {
 	sit->bufsize = 16 * 1024,
 	sit->loaded = 0,
-	sit->eof = 0,
+	sit->error = 0,
 	sit->task.pre_select = stdin_pre_select;
 	sit->task.post_select = stdin_post_select;
 	sit->task.event_handler = stdin_default_event_handler;
 	sit->task.private_data = sit;
-	mark_fd_nonblock(STDIN_FILENO);
+	mark_fd_nonblocking(STDIN_FILENO);
 	sprintf(sit->task.status, "stdin reader");
 }