Subversion Repositories SvarDOS

Compare Revisions

Ignore whitespace Rev 1608 → Rev 1609

/pkg/trunk/inf.c
14,8 → 14,6
 
#include "inf.h"
 
#define CHUNK 16384
 
/* Decompress from file source to file dest until stream ends or EOF.
* inf() returns Z_OK on success, Z_MEM_ERROR if memory could not be allocated
* for processing, Z_DATA_ERROR if the deflate data is invalid or incomplete,
22,12 → 20,10
* Z_VERSION_ERROR if the version of zlib.h and the version of the library
* linked do not match, or Z_ERRNO if there is an error reading or writing the
* files. */
int inf(FILE *source, FILE *dest, unsigned char *buff32K, unsigned long *cksum, long streamlen) {
int inf(FILE *source, FILE *dest, unsigned char *buffin, unsigned short buffinsz, unsigned char *buffout, unsigned short buffoutsz, unsigned long *cksum, long streamlen) {
int ret;
unsigned int have;
z_stream strm;
unsigned char *in = buff32K;
unsigned char *out = buff32K + CHUNK;
 
/* allocate inflate state */
strm.zalloc = Z_NULL;
40,7 → 36,7
 
/* decompress until deflate stream ends or end of file */
do {
strm.avail_in = fread(in, 1, (streamlen > CHUNK ? CHUNK : streamlen), source);
strm.avail_in = fread(buffin, 1, (streamlen > buffinsz ? buffinsz : streamlen), source);
if (ferror(source)) {
(void)inflateEnd(&strm);
return(Z_ERRNO);
47,12 → 43,12
}
streamlen -= strm.avail_in;
if (strm.avail_in == 0) break;
strm.next_in = in;
strm.next_in = buffin;
 
/* run inflate() on input until output buffer not full */
do {
strm.avail_out = CHUNK;
strm.next_out = out;
strm.avail_out = buffoutsz;
strm.next_out = buffout;
ret = inflate(&strm, Z_NO_FLUSH);
switch (ret) {
case Z_NEED_DICT:
62,13 → 58,13
(void)inflateEnd(&strm);
return(ret);
}
have = CHUNK - strm.avail_out;
if ((fwrite(out, 1, have, dest) != have) || (ferror(dest))) {
have = buffoutsz - strm.avail_out;
if ((fwrite(buffout, 1, have, dest) != have) || (ferror(dest))) {
(void)inflateEnd(&strm);
return(Z_ERRNO);
}
/* feed the CRC32 */
crc32_feed(cksum, out, have);
crc32_feed(cksum, buffout, have);
} while (strm.avail_out == 0);
 
/* done when inflate() says it's done */
/pkg/trunk/inf.h
8,6 → 8,6
* Z_VERSION_ERROR if the version of zlib.h and the version of the library
* linked do not match, or Z_ERRNO if there is an error reading or writing the
* files. */
int inf(FILE *source, FILE *dest, unsigned char *buff32k, unsigned long *cksum, long streamlen);
int inf(FILE *source, FILE *dest, unsigned char *buffin, unsigned short buffinsz, unsigned char *buffout, unsigned short buffoutsz, unsigned long *cksum, long streamlen);
 
#endif
/pkg/trunk/libunzip.c
164,7 → 164,7
 
/* unzips a file. zipfd points to the open zip file, curzipnode to the entry to extract, and fulldestfilename is the destination file where to unzip it. returns 0 on success, non-zero otherwise. */
int zip_unzip(FILE *zipfd, struct ziplist *curzipnode, const char *fulldestfilename) {
#define buffsize 32 * 1024l /* MUST be at least 32K */
#define buffsize (12 * 1024) /* bigger buffer is better, but pkg has to work on a 256K PC so let's not get too crazy with RAM */
FILE *filefd;
unsigned long cksum;
int extract_res;
215,7 → 215,8
i += toread;
}
} else if (curzipnode->compmethod == 8) { /* if the file is deflated, inflate it */
extract_res = inf(zipfd, filefd, buff, &cksum, curzipnode->compressedfilelen);
/* use 1/3 of my buffer as input and 2/3 as output */
extract_res = inf(zipfd, filefd, buff, buffsize / 3, buff + (buffsize / 3), buffsize / 3 * 2, &cksum, curzipnode->compressedfilelen);
}
 
/* clean up memory, close the dst file and terminates crc32 */
237,6 → 238,7
filetimestamp.modtime = curzipnode->timestamp;
utime(fulldestfilename, &filetimestamp);
return(0);
#undef buffsize
}
 
 
/pkg/trunk/version.h
4,7 → 4,7
#ifndef COMMON_H_SENTINEL
#define COMMON_H_SENTINEL
 
#define PVER "20231122"
#define PVER "20231124"
#define PDATE "2012-2023"
 
#endif