aboutsummaryrefslogtreecommitdiff
path: root/src/util.c
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2015-09-01 07:42:43 +0300
committerSergey Poznyakoff <gray@gnu.org>2015-09-01 07:42:43 +0300
commit0396591026410f91f7a81b4b150bc7285d9f2278 (patch)
treea960adfc75ff38da7fef5d2dd13a9ebf2a6fd164 /src/util.c
parentf6a8a2cbd2d5ca40ea94900b55b845dd5ca87328 (diff)
downloadcpio-0396591026410f91f7a81b4b150bc7285d9f2278.tar.gz
cpio-0396591026410f91f7a81b4b150bc7285d9f2278.tar.bz2
Include gnulib and paxutils as submodules.
* gnulib: New submodule. * paxutils: New submodule. * .gitignore: Updage * .gitmodules: Update * README-hacking: Update. * bootstrap: Install slightly modified version from the gnulib repo. * bootstrap.conf: Add paxutils-related stuff. * po/.gitignore: Update. * tests/symlink-bad-length.at: Fix expected output. * src/copyin.c: Tiny change. * src/util.c: Likewise.
Diffstat (limited to 'src/util.c')
-rw-r--r--src/util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/util.c b/src/util.c
index 39c9813..d45ec87 100644
--- a/src/util.c
+++ b/src/util.c
@@ -206,7 +206,7 @@ tape_fill_input_buffer (int in_des, int num_bytes)
get_next_reel (in_des);
input_size = rmtread (in_des, input_buffer, num_bytes);
}
- if (input_size < 0)
+ if (input_size == SAFE_READ_ERROR)
error (PAXEXIT_FAILURE, errno, _("read error"));
if (input_size == 0)
error (PAXEXIT_FAILURE, 0, _("premature end of file"));
@@ -224,7 +224,7 @@ disk_fill_input_buffer (int in_des, off_t num_bytes)
in_buff = input_buffer;
num_bytes = (num_bytes < DISK_IO_BLOCK_SIZE) ? num_bytes : DISK_IO_BLOCK_SIZE;
input_size = read (in_des, input_buffer, num_bytes);
- if (input_size < 0)
+ if (input_size == SAFE_READ_ERROR)
{
input_size = 0;
return (-1);

Return to:

Send suggestions and report system problems to the System administrator.