lzip/plzip
1
0
Fork 0
Code Issues Activity

Merging upstream version 1.2~rc2.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-24 04:04:25 +01:00
parent ba4a53106a
commit fc3dff6861
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
20 changed files with 918 additions and 1253 deletions
Download patch file Download diff file Expand all files Collapse all files

22
compress.cc
View file

@ -4,7 +4,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,
@ -45,17 +45,17 @@
//
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;
}
@ -64,16 +64,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;
}