lzip/zutils
1
0
Fork 0
Code Issues Activity

Merging upstream version 1.3~pre1.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-24 05:48:02 +01:00
parent 10a38762e2
commit 2cbf3271a3
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
31 changed files with 976 additions and 1312 deletions
Download patch file Download diff file Expand all files Collapse all files

22
zutils.cc
View file

@ -3,7 +3,7 @@
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
the Free Software Foundation, either version 3 of the License, or
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@ -89,17 +89,17 @@ int parse_format_type( const std::string & arg )
//
int readblock( const int fd, uint8_t * const buf, const int size )
{
int rest = size;
int sz = 0;
errno = 0;
while( rest > 0 )
while( sz < size )
{
const int n = read( fd, buf + size - rest, rest );
if( n > 0 ) rest -= n;
const int n = read( fd, buf + sz, size - sz );
if( n > 0 ) sz += n;
else if( n == 0 ) break; // EOF
else if( errno != EINTR ) break;
errno = 0;
}
return size - rest;
return sz;
}
@ -108,16 +108,16 @@ int readblock( const int fd, uint8_t * const buf, const int size )
//
int writeblock( const int fd, const uint8_t * const buf, const int size )
{
int rest = size;
int sz = 0;
errno = 0;
while( rest > 0 )
while( sz < size )
{
const int n = write( fd, buf + size - rest, rest );
if( n > 0 ) rest -= n;
const int n = write( fd, buf + sz, size - sz );
if( n > 0 ) sz += n;
else if( n < 0 && errno != EINTR ) break;
errno = 0;
}
return size - rest;
return sz;
}