Style
This commit is contained in:
parent
8e027f6474
commit
fedbfe4059
@ -32,8 +32,11 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#define IBUFSIZ 2048 /* Defailt input buffer size */
|
/* Defailt input buffer size */
|
||||||
#define OBUFSIZ 2048 /* Default output buffer size */
|
#define IBUFSIZ 2048
|
||||||
|
|
||||||
|
/* Default output buffer size */
|
||||||
|
#define OBUFSIZ 2048
|
||||||
|
|
||||||
/* Defines for third byte of header */
|
/* Defines for third byte of header */
|
||||||
#define MAGIC_1 (char_type)'\037' /* First byte of compressed file */
|
#define MAGIC_1 (char_type)'\037' /* First byte of compressed file */
|
||||||
@ -44,7 +47,6 @@
|
|||||||
/* a fourth header byte (for expansion). */
|
/* a fourth header byte (for expansion). */
|
||||||
#define BLOCK_MODE 0x80 /* Block compresssion if table is full and */
|
#define BLOCK_MODE 0x80 /* Block compresssion if table is full and */
|
||||||
/* compression rate is dropping flush tables */
|
/* compression rate is dropping flush tables */
|
||||||
|
|
||||||
/* the next two codes should not be changed lightly, as they must not */
|
/* the next two codes should not be changed lightly, as they must not */
|
||||||
/* lie within the contiguous general code space. */
|
/* lie within the contiguous general code space. */
|
||||||
#define FIRST 257 /* first free entry */
|
#define FIRST 257 /* first free entry */
|
||||||
@ -53,9 +55,7 @@
|
|||||||
#define INIT_BITS 9 /* initial number of bits/code */
|
#define INIT_BITS 9 /* initial number of bits/code */
|
||||||
|
|
||||||
|
|
||||||
/*
|
/* machine variants which require cc -Dmachine: pdp11, z8000, DOS */
|
||||||
* machine variants which require cc -Dmachine: pdp11, z8000, DOS
|
|
||||||
*/
|
|
||||||
#define FAST
|
#define FAST
|
||||||
|
|
||||||
#define HBITS 17 /* 50% occupancy */
|
#define HBITS 17 /* 50% occupancy */
|
||||||
@ -64,34 +64,32 @@
|
|||||||
#define HPRIME 9941
|
#define HPRIME 9941
|
||||||
#define BITS 16
|
#define BITS 16
|
||||||
#undef MAXSEG_64K
|
#undef MAXSEG_64K
|
||||||
|
|
||||||
typedef long int code_int;
|
|
||||||
|
|
||||||
typedef long int count_int;
|
|
||||||
typedef long int cmp_code_int;
|
|
||||||
|
|
||||||
typedef unsigned char char_type;
|
|
||||||
|
|
||||||
#define MAXCODE(n) (1L << (n))
|
#define MAXCODE(n) (1L << (n))
|
||||||
|
|
||||||
|
/* Block compress mode -C compatible with 2.0 */
|
||||||
|
int block_mode = BLOCK_MODE;
|
||||||
|
|
||||||
|
/* user settable max # bits/code */
|
||||||
|
int maxbits = BITS;
|
||||||
|
|
||||||
|
/* Exitcode of compress (-1 no file compressed) */
|
||||||
|
int exit_code = -1;
|
||||||
|
|
||||||
|
/* Input buffer */
|
||||||
|
unsigned char inbuf[IBUFSIZ + 64];
|
||||||
|
|
||||||
|
/* Output buffer */
|
||||||
|
unsigned char outbuf[OBUFSIZ + 2048];
|
||||||
|
|
||||||
|
|
||||||
int block_mode = BLOCK_MODE;/* Block compress mode -C compatible with 2.0*/
|
long int htab[HSIZE];
|
||||||
int maxbits = BITS; /* user settable max # bits/code */
|
|
||||||
int exit_code = -1; /* Exitcode of compress (-1 no file compressed) */
|
|
||||||
|
|
||||||
char_type inbuf[IBUFSIZ+64]; /* Input buffer */
|
|
||||||
char_type outbuf[OBUFSIZ+2048];/* Output buffer */
|
|
||||||
|
|
||||||
|
|
||||||
count_int htab[HSIZE];
|
|
||||||
unsigned short codetab[HSIZE];
|
unsigned short codetab[HSIZE];
|
||||||
|
|
||||||
#define htabof(i) htab[i]
|
#define htabof(i) htab[i]
|
||||||
#define codetabof(i) codetab[i]
|
#define codetabof(i) codetab[i]
|
||||||
#define tab_prefixof(i) codetabof(i)
|
#define tab_prefixof(i) codetabof(i)
|
||||||
#define tab_suffixof(i) ((char_type *)(htab))[i]
|
#define tab_suffixof(i) ((unsigned char *)(htab))[i]
|
||||||
#define de_stack ((char_type *)&(htab[HSIZE-1]))
|
#define de_stack ((unsigned char *)&(htab[HSIZE-1]))
|
||||||
#define clear_htab() memset(htab, -1, sizeof(htab))
|
#define clear_htab() memset(htab, -1, sizeof(htab))
|
||||||
#define clear_tab_prefixof() memset(codetab, 0, 256);
|
#define clear_tab_prefixof() memset(codetab, 0, 256);
|
||||||
|
|
||||||
@ -105,19 +103,19 @@ unsigned short codetab[HSIZE];
|
|||||||
|
|
||||||
extern int uncompress(int fd_in, int fd_out)
|
extern int uncompress(int fd_in, int fd_out)
|
||||||
{
|
{
|
||||||
char_type *stackp;
|
unsigned char *stackp;
|
||||||
code_int code;
|
long int code;
|
||||||
int finchar;
|
int finchar;
|
||||||
code_int oldcode;
|
long int oldcode;
|
||||||
code_int incode;
|
long int incode;
|
||||||
int inbits;
|
int inbits;
|
||||||
int posbits;
|
int posbits;
|
||||||
int outpos;
|
int outpos;
|
||||||
int insize;
|
int insize;
|
||||||
int bitmask;
|
int bitmask;
|
||||||
code_int free_ent;
|
long int free_ent;
|
||||||
code_int maxcode;
|
long int maxcode;
|
||||||
code_int maxmaxcode;
|
long int maxmaxcode;
|
||||||
int n_bits;
|
int n_bits;
|
||||||
int rsize = 0;
|
int rsize = 0;
|
||||||
|
|
||||||
@ -129,14 +127,12 @@ extern int uncompress(int fd_in, int fd_out)
|
|||||||
block_mode = inbuf[0] & BLOCK_MODE;
|
block_mode = inbuf[0] & BLOCK_MODE;
|
||||||
maxmaxcode = MAXCODE(maxbits);
|
maxmaxcode = MAXCODE(maxbits);
|
||||||
|
|
||||||
if (maxbits > BITS)
|
if (maxbits > BITS) {
|
||||||
{
|
error_msg("compressed with %d bits, can only handle %d bits", maxbits,
|
||||||
fprintf(stderr, "compressed with %d bits, can only handle %d bits\n", maxbits, BITS);
|
BITS);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
//fprintf(stderr, "Bits: %d, block_mode: %d\n", maxbits, block_mode );
|
|
||||||
|
|
||||||
maxcode = MAXCODE(n_bits = INIT_BITS) - 1;
|
maxcode = MAXCODE(n_bits = INIT_BITS) - 1;
|
||||||
bitmask = (1 << n_bits) - 1;
|
bitmask = (1 << n_bits) - 1;
|
||||||
oldcode = -1;
|
oldcode = -1;
|
||||||
@ -146,14 +142,14 @@ extern int uncompress(int fd_in, int fd_out)
|
|||||||
|
|
||||||
free_ent = ((block_mode) ? FIRST : 256);
|
free_ent = ((block_mode) ? FIRST : 256);
|
||||||
|
|
||||||
clear_tab_prefixof(); /* As above, initialize the first
|
/* As above, initialize the first 256 entries in the table. */
|
||||||
256 entries in the table. */
|
clear_tab_prefixof();
|
||||||
|
|
||||||
for (code = 255 ; code >= 0 ; --code)
|
for (code = 255; code >= 0; --code) {
|
||||||
tab_suffixof(code) = (char_type)code;
|
tab_suffixof(code) = (unsigned char) code;
|
||||||
|
}
|
||||||
|
|
||||||
do
|
do {
|
||||||
{
|
|
||||||
resetbuf:;
|
resetbuf:;
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
@ -169,8 +165,7 @@ resetbuf: ;
|
|||||||
posbits = 0;
|
posbits = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (insize < (int) sizeof(inbuf)-IBUFSIZ)
|
if (insize < (int) sizeof(inbuf) - IBUFSIZ) {
|
||||||
{
|
|
||||||
rsize = read(fd_in, inbuf + insize, IBUFSIZ);
|
rsize = read(fd_in, inbuf + insize, IBUFSIZ);
|
||||||
insize += rsize;
|
insize += rsize;
|
||||||
}
|
}
|
||||||
@ -178,42 +173,43 @@ resetbuf: ;
|
|||||||
inbits = ((rsize > 0) ? (insize - insize % n_bits) << 3 :
|
inbits = ((rsize > 0) ? (insize - insize % n_bits) << 3 :
|
||||||
(insize << 3) - (n_bits - 1));
|
(insize << 3) - (n_bits - 1));
|
||||||
|
|
||||||
while (inbits > posbits)
|
while (inbits > posbits) {
|
||||||
{
|
if (free_ent > maxcode) {
|
||||||
if (free_ent > maxcode)
|
posbits =
|
||||||
{
|
((posbits - 1) +
|
||||||
posbits = ((posbits-1) + ((n_bits<<3) -
|
((n_bits << 3) -
|
||||||
(posbits - 1 + (n_bits << 3)) % (n_bits << 3)));
|
(posbits - 1 + (n_bits << 3)) % (n_bits << 3)));
|
||||||
|
|
||||||
++n_bits;
|
++n_bits;
|
||||||
if (n_bits == maxbits)
|
if (n_bits == maxbits) {
|
||||||
maxcode = maxmaxcode;
|
maxcode = maxmaxcode;
|
||||||
else
|
} else {
|
||||||
maxcode = MAXCODE(n_bits) - 1;
|
maxcode = MAXCODE(n_bits) - 1;
|
||||||
|
}
|
||||||
bitmask = (1 << n_bits) - 1;
|
bitmask = (1 << n_bits) - 1;
|
||||||
goto resetbuf;
|
goto resetbuf;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
{
|
{
|
||||||
char_type *p = &inbuf[posbits>>3];
|
unsigned char *p = &inbuf[posbits >> 3];
|
||||||
code = ((((long)(p[0]))|((long)(p[1])<<8)|((long)(p[2])<<16))>>(posbits&0x7))&bitmask;
|
|
||||||
|
code =
|
||||||
|
((((long) (p[0])) | ((long) (p[1]) << 8) |
|
||||||
|
((long) (p[2]) << 16)) >> (posbits & 0x7)) & bitmask;
|
||||||
}
|
}
|
||||||
posbits += n_bits;
|
posbits += n_bits;
|
||||||
|
|
||||||
|
|
||||||
if (oldcode == -1)
|
if (oldcode == -1) {
|
||||||
{
|
outbuf[outpos++] = (unsigned char) (finchar =
|
||||||
outbuf[outpos++] = (char_type)(finchar = (int)(oldcode = code));
|
(int) (oldcode = code));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (code == CLEAR && block_mode)
|
if (code == CLEAR && block_mode) {
|
||||||
{
|
|
||||||
clear_tab_prefixof();
|
clear_tab_prefixof();
|
||||||
free_ent = FIRST - 1;
|
free_ent = FIRST - 1;
|
||||||
posbits = ((posbits-1) + ((n_bits<<3) -
|
posbits =
|
||||||
|
((posbits - 1) +
|
||||||
|
((n_bits << 3) -
|
||||||
(posbits - 1 + (n_bits << 3)) % (n_bits << 3)));
|
(posbits - 1 + (n_bits << 3)) % (n_bits << 3)));
|
||||||
maxcode = MAXCODE(n_bits = INIT_BITS) - 1;
|
maxcode = MAXCODE(n_bits = INIT_BITS) - 1;
|
||||||
bitmask = (1 << n_bits) - 1;
|
bitmask = (1 << n_bits) - 1;
|
||||||
@ -223,78 +219,73 @@ resetbuf: ;
|
|||||||
incode = code;
|
incode = code;
|
||||||
stackp = de_stack;
|
stackp = de_stack;
|
||||||
|
|
||||||
if (code >= free_ent) /* Special case for KwKwK string. */
|
/* Special case for KwKwK string. */
|
||||||
{
|
if (code >= free_ent) {
|
||||||
if (code > free_ent)
|
if (code > free_ent) {
|
||||||
{
|
unsigned char *p;
|
||||||
char_type *p;
|
|
||||||
|
|
||||||
posbits -= n_bits;
|
posbits -= n_bits;
|
||||||
p = &inbuf[posbits >> 3];
|
p = &inbuf[posbits >> 3];
|
||||||
|
|
||||||
fprintf(stderr, "insize:%d posbits:%d inbuf:%02X %02X %02X %02X %02X (%d)\n", insize, posbits,
|
error_msg
|
||||||
p[-1],p[0],p[1],p[2],p[3], (posbits&07));
|
("insize:%d posbits:%d inbuf:%02X %02X %02X %02X %02X (%d)",
|
||||||
fprintf(stderr, "uncompress: corrupt input\n");
|
insize, posbits, p[-1], p[0], p[1], p[2], p[3],
|
||||||
|
(posbits & 07));
|
||||||
|
error_msg("uncompress: corrupt input");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
*--stackp = (char_type)finchar;
|
*--stackp = (unsigned char) finchar;
|
||||||
code = oldcode;
|
code = oldcode;
|
||||||
}
|
}
|
||||||
|
|
||||||
while ((cmp_code_int)code >= (cmp_code_int)256)
|
/* Generate output characters in reverse order */
|
||||||
{ /* Generate output characters in reverse order */
|
while ((long int) code >= (long int) 256) {
|
||||||
*--stackp = tab_suffixof(code);
|
*--stackp = tab_suffixof(code);
|
||||||
code = tab_prefixof(code);
|
code = tab_prefixof(code);
|
||||||
}
|
}
|
||||||
|
|
||||||
*--stackp = (char_type)(finchar = tab_suffixof(code));
|
*--stackp = (unsigned char) (finchar = tab_suffixof(code));
|
||||||
|
|
||||||
/* And put them out in forward order */
|
/* And put them out in forward order */
|
||||||
|
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (outpos+(i = (de_stack-stackp)) >= OBUFSIZ)
|
if (outpos + (i = (de_stack - stackp)) >= OBUFSIZ) {
|
||||||
{
|
do {
|
||||||
do
|
if (i > OBUFSIZ - outpos) {
|
||||||
{
|
i = OBUFSIZ - outpos;
|
||||||
if (i > OBUFSIZ-outpos) i = OBUFSIZ-outpos;
|
}
|
||||||
|
|
||||||
if (i > 0)
|
if (i > 0) {
|
||||||
{
|
|
||||||
memcpy(outbuf + outpos, stackp, i);
|
memcpy(outbuf + outpos, stackp, i);
|
||||||
outpos += i;
|
outpos += i;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (outpos >= OBUFSIZ)
|
if (outpos >= OBUFSIZ) {
|
||||||
{
|
|
||||||
write(fd_out, outbuf, outpos);
|
write(fd_out, outbuf, outpos);
|
||||||
outpos = 0;
|
outpos = 0;
|
||||||
}
|
}
|
||||||
stackp += i;
|
stackp += i;
|
||||||
}
|
} while ((i = (de_stack - stackp)) > 0);
|
||||||
while ((i = (de_stack-stackp)) > 0);
|
} else {
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
memcpy(outbuf + outpos, stackp, i);
|
memcpy(outbuf + outpos, stackp, i);
|
||||||
outpos += i;
|
outpos += i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((code = free_ent) < maxmaxcode) /* Generate the new entry. */
|
/* Generate the new entry. */
|
||||||
{
|
if ((code = free_ent) < maxmaxcode) {
|
||||||
tab_prefixof(code) = (unsigned short) oldcode;
|
tab_prefixof(code) = (unsigned short) oldcode;
|
||||||
tab_suffixof(code) = (char_type)finchar;
|
tab_suffixof(code) = (unsigned char) finchar;
|
||||||
free_ent = code + 1;
|
free_ent = code + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
oldcode = incode; /* Remember previous code. */
|
/* Remember previous code. */
|
||||||
|
oldcode = incode;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
} while (rsize > 0);
|
||||||
while (rsize > 0);
|
|
||||||
|
|
||||||
if (outpos > 0) {
|
if (outpos > 0) {
|
||||||
write(fd_out, outbuf, outpos);
|
write(fd_out, outbuf, outpos);
|
||||||
|
@ -32,8 +32,11 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#define IBUFSIZ 2048 /* Defailt input buffer size */
|
/* Defailt input buffer size */
|
||||||
#define OBUFSIZ 2048 /* Default output buffer size */
|
#define IBUFSIZ 2048
|
||||||
|
|
||||||
|
/* Default output buffer size */
|
||||||
|
#define OBUFSIZ 2048
|
||||||
|
|
||||||
/* Defines for third byte of header */
|
/* Defines for third byte of header */
|
||||||
#define MAGIC_1 (char_type)'\037' /* First byte of compressed file */
|
#define MAGIC_1 (char_type)'\037' /* First byte of compressed file */
|
||||||
@ -44,7 +47,6 @@
|
|||||||
/* a fourth header byte (for expansion). */
|
/* a fourth header byte (for expansion). */
|
||||||
#define BLOCK_MODE 0x80 /* Block compresssion if table is full and */
|
#define BLOCK_MODE 0x80 /* Block compresssion if table is full and */
|
||||||
/* compression rate is dropping flush tables */
|
/* compression rate is dropping flush tables */
|
||||||
|
|
||||||
/* the next two codes should not be changed lightly, as they must not */
|
/* the next two codes should not be changed lightly, as they must not */
|
||||||
/* lie within the contiguous general code space. */
|
/* lie within the contiguous general code space. */
|
||||||
#define FIRST 257 /* first free entry */
|
#define FIRST 257 /* first free entry */
|
||||||
@ -53,9 +55,7 @@
|
|||||||
#define INIT_BITS 9 /* initial number of bits/code */
|
#define INIT_BITS 9 /* initial number of bits/code */
|
||||||
|
|
||||||
|
|
||||||
/*
|
/* machine variants which require cc -Dmachine: pdp11, z8000, DOS */
|
||||||
* machine variants which require cc -Dmachine: pdp11, z8000, DOS
|
|
||||||
*/
|
|
||||||
#define FAST
|
#define FAST
|
||||||
|
|
||||||
#define HBITS 17 /* 50% occupancy */
|
#define HBITS 17 /* 50% occupancy */
|
||||||
@ -64,34 +64,32 @@
|
|||||||
#define HPRIME 9941
|
#define HPRIME 9941
|
||||||
#define BITS 16
|
#define BITS 16
|
||||||
#undef MAXSEG_64K
|
#undef MAXSEG_64K
|
||||||
|
|
||||||
typedef long int code_int;
|
|
||||||
|
|
||||||
typedef long int count_int;
|
|
||||||
typedef long int cmp_code_int;
|
|
||||||
|
|
||||||
typedef unsigned char char_type;
|
|
||||||
|
|
||||||
#define MAXCODE(n) (1L << (n))
|
#define MAXCODE(n) (1L << (n))
|
||||||
|
|
||||||
|
/* Block compress mode -C compatible with 2.0 */
|
||||||
|
int block_mode = BLOCK_MODE;
|
||||||
|
|
||||||
|
/* user settable max # bits/code */
|
||||||
|
int maxbits = BITS;
|
||||||
|
|
||||||
|
/* Exitcode of compress (-1 no file compressed) */
|
||||||
|
int exit_code = -1;
|
||||||
|
|
||||||
|
/* Input buffer */
|
||||||
|
unsigned char inbuf[IBUFSIZ + 64];
|
||||||
|
|
||||||
|
/* Output buffer */
|
||||||
|
unsigned char outbuf[OBUFSIZ + 2048];
|
||||||
|
|
||||||
|
|
||||||
int block_mode = BLOCK_MODE;/* Block compress mode -C compatible with 2.0*/
|
long int htab[HSIZE];
|
||||||
int maxbits = BITS; /* user settable max # bits/code */
|
|
||||||
int exit_code = -1; /* Exitcode of compress (-1 no file compressed) */
|
|
||||||
|
|
||||||
char_type inbuf[IBUFSIZ+64]; /* Input buffer */
|
|
||||||
char_type outbuf[OBUFSIZ+2048];/* Output buffer */
|
|
||||||
|
|
||||||
|
|
||||||
count_int htab[HSIZE];
|
|
||||||
unsigned short codetab[HSIZE];
|
unsigned short codetab[HSIZE];
|
||||||
|
|
||||||
#define htabof(i) htab[i]
|
#define htabof(i) htab[i]
|
||||||
#define codetabof(i) codetab[i]
|
#define codetabof(i) codetab[i]
|
||||||
#define tab_prefixof(i) codetabof(i)
|
#define tab_prefixof(i) codetabof(i)
|
||||||
#define tab_suffixof(i) ((char_type *)(htab))[i]
|
#define tab_suffixof(i) ((unsigned char *)(htab))[i]
|
||||||
#define de_stack ((char_type *)&(htab[HSIZE-1]))
|
#define de_stack ((unsigned char *)&(htab[HSIZE-1]))
|
||||||
#define clear_htab() memset(htab, -1, sizeof(htab))
|
#define clear_htab() memset(htab, -1, sizeof(htab))
|
||||||
#define clear_tab_prefixof() memset(codetab, 0, 256);
|
#define clear_tab_prefixof() memset(codetab, 0, 256);
|
||||||
|
|
||||||
@ -105,19 +103,19 @@ unsigned short codetab[HSIZE];
|
|||||||
|
|
||||||
extern int uncompress(int fd_in, int fd_out)
|
extern int uncompress(int fd_in, int fd_out)
|
||||||
{
|
{
|
||||||
char_type *stackp;
|
unsigned char *stackp;
|
||||||
code_int code;
|
long int code;
|
||||||
int finchar;
|
int finchar;
|
||||||
code_int oldcode;
|
long int oldcode;
|
||||||
code_int incode;
|
long int incode;
|
||||||
int inbits;
|
int inbits;
|
||||||
int posbits;
|
int posbits;
|
||||||
int outpos;
|
int outpos;
|
||||||
int insize;
|
int insize;
|
||||||
int bitmask;
|
int bitmask;
|
||||||
code_int free_ent;
|
long int free_ent;
|
||||||
code_int maxcode;
|
long int maxcode;
|
||||||
code_int maxmaxcode;
|
long int maxmaxcode;
|
||||||
int n_bits;
|
int n_bits;
|
||||||
int rsize = 0;
|
int rsize = 0;
|
||||||
|
|
||||||
@ -129,14 +127,12 @@ extern int uncompress(int fd_in, int fd_out)
|
|||||||
block_mode = inbuf[0] & BLOCK_MODE;
|
block_mode = inbuf[0] & BLOCK_MODE;
|
||||||
maxmaxcode = MAXCODE(maxbits);
|
maxmaxcode = MAXCODE(maxbits);
|
||||||
|
|
||||||
if (maxbits > BITS)
|
if (maxbits > BITS) {
|
||||||
{
|
error_msg("compressed with %d bits, can only handle %d bits", maxbits,
|
||||||
fprintf(stderr, "compressed with %d bits, can only handle %d bits\n", maxbits, BITS);
|
BITS);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
//fprintf(stderr, "Bits: %d, block_mode: %d\n", maxbits, block_mode );
|
|
||||||
|
|
||||||
maxcode = MAXCODE(n_bits = INIT_BITS) - 1;
|
maxcode = MAXCODE(n_bits = INIT_BITS) - 1;
|
||||||
bitmask = (1 << n_bits) - 1;
|
bitmask = (1 << n_bits) - 1;
|
||||||
oldcode = -1;
|
oldcode = -1;
|
||||||
@ -146,14 +142,14 @@ extern int uncompress(int fd_in, int fd_out)
|
|||||||
|
|
||||||
free_ent = ((block_mode) ? FIRST : 256);
|
free_ent = ((block_mode) ? FIRST : 256);
|
||||||
|
|
||||||
clear_tab_prefixof(); /* As above, initialize the first
|
/* As above, initialize the first 256 entries in the table. */
|
||||||
256 entries in the table. */
|
clear_tab_prefixof();
|
||||||
|
|
||||||
for (code = 255 ; code >= 0 ; --code)
|
for (code = 255; code >= 0; --code) {
|
||||||
tab_suffixof(code) = (char_type)code;
|
tab_suffixof(code) = (unsigned char) code;
|
||||||
|
}
|
||||||
|
|
||||||
do
|
do {
|
||||||
{
|
|
||||||
resetbuf:;
|
resetbuf:;
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
@ -169,8 +165,7 @@ resetbuf: ;
|
|||||||
posbits = 0;
|
posbits = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (insize < (int) sizeof(inbuf)-IBUFSIZ)
|
if (insize < (int) sizeof(inbuf) - IBUFSIZ) {
|
||||||
{
|
|
||||||
rsize = read(fd_in, inbuf + insize, IBUFSIZ);
|
rsize = read(fd_in, inbuf + insize, IBUFSIZ);
|
||||||
insize += rsize;
|
insize += rsize;
|
||||||
}
|
}
|
||||||
@ -178,42 +173,43 @@ resetbuf: ;
|
|||||||
inbits = ((rsize > 0) ? (insize - insize % n_bits) << 3 :
|
inbits = ((rsize > 0) ? (insize - insize % n_bits) << 3 :
|
||||||
(insize << 3) - (n_bits - 1));
|
(insize << 3) - (n_bits - 1));
|
||||||
|
|
||||||
while (inbits > posbits)
|
while (inbits > posbits) {
|
||||||
{
|
if (free_ent > maxcode) {
|
||||||
if (free_ent > maxcode)
|
posbits =
|
||||||
{
|
((posbits - 1) +
|
||||||
posbits = ((posbits-1) + ((n_bits<<3) -
|
((n_bits << 3) -
|
||||||
(posbits - 1 + (n_bits << 3)) % (n_bits << 3)));
|
(posbits - 1 + (n_bits << 3)) % (n_bits << 3)));
|
||||||
|
|
||||||
++n_bits;
|
++n_bits;
|
||||||
if (n_bits == maxbits)
|
if (n_bits == maxbits) {
|
||||||
maxcode = maxmaxcode;
|
maxcode = maxmaxcode;
|
||||||
else
|
} else {
|
||||||
maxcode = MAXCODE(n_bits) - 1;
|
maxcode = MAXCODE(n_bits) - 1;
|
||||||
|
}
|
||||||
bitmask = (1 << n_bits) - 1;
|
bitmask = (1 << n_bits) - 1;
|
||||||
goto resetbuf;
|
goto resetbuf;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
{
|
{
|
||||||
char_type *p = &inbuf[posbits>>3];
|
unsigned char *p = &inbuf[posbits >> 3];
|
||||||
code = ((((long)(p[0]))|((long)(p[1])<<8)|((long)(p[2])<<16))>>(posbits&0x7))&bitmask;
|
|
||||||
|
code =
|
||||||
|
((((long) (p[0])) | ((long) (p[1]) << 8) |
|
||||||
|
((long) (p[2]) << 16)) >> (posbits & 0x7)) & bitmask;
|
||||||
}
|
}
|
||||||
posbits += n_bits;
|
posbits += n_bits;
|
||||||
|
|
||||||
|
|
||||||
if (oldcode == -1)
|
if (oldcode == -1) {
|
||||||
{
|
outbuf[outpos++] = (unsigned char) (finchar =
|
||||||
outbuf[outpos++] = (char_type)(finchar = (int)(oldcode = code));
|
(int) (oldcode = code));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (code == CLEAR && block_mode)
|
if (code == CLEAR && block_mode) {
|
||||||
{
|
|
||||||
clear_tab_prefixof();
|
clear_tab_prefixof();
|
||||||
free_ent = FIRST - 1;
|
free_ent = FIRST - 1;
|
||||||
posbits = ((posbits-1) + ((n_bits<<3) -
|
posbits =
|
||||||
|
((posbits - 1) +
|
||||||
|
((n_bits << 3) -
|
||||||
(posbits - 1 + (n_bits << 3)) % (n_bits << 3)));
|
(posbits - 1 + (n_bits << 3)) % (n_bits << 3)));
|
||||||
maxcode = MAXCODE(n_bits = INIT_BITS) - 1;
|
maxcode = MAXCODE(n_bits = INIT_BITS) - 1;
|
||||||
bitmask = (1 << n_bits) - 1;
|
bitmask = (1 << n_bits) - 1;
|
||||||
@ -223,78 +219,73 @@ resetbuf: ;
|
|||||||
incode = code;
|
incode = code;
|
||||||
stackp = de_stack;
|
stackp = de_stack;
|
||||||
|
|
||||||
if (code >= free_ent) /* Special case for KwKwK string. */
|
/* Special case for KwKwK string. */
|
||||||
{
|
if (code >= free_ent) {
|
||||||
if (code > free_ent)
|
if (code > free_ent) {
|
||||||
{
|
unsigned char *p;
|
||||||
char_type *p;
|
|
||||||
|
|
||||||
posbits -= n_bits;
|
posbits -= n_bits;
|
||||||
p = &inbuf[posbits >> 3];
|
p = &inbuf[posbits >> 3];
|
||||||
|
|
||||||
fprintf(stderr, "insize:%d posbits:%d inbuf:%02X %02X %02X %02X %02X (%d)\n", insize, posbits,
|
error_msg
|
||||||
p[-1],p[0],p[1],p[2],p[3], (posbits&07));
|
("insize:%d posbits:%d inbuf:%02X %02X %02X %02X %02X (%d)",
|
||||||
fprintf(stderr, "uncompress: corrupt input\n");
|
insize, posbits, p[-1], p[0], p[1], p[2], p[3],
|
||||||
|
(posbits & 07));
|
||||||
|
error_msg("uncompress: corrupt input");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
*--stackp = (char_type)finchar;
|
*--stackp = (unsigned char) finchar;
|
||||||
code = oldcode;
|
code = oldcode;
|
||||||
}
|
}
|
||||||
|
|
||||||
while ((cmp_code_int)code >= (cmp_code_int)256)
|
/* Generate output characters in reverse order */
|
||||||
{ /* Generate output characters in reverse order */
|
while ((long int) code >= (long int) 256) {
|
||||||
*--stackp = tab_suffixof(code);
|
*--stackp = tab_suffixof(code);
|
||||||
code = tab_prefixof(code);
|
code = tab_prefixof(code);
|
||||||
}
|
}
|
||||||
|
|
||||||
*--stackp = (char_type)(finchar = tab_suffixof(code));
|
*--stackp = (unsigned char) (finchar = tab_suffixof(code));
|
||||||
|
|
||||||
/* And put them out in forward order */
|
/* And put them out in forward order */
|
||||||
|
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (outpos+(i = (de_stack-stackp)) >= OBUFSIZ)
|
if (outpos + (i = (de_stack - stackp)) >= OBUFSIZ) {
|
||||||
{
|
do {
|
||||||
do
|
if (i > OBUFSIZ - outpos) {
|
||||||
{
|
i = OBUFSIZ - outpos;
|
||||||
if (i > OBUFSIZ-outpos) i = OBUFSIZ-outpos;
|
}
|
||||||
|
|
||||||
if (i > 0)
|
if (i > 0) {
|
||||||
{
|
|
||||||
memcpy(outbuf + outpos, stackp, i);
|
memcpy(outbuf + outpos, stackp, i);
|
||||||
outpos += i;
|
outpos += i;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (outpos >= OBUFSIZ)
|
if (outpos >= OBUFSIZ) {
|
||||||
{
|
|
||||||
write(fd_out, outbuf, outpos);
|
write(fd_out, outbuf, outpos);
|
||||||
outpos = 0;
|
outpos = 0;
|
||||||
}
|
}
|
||||||
stackp += i;
|
stackp += i;
|
||||||
}
|
} while ((i = (de_stack - stackp)) > 0);
|
||||||
while ((i = (de_stack-stackp)) > 0);
|
} else {
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
memcpy(outbuf + outpos, stackp, i);
|
memcpy(outbuf + outpos, stackp, i);
|
||||||
outpos += i;
|
outpos += i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((code = free_ent) < maxmaxcode) /* Generate the new entry. */
|
/* Generate the new entry. */
|
||||||
{
|
if ((code = free_ent) < maxmaxcode) {
|
||||||
tab_prefixof(code) = (unsigned short) oldcode;
|
tab_prefixof(code) = (unsigned short) oldcode;
|
||||||
tab_suffixof(code) = (char_type)finchar;
|
tab_suffixof(code) = (unsigned char) finchar;
|
||||||
free_ent = code + 1;
|
free_ent = code + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
oldcode = incode; /* Remember previous code. */
|
/* Remember previous code. */
|
||||||
|
oldcode = incode;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
} while (rsize > 0);
|
||||||
while (rsize > 0);
|
|
||||||
|
|
||||||
if (outpos > 0) {
|
if (outpos > 0) {
|
||||||
write(fd_out, outbuf, outpos);
|
write(fd_out, outbuf, outpos);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user