aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames <>2011-02-06 16:51:22 +0000
committerjames <>2011-02-06 16:51:22 +0000
commit3e5a64c4c299dc50b007ba73debbee5f4b634577 (patch)
tree03308792e0b838ab706884e1e11426f0298e8f56
parent24f96505b629dd579502bc8ef15e3a36cefb769e (diff)
downloadsympathy-3e5a64c4c299dc50b007ba73debbee5f4b634577.tar.gz
sympathy-3e5a64c4c299dc50b007ba73debbee5f4b634577.tar.bz2
sympathy-3e5a64c4c299dc50b007ba73debbee5f4b634577.zip
*** empty log message ***
-rw-r--r--src/raw.c5
-rw-r--r--src/serial.c7
2 files changed, 9 insertions, 3 deletions
diff --git a/src/raw.c b/src/raw.c
index 4f4af5e..bd48355 100644
--- a/src/raw.c
+++ b/src/raw.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
/*
* $Log$
+ * Revision 1.9 2011/02/06 16:51:22 james
+ * *** empty log message ***
+ *
* Revision 1.8 2008/03/10 11:49:33 james
* *** empty log message ***
*
@@ -96,7 +99,7 @@ raw_terminal_read (TTY * _t, void *buf, int len)
red = wrap_read (t->rfd, buf, len);
if (red < 0)
- return -1;
+ return done ? done:-1;
if (!red)
return done;
diff --git a/src/serial.c b/src/serial.c
index b32e48e..731bae7 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
/*
* $Log$
+ * Revision 1.18 2011/02/06 16:51:22 james
+ * *** empty log message ***
+ *
* Revision 1.17 2008/03/10 11:49:33 james
* *** empty log message ***
*
@@ -131,8 +134,8 @@ serial_read (TTY * _t, void *buf, int len)
do {
red = wrap_read (t->fd, buf, len);
- if (red < 0)
- return -1;
+ if (red < 0)
+ return done ? done:-1;
if (!red)
return done;