osx_write: kill superfluous semaphore code

[paraslash.git] / stdout.c

diff --git a/stdout.c b/stdout.c
index 25402b8d259fbecb8e0d9fc7b3fab2d799b07884..1656bcc94d886c712ce5b584a84f2dcf5e15e74a 100644 (file)
--- a/stdout.c
+++ b/stdout.c
@@ -26,7 +26,6 @@
 #include "error.h"
 #include "stdout.h"
 
-
 /**
  * the pre_select function of the stdout task
  *
@@ -34,7 +33,7 @@
  * \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 \a STDOUT_FILENO to the write fd set of \a s.
+ * buffer, it adds \p STDOUT_FILENO to the write fd set of \a s.
  */
 void stdout_pre_select(struct sched *s, struct task *t)
 {
@@ -60,8 +59,8 @@ 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 \a STDOUT_FILENO was included by in the write fd set
- * of \a s during the previous pre_select call.  If yes, and STDOUT_FILENO
+ * 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.
  */
@@ -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;
 }
 
@@ -108,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");
 }