fade.c: simplify open_mixer()

[paraslash.git] / stdout.c

diff --git a/stdout.c b/stdout.c
index e13d0f18b19f44dd5ed8771c212dd39499a223d7..1656bcc94d886c712ce5b584a84f2dcf5e15e74a 100644 (file)
--- a/stdout.c
+++ b/stdout.c
@@ -26,16 +26,14 @@
 #include "error.h"
 #include "stdout.h"
 
-
 /**
  * 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
  *
- * This function is always successful. If there is data
- * available in the input buffer, it adds the STDOUT_FILENO
- * to the write fd set of \a s.
+ * 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)
 {
@@ -61,9 +59,10 @@ void stdout_pre_select(struct sched *s, struct task *t)
  * \param s the scheduler this task was registered to
  * \param t the task structure of the stdout task
  *
- * This function checks if STDOUT_FILENO was included by in the write fd set of
- * \a s during the previous pre_select call.  If yes, and STDOUT_FILENO appeears
- * to be writable, the data loaded in the input buffer is written to stdout.
+ * 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
+ * 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)
 {
@@ -83,6 +82,8 @@ void stdout_post_select(struct sched *s, struct task *t)
        if (ret <= 0)
                return;
        *sot->loaded -= ret;
+       if (*sot->loaded)
+               memmove(sot->buf, sot->buf + ret, *sot->loaded);
        t->ret = 1;
 }
 
@@ -97,10 +98,9 @@ static void stdout_default_event_handler(struct task *t)
  *
  * \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 unregisteres the task on errors and clears the eof flag of
- * \a sot.
+ * 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
+ * the task on errors and clears the eof flag of \a sot.
  */
 void stdout_set_defaults(struct stdout_task *sot)
 {
@@ -109,5 +109,6 @@ void stdout_set_defaults(struct stdout_task *sot)
        sot->task.post_select = stdout_post_select;
        sot->task.event_handler = stdout_default_event_handler;
        sot->eof = 0;
+       mark_fd_nonblock(STDOUT_FILENO);
        sprintf(sot->task.status, "stdout writer");
 }