summaryrefslogtreecommitdiffstats
path: root/zutils.cc
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2015-11-08 04:31:16 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2015-11-08 04:31:16 +0000
commit50c0d5bace5875eb0a3c4c7aafa564244e46e59c (patch)
tree9bf9dc3a57107e9c8d8a76f5bff5cca6eee9d5f1 /zutils.cc
parentAdding debian version 1.2~pre3-1. (diff)
downloadzutils-50c0d5bace5875eb0a3c4c7aafa564244e46e59c.tar.xz
zutils-50c0d5bace5875eb0a3c4c7aafa564244e46e59c.zip
Merging upstream version 1.2.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to '')
-rw-r--r--zutils.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/zutils.cc b/zutils.cc
index afce7fc..069a010 100644
--- a/zutils.cc
+++ b/zutils.cc
@@ -1,5 +1,5 @@
/* Zutils - Utilities dealing with compressed files
- Copyright (C) 2009, 2010, 2011, 2012, 2013 Antonio Diaz Diaz.
+ Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz.
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
@@ -96,7 +96,7 @@ int readblock( const int fd, uint8_t * const buf, const int size )
const int n = read( fd, buf + size - rest, rest );
if( n > 0 ) rest -= n;
else if( n == 0 ) break; // EOF
- else if( errno != EINTR && errno != EAGAIN ) break;
+ else if( errno != EINTR ) break;
errno = 0;
}
return size - rest;
@@ -114,7 +114,7 @@ int writeblock( const int fd, const uint8_t * const buf, const int size )
{
const int n = write( fd, buf + size - rest, rest );
if( n > 0 ) rest -= n;
- else if( n < 0 && errno != EINTR && errno != EAGAIN ) break;
+ else if( n < 0 && errno != EINTR ) break;
errno = 0;
}
return size - rest;