X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdin.c;h=fea30dd90ca0e493bb6f4ce54f1515ea072761dc;hp=5b6bf520cb6b09f54e6dc30cb3f21c8d7118ba63;hb=ca659e6bf0d7f783849244105a077e79fcf741ad;hpb=0810e4932d4d8fb477d4af5596d4b263d2538ff6

diff --git a/stdin.c b/stdin.c
index 5b6bf520..fea30dd9 100644
--- a/stdin.c
+++ b/stdin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -31,6 +31,11 @@
 static void stdin_pre_select(struct sched *s, struct task *t)
 {
 	struct stdin_task *sit = container_of(t, struct stdin_task, task);
+
+	if (sit->output_error && *sit->output_error < 0) {
+		t->error = *sit->output_error;
+		return;
+	}
 	t->error = 0;
 	sit->check_fd = 0;
 	if (sit->loaded >= sit->bufsize)
@@ -55,6 +60,10 @@ static void stdin_post_select(struct sched *s, struct task *t)
 	struct stdin_task *sit = container_of(t, struct stdin_task, task);
 	ssize_t ret;
 
+	if (sit->output_error && *sit->output_error < 0) {
+		t->error = *sit->output_error;
+		return;
+	}
 	t->error = 0;
 	if (!sit->check_fd)
 		return;
@@ -89,6 +98,7 @@ void stdin_set_defaults(struct stdin_task *sit)
 	ret = mark_fd_nonblocking(STDIN_FILENO);
 	if (ret >= 0)
 		return;
+	sit->output_error = NULL;
 	PARA_EMERG_LOG("%s\n", para_strerror(-ret));
 	exit(EXIT_FAILURE);
 }