aft.c: Move definition of "buf" down a bit.

[paraslash.git] / stdout.c

diff --git a/stdout.c b/stdout.c
index fe188c9a0f45499af57585a2d04f147916e89072..a192f2beb44b4c49bd1a9c7affb5167a82013158 100644 (file)
--- a/stdout.c
+++ b/stdout.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** \file stdout.c functions that deal with writing to stdout */
+/** \file stdout.c Functions that deal with writing to stdout. */
 
 #include <dirent.h> /* readdir() */
 #include <assert.h>
@@ -18,10 +18,10 @@
 #include "stdout.h"
 
 /**
- * the pre_select function of the stdout task
+ * The pre_select function of the stdout task.
  *
- * \param s the scheduler this task was registered to
- * \param t the task structure of the stdout task
+ * \param s The scheduler this task was registered to.
+ * \param t The task structure of the stdout task.
  *
  * 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.
@@ -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;
                }
@@ -45,10 +45,10 @@ static void stdout_pre_select(struct sched *s, struct task *t)
 }
 
 /**
- * the post select function of the stdout task
+ * The post select function of the stdout task.
  *
- * \param s the scheduler this task was registered to
- * \param t the task structure of the stdout task
+ * \param s The scheduler this task was registered to.
+ * \param t The task structure of the stdout task.
  *
  * This function checks if \p STDOUT_FILENO was included by in the write fd set
  * of \a s during the previous pre_select call.  If yes, and \p STDOUT_FILENO
@@ -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))
@@ -80,14 +80,14 @@ static void stdout_post_select(struct sched *s, struct task *t)
 
 static void stdout_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);
 }
 
 /**
- * initialize a stdout task structure with default values
+ * Initialize a stdout task structure with default values.
  *
- * \param sot the stdout task structure
+ * \param sot The stdout task structure.
  *
  * This fills in the pre/post select function poinzters of the task structure
  * given by \a sot. It also sets up a default error handler which unregisters
@@ -95,11 +95,17 @@ static void stdout_default_event_handler(struct task *t)
  */
 void stdout_set_defaults(struct stdout_task *sot)
 {
+       int ret;
+
        sot->task.private_data = 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_nonblocking(STDOUT_FILENO);
+       sot->error = 0;
        sprintf(sot->task.status, "stdout writer");
+       ret = mark_fd_nonblocking(STDOUT_FILENO);
+       if (ret >= 0)
+               return;
+       PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+       exit(EXIT_FAILURE);
 }