|
|
@@ -48,86 +48,86 @@ static inline size_t special_min(size_t a, size_t b)
|
|
|
is an error reading or writing the files. */
|
|
|
static int inf(FILE *source, FILE *dest, size_t limit, size_t skip)
|
|
|
{
|
|
|
- int ret;
|
|
|
- size_t have;
|
|
|
- z_stream strm;
|
|
|
- unsigned char in[CHUNK];
|
|
|
- unsigned char out[CHUNK];
|
|
|
+ int ret;
|
|
|
+ size_t have;
|
|
|
+ z_stream strm;
|
|
|
+ unsigned char in[CHUNK];
|
|
|
+ unsigned char out[CHUNK];
|
|
|
|
|
|
- /* allocate inflate state */
|
|
|
- strm.zalloc = Z_NULL;
|
|
|
- strm.zfree = Z_NULL;
|
|
|
- strm.opaque = Z_NULL;
|
|
|
- strm.avail_in = 0;
|
|
|
- strm.next_in = Z_NULL;
|
|
|
- ret = inflateInit(&strm);
|
|
|
- if (ret != Z_OK)
|
|
|
- return ret;
|
|
|
+ /* allocate inflate state */
|
|
|
+ strm.zalloc = Z_NULL;
|
|
|
+ strm.zfree = Z_NULL;
|
|
|
+ strm.opaque = Z_NULL;
|
|
|
+ strm.avail_in = 0;
|
|
|
+ strm.next_in = Z_NULL;
|
|
|
+ ret = inflateInit(&strm);
|
|
|
+ if (ret != Z_OK)
|
|
|
+ return ret;
|
|
|
|
|
|
- /* decompress until deflate stream ends or end of file */
|
|
|
- do {
|
|
|
- strm.avail_in = fread(in, 1, CHUNK, source);
|
|
|
- if (ferror(source)) {
|
|
|
- (void)inflateEnd(&strm);
|
|
|
- return Z_ERRNO;
|
|
|
- }
|
|
|
- if (strm.avail_in == 0)
|
|
|
- break;
|
|
|
- strm.next_in = in;
|
|
|
+ /* decompress until deflate stream ends or end of file */
|
|
|
+ do {
|
|
|
+ strm.avail_in = fread(in, 1, CHUNK, source);
|
|
|
+ if (ferror(source)) {
|
|
|
+ (void)inflateEnd(&strm);
|
|
|
+ return Z_ERRNO;
|
|
|
+ }
|
|
|
+ if (strm.avail_in == 0)
|
|
|
+ break;
|
|
|
+ strm.next_in = in;
|
|
|
|
|
|
- /* run inflate() on input until output buffer not full */
|
|
|
- do {
|
|
|
- strm.avail_out = CHUNK;
|
|
|
- strm.next_out = out;
|
|
|
- ret = inflate(&strm, Z_NO_FLUSH);
|
|
|
- assert(ret != Z_STREAM_ERROR); /* state not clobbered */
|
|
|
- switch (ret) {
|
|
|
- case Z_NEED_DICT:
|
|
|
- ret = Z_DATA_ERROR; /* and fall through */
|
|
|
- case Z_DATA_ERROR:
|
|
|
- case Z_MEM_ERROR:
|
|
|
- (void)inflateEnd(&strm);
|
|
|
- return ret;
|
|
|
- }
|
|
|
- have = special_min(limit, CHUNK - strm.avail_out) - skip;
|
|
|
- if (fwrite(&out[skip], have, 1, dest) != 1 || ferror(dest)) {
|
|
|
- (void)inflateEnd(&strm);
|
|
|
- return Z_ERRNO;
|
|
|
- }
|
|
|
- skip = 0;
|
|
|
- limit -= have;
|
|
|
- } while (strm.avail_out == 0 && limit > 0);
|
|
|
+ /* run inflate() on input until output buffer not full */
|
|
|
+ do {
|
|
|
+ strm.avail_out = CHUNK;
|
|
|
+ strm.next_out = out;
|
|
|
+ ret = inflate(&strm, Z_NO_FLUSH);
|
|
|
+ assert(ret != Z_STREAM_ERROR); /* state not clobbered */
|
|
|
+ switch (ret) {
|
|
|
+ case Z_NEED_DICT:
|
|
|
+ ret = Z_DATA_ERROR; /* and fall through */
|
|
|
+ case Z_DATA_ERROR:
|
|
|
+ case Z_MEM_ERROR:
|
|
|
+ (void)inflateEnd(&strm);
|
|
|
+ return ret;
|
|
|
+ }
|
|
|
+ have = special_min(limit, CHUNK - strm.avail_out) - skip;
|
|
|
+ if (fwrite(&out[skip], have, 1, dest) != 1 || ferror(dest)) {
|
|
|
+ (void)inflateEnd(&strm);
|
|
|
+ return Z_ERRNO;
|
|
|
+ }
|
|
|
+ skip = 0;
|
|
|
+ limit -= have;
|
|
|
+ } while (strm.avail_out == 0 && limit > 0);
|
|
|
|
|
|
- /* done when inflate() says it's done */
|
|
|
- } while (ret != Z_STREAM_END && limit > 0);
|
|
|
+ /* done when inflate() says it's done */
|
|
|
+ } while (ret != Z_STREAM_END && limit > 0);
|
|
|
|
|
|
- /* clean up and return */
|
|
|
- (void)inflateEnd(&strm);
|
|
|
- return (limit == 0 ? Z_OK : (ret == Z_STREAM_END ? Z_OK : Z_DATA_ERROR));
|
|
|
+ /* clean up and return */
|
|
|
+ (void)inflateEnd(&strm);
|
|
|
+ return (limit == 0 ? Z_OK : (ret == Z_STREAM_END ? Z_OK : Z_DATA_ERROR));
|
|
|
}
|
|
|
|
|
|
/* report a zlib or i/o error */
|
|
|
static void zerr(int ret)
|
|
|
{
|
|
|
- switch (ret) {
|
|
|
- case Z_ERRNO:
|
|
|
- if (ferror(stdin))
|
|
|
- fputs("error reading stdin\n", stderr);
|
|
|
- if (ferror(stdout))
|
|
|
- fputs("error writing stdout\n", stderr);
|
|
|
- break;
|
|
|
- case Z_STREAM_ERROR:
|
|
|
- fputs("invalid compression level\n", stderr);
|
|
|
- break;
|
|
|
- case Z_DATA_ERROR:
|
|
|
- fputs("invalid or incomplete deflate data\n", stderr);
|
|
|
- break;
|
|
|
- case Z_MEM_ERROR:
|
|
|
- fputs("out of memory\n", stderr);
|
|
|
- break;
|
|
|
- case Z_VERSION_ERROR:
|
|
|
- fputs("zlib version mismatch!\n", stderr);
|
|
|
- }
|
|
|
+ switch (ret) {
|
|
|
+ case Z_ERRNO:
|
|
|
+ if (ferror(stdin))
|
|
|
+ fputs("error reading stdin\n", stderr);
|
|
|
+ if (ferror(stdout))
|
|
|
+ fputs("error writing stdout\n", stderr);
|
|
|
+ break;
|
|
|
+ case Z_STREAM_ERROR:
|
|
|
+ fputs("invalid compression level\n", stderr);
|
|
|
+ break;
|
|
|
+ case Z_DATA_ERROR:
|
|
|
+ fputs("invalid or incomplete deflate data\n", stderr);
|
|
|
+ break;
|
|
|
+ case Z_MEM_ERROR:
|
|
|
+ fputs("out of memory\n", stderr);
|
|
|
+ break;
|
|
|
+ case Z_VERSION_ERROR:
|
|
|
+ fputs("zlib version mismatch!\n", stderr);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
static unsigned int get_num(char *str)
|