X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdout.c;h=babed7525e53db3997d7c792bb75f7b72b881a75;hp=f39de1090c146acd8f10578b18d637e137a4379a;hb=c5a016fb52918b53dc828d3b0d16df3dcac2fcfe;hpb=9594f50584246d48483abff3546b5cd3ed36fc35 diff --git a/stdout.c b/stdout.c index f39de109..babed752 100644 --- a/stdout.c +++ b/stdout.c @@ -33,8 +33,8 @@ static void stdout_pre_select(struct sched *s, struct task *t) 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; } @@ -62,8 +62,8 @@ static void stdout_post_select(struct sched *s, struct task *t) 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)) @@ -99,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"); }