projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'meins/next' into next
[paraslash.git]
/
stdout.c
diff --git
a/stdout.c
b/stdout.c
index b1e1bcb6f1edb0f986b4bf840cf8ef3ee57b3c55..d64586bccd9cdd12ffe743247680d8686ee1c002 100644
(file)
--- a/
stdout.c
+++ b/
stdout.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2006-200
8
Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-200
9
Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
@@
-10,7
+10,6
@@
#include <assert.h>
#include "para.h"
#include <assert.h>
#include "para.h"
-#include "string.h"
#include "list.h"
#include "sched.h"
#include "fd.h"
#include "list.h"
#include "sched.h"
#include "fd.h"
@@
-62,20
+61,20
@@
static void stdout_post_select(struct sched *s, struct task *t)
t->error = 0;
if (!sot->check_fd) {
t->error = 0;
if (!sot->check_fd) {
- if (*sot->input_error < 0)
+ if (
!*sot->loaded &&
*sot->input_error < 0)
t->error = *sot->input_error;
return;
}
if (!FD_ISSET(STDOUT_FILENO, &s->wfds))
return;
t->error = *sot->input_error;
return;
}
if (!FD_ISSET(STDOUT_FILENO, &s->wfds))
return;
- ret = write(STDOUT_FILENO,
sot->buf
, *sot->loaded);
+ ret = write(STDOUT_FILENO,
*sot->bufp
, *sot->loaded);
if (ret < 0) {
t->error = -ERRNO_TO_PARA_ERROR(errno);
return;
}
*sot->loaded -= ret;
if (*sot->loaded)
if (ret < 0) {
t->error = -ERRNO_TO_PARA_ERROR(errno);
return;
}
*sot->loaded -= ret;
if (*sot->loaded)
- memmove(
sot->buf, sot->buf
+ ret, *sot->loaded);
+ memmove(
*sot->bufp, *sot->bufp
+ ret, *sot->loaded);
}
/**
}
/**