fix conflict

[paraslash.git] / stdout.c

diff --git a/stdout.c b/stdout.c
index 2e86fe965a022ac099c6c2effe5f582d10611c5a..1656bcc94d886c712ce5b584a84f2dcf5e15e74a 100644 (file)
--- a/stdout.c
+++ b/stdout.c
@@ -82,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;
 }