]> git.tuebingen.mpg.de Git - paraslash.git/commitdiff
Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Sun, 17 Jan 2010 20:32:19 +0000 (21:32 +0100)
committerAndre Noll <maan@systemlinux.org>
Sun, 17 Jan 2010 20:32:19 +0000 (21:32 +0100)
1  2 
stdin.c

diff --combined stdin.c
index f66d1bba325f557e09588cf6b256abce8a99bb53,14201a9a6ccc757a26fd437ea2fa7ca24c95c8de..6277f7e70fe3d30030752f6f4955ccdafce65a0e
+++ b/stdin.c
@@@ -9,7 -9,9 +9,7 @@@
  #include <dirent.h> /* readdir() */
  #include <assert.h>
  
 -
  #include "para.h"
 -#include "string.h"
  #include "list.h"
  #include "sched.h"
  #include "fd.h"
@@@ -69,7 -71,7 +69,7 @@@ static void stdin_post_select(struct sc
                return;
        ret = read(STDIN_FILENO, sit->buf + sit->loaded, sit->bufsize - sit->loaded);
        if (ret < 0)
-               t->error = ERRNO_TO_PARA_ERROR(errno);
+               t->error = -ERRNO_TO_PARA_ERROR(errno);
        else if (ret > 0)
                sit->loaded += ret;
        else