X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdout.c;h=fe188c9a0f45499af57585a2d04f147916e89072;hp=2e86fe965a022ac099c6c2effe5f582d10611c5a;hb=51dde9efab2d662cf5813d26d5c9aebce6e197e7;hpb=6969c9fa8293a44daf7ba5a0426573fcd71c1953

diff --git a/stdout.c b/stdout.c
index 2e86fe96..fe188c9a 100644
--- a/stdout.c
+++ b/stdout.c
@@ -1,23 +1,14 @@
 /*
  * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file stdout.c functions that deal with writing to stdout */
 
+#include <dirent.h> /* readdir() */
+#include <assert.h>
+
 #include "para.h"
 #include "string.h"
 #include "list.h"
@@ -35,7 +26,7 @@
  * 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)
+static void stdout_pre_select(struct sched *s, struct task *t)
 {
 	struct stdout_task *sot = t->private_data;
 
@@ -64,7 +55,7 @@ void stdout_pre_select(struct sched *s, struct task *t)
  * 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)
+static void stdout_post_select(struct sched *s, struct task *t)
 {
 	struct stdout_task *sot = t->private_data;
 	ssize_t ret;
@@ -82,6 +73,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;
 }
 
@@ -107,6 +100,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);
+	mark_fd_nonblocking(STDOUT_FILENO);
 	sprintf(sot->task.status, "stdout writer");
 }