mirror of
https://github.com/sheumann/hush.git
synced 2024-06-26 02:29:31 +00:00
Commit my improvement on Rodney Brown's patch to g(un)zip, decreasing
binary size.
This commit is contained in:
Aaron Lehmann
parent
249f39a265
commit
b9df470c4d
|
|
@ -276,7 +276,7 @@ int numFileNames;
|
|||
int numFilesProcessed;
|
||||
int exitValue;
|
||||
|
||||
unsigned int BZ2_crc32Table[256] = {
|
||||
const unsigned int BZ2_crc32Table[256] = {
|
||||
|
||||
/*-- Ugly, innit? --*/
|
||||
|
||||
|
|
|
|||
|
|
@ -174,15 +174,6 @@ typedef int file_t; /* Do not use stdio */
|
|||
#define put_byte(c) {outbuf[outcnt++]=(uch)(c); if (outcnt==OUTBUFSIZ)\
|
||||
flush_outbuf();}
|
||||
|
||||
/* Output a 16 bit value, lsb first */
|
||||
#define put_short(w) \
|
||||
{ if (outcnt < OUTBUFSIZ-2) { \
|
||||
outbuf[outcnt++] = (uch) ((w) & 0xff); \
|
||||
outbuf[outcnt++] = (uch) ((ush)(w) >> 8); \
|
||||
} else { \
|
||||
put_short_when_full(w); \
|
||||
} \
|
||||
}
|
||||
|
||||
/* Output a 32 bit value to the bit stream, lsb first */
|
||||
#if 0
|
||||
|
|
@ -247,9 +238,6 @@ static int (*read_buf) (char *buf, unsigned size);
|
|||
/* from util.c: */
|
||||
static void flush_outbuf (void);
|
||||
|
||||
static void put_short_when_full (ush);
|
||||
|
||||
|
||||
/* lzw.h -- define the lzw functions.
|
||||
* Copyright (C) 1992-1993 Jean-loup Gailly.
|
||||
* This is free software; you can redistribute it and/or modify it under the
|
||||
|
|
@ -336,6 +324,19 @@ static int ofd; /* output file descriptor */
|
|||
static unsigned insize; /* valid bytes in inbuf */
|
||||
static unsigned outcnt; /* bytes in output buffer */
|
||||
|
||||
|
||||
/* Output a 16 bit value, lsb first */
|
||||
static void put_short(ush w)
|
||||
{
|
||||
if (outcnt < OUTBUFSIZ-2) {
|
||||
outbuf[outcnt++] = (uch) ((w) & 0xff);
|
||||
outbuf[outcnt++] = (uch) ((ush)(w) >> 8);
|
||||
} else {
|
||||
put_byte((uch)((w) & 0xff));
|
||||
put_byte((uch)((ush)(w) >> 8));
|
||||
}
|
||||
}
|
||||
|
||||
/* ========================================================================
|
||||
* Signal and error handler.
|
||||
*/
|
||||
|
|
@ -1481,7 +1482,7 @@ static const extra_bits_t extra_blbits[BL_CODES]
|
|||
* if we rely on DIST_BUFSIZE == LIT_BUFSIZE.
|
||||
*/
|
||||
#if LIT_BUFSIZE > INBUFSIZ
|
||||
error cannot overlay l_buf and inbuf
|
||||
#error cannot overlay l_buf and inbuf
|
||||
#endif
|
||||
#define REP_3_6 16
|
||||
/* repeat previous bit length 3-6 times (2 bits of repeat count) */
|
||||
|
|
@ -2462,21 +2463,10 @@ static void set_file_type()
|
|||
static ulg crc; /* crc on uncompressed file data */
|
||||
static long header_bytes; /* number of bytes in gzip header */
|
||||
|
||||
static void put_short_when_full(ush w)
|
||||
{
|
||||
put_byte((uch)((w) & 0xff));
|
||||
put_byte((uch)((ush)(w) >> 8));
|
||||
}
|
||||
|
||||
static void put_short_function(ush n)
|
||||
{
|
||||
put_short(n);
|
||||
}
|
||||
|
||||
static void put_long(ulg n)
|
||||
{
|
||||
put_short_function((n) & 0xffff);
|
||||
put_short_function(((ulg)(n)) >> 16);
|
||||
put_short((n) & 0xffff);
|
||||
put_short(((ulg)(n)) >> 16);
|
||||
}
|
||||
|
||||
/* put_header_byte is used for the compressed output
|
||||
|
|
|
|||
|
|
@ -186,6 +186,8 @@ static int huft_free(huft_t *t)
|
|||
return 0;
|
||||
}
|
||||
|
||||
typedef unsigned char extra_bits_t;
|
||||
|
||||
/* Given a list of code lengths and a maximum table size, make a set of
|
||||
* tables to decode that set of codes. Return zero on success, one if
|
||||
* the given code set is incomplete (the tables are still built in this
|
||||
|
|
@ -201,7 +203,7 @@ static int huft_free(huft_t *t)
|
|||
* m: maximum lookup bits, returns actual
|
||||
*/
|
||||
static int huft_build(unsigned int *b, const unsigned int n, const unsigned int s,
|
||||
const unsigned short *d, const unsigned short *e, huft_t **t, int *m)
|
||||
const unsigned short *d, const extra_bits_t *e, huft_t **t, int *m)
|
||||
{
|
||||
unsigned a; /* counter for codes of length k */
|
||||
unsigned c[BMAX + 1]; /* bit length count table */
|
||||
|
|
@ -489,6 +491,30 @@ static int inflate_codes(huft_t *tl, huft_t *td, int bl, int bd)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static const unsigned short cplens[] = { /* Copy lengths for literal codes 257..285 */
|
||||
3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
|
||||
35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0
|
||||
};
|
||||
/* note: see note #13 above about the 258 in this list. */
|
||||
static const extra_bits_t cplext[] = { /* Extra bits for literal codes 257..285 */
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
|
||||
3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 99, 99
|
||||
}; /* 99==invalid */
|
||||
static const unsigned short cpdist[] = { /* Copy offsets for distance codes 0..29 */
|
||||
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
|
||||
257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
|
||||
8193, 12289, 16385, 24577
|
||||
};
|
||||
static const extra_bits_t cpdext[] = { /* Extra bits for distance codes */
|
||||
0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
|
||||
7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
|
||||
12, 12, 13, 13
|
||||
};
|
||||
/* Tables for deflate from PKZIP's appnote.txt. */
|
||||
static const extra_bits_t border[] = { /* Order of the bit length code lengths */
|
||||
16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
|
||||
};
|
||||
|
||||
/*
|
||||
* decompress an inflated block
|
||||
* e: last block flag
|
||||
|
|
@ -500,25 +526,6 @@ static int inflate_block(int *e)
|
|||
unsigned t; /* block type */
|
||||
register unsigned long b; /* bit buffer */
|
||||
register unsigned k; /* number of bits in bit buffer */
|
||||
static unsigned short cplens[] = { /* Copy lengths for literal codes 257..285 */
|
||||
3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
|
||||
35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0
|
||||
};
|
||||
/* note: see note #13 above about the 258 in this list. */
|
||||
static unsigned short cplext[] = { /* Extra bits for literal codes 257..285 */
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
|
||||
3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 99, 99
|
||||
}; /* 99==invalid */
|
||||
static unsigned short cpdist[] = { /* Copy offsets for distance codes 0..29 */
|
||||
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
|
||||
257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
|
||||
8193, 12289, 16385, 24577
|
||||
};
|
||||
static unsigned short cpdext[] = { /* Extra bits for distance codes */
|
||||
0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
|
||||
7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
|
||||
12, 12, 13, 13
|
||||
};
|
||||
|
||||
/* make local bit buffer */
|
||||
b = bb;
|
||||
|
|
@ -657,12 +664,8 @@ static int inflate_block(int *e)
|
|||
}
|
||||
case 2: /* Inflate dynamic */
|
||||
{
|
||||
/* Tables for deflate from PKZIP's appnote.txt. */
|
||||
static unsigned border[] = { /* Order of the bit length code lengths */
|
||||
16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
|
||||
};
|
||||
int dbits = 6; /* bits in base distance lookup table */
|
||||
int lbits = 9; /* bits in base literal/length lookup table */
|
||||
const int dbits = 6; /* bits in base distance lookup table */
|
||||
const int lbits = 9; /* bits in base literal/length lookup table */
|
||||
|
||||
int i; /* temporary variables */
|
||||
unsigned j;
|
||||
|
|
|
|||
|
|
@ -186,6 +186,8 @@ static int huft_free(huft_t *t)
|
|||
return 0;
|
||||
}
|
||||
|
||||
typedef unsigned char extra_bits_t;
|
||||
|
||||
/* Given a list of code lengths and a maximum table size, make a set of
|
||||
* tables to decode that set of codes. Return zero on success, one if
|
||||
* the given code set is incomplete (the tables are still built in this
|
||||
|
|
@ -201,7 +203,7 @@ static int huft_free(huft_t *t)
|
|||
* m: maximum lookup bits, returns actual
|
||||
*/
|
||||
static int huft_build(unsigned int *b, const unsigned int n, const unsigned int s,
|
||||
const unsigned short *d, const unsigned short *e, huft_t **t, int *m)
|
||||
const unsigned short *d, const extra_bits_t *e, huft_t **t, int *m)
|
||||
{
|
||||
unsigned a; /* counter for codes of length k */
|
||||
unsigned c[BMAX + 1]; /* bit length count table */
|
||||
|
|
@ -489,6 +491,30 @@ static int inflate_codes(huft_t *tl, huft_t *td, int bl, int bd)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static const unsigned short cplens[] = { /* Copy lengths for literal codes 257..285 */
|
||||
3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
|
||||
35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0
|
||||
};
|
||||
/* note: see note #13 above about the 258 in this list. */
|
||||
static const extra_bits_t cplext[] = { /* Extra bits for literal codes 257..285 */
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
|
||||
3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 99, 99
|
||||
}; /* 99==invalid */
|
||||
static const unsigned short cpdist[] = { /* Copy offsets for distance codes 0..29 */
|
||||
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
|
||||
257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
|
||||
8193, 12289, 16385, 24577
|
||||
};
|
||||
static const extra_bits_t cpdext[] = { /* Extra bits for distance codes */
|
||||
0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
|
||||
7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
|
||||
12, 12, 13, 13
|
||||
};
|
||||
/* Tables for deflate from PKZIP's appnote.txt. */
|
||||
static const extra_bits_t border[] = { /* Order of the bit length code lengths */
|
||||
16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
|
||||
};
|
||||
|
||||
/*
|
||||
* decompress an inflated block
|
||||
* e: last block flag
|
||||
|
|
@ -500,25 +526,6 @@ static int inflate_block(int *e)
|
|||
unsigned t; /* block type */
|
||||
register unsigned long b; /* bit buffer */
|
||||
register unsigned k; /* number of bits in bit buffer */
|
||||
static unsigned short cplens[] = { /* Copy lengths for literal codes 257..285 */
|
||||
3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
|
||||
35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0
|
||||
};
|
||||
/* note: see note #13 above about the 258 in this list. */
|
||||
static unsigned short cplext[] = { /* Extra bits for literal codes 257..285 */
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
|
||||
3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 99, 99
|
||||
}; /* 99==invalid */
|
||||
static unsigned short cpdist[] = { /* Copy offsets for distance codes 0..29 */
|
||||
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
|
||||
257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
|
||||
8193, 12289, 16385, 24577
|
||||
};
|
||||
static unsigned short cpdext[] = { /* Extra bits for distance codes */
|
||||
0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
|
||||
7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
|
||||
12, 12, 13, 13
|
||||
};
|
||||
|
||||
/* make local bit buffer */
|
||||
b = bb;
|
||||
|
|
@ -657,12 +664,8 @@ static int inflate_block(int *e)
|
|||
}
|
||||
case 2: /* Inflate dynamic */
|
||||
{
|
||||
/* Tables for deflate from PKZIP's appnote.txt. */
|
||||
static unsigned border[] = { /* Order of the bit length code lengths */
|
||||
16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
|
||||
};
|
||||
int dbits = 6; /* bits in base distance lookup table */
|
||||
int lbits = 9; /* bits in base literal/length lookup table */
|
||||
const int dbits = 6; /* bits in base distance lookup table */
|
||||
const int lbits = 9; /* bits in base literal/length lookup table */
|
||||
|
||||
int i; /* temporary variables */
|
||||
unsigned j;
|
||||
|
|
|
|||
|
|
@ -186,6 +186,8 @@ static int huft_free(huft_t *t)
|
|||
return 0;
|
||||
}
|
||||
|
||||
typedef unsigned char extra_bits_t;
|
||||
|
||||
/* Given a list of code lengths and a maximum table size, make a set of
|
||||
* tables to decode that set of codes. Return zero on success, one if
|
||||
* the given code set is incomplete (the tables are still built in this
|
||||
|
|
@ -201,7 +203,7 @@ static int huft_free(huft_t *t)
|
|||
* m: maximum lookup bits, returns actual
|
||||
*/
|
||||
static int huft_build(unsigned int *b, const unsigned int n, const unsigned int s,
|
||||
const unsigned short *d, const unsigned short *e, huft_t **t, int *m)
|
||||
const unsigned short *d, const extra_bits_t *e, huft_t **t, int *m)
|
||||
{
|
||||
unsigned a; /* counter for codes of length k */
|
||||
unsigned c[BMAX + 1]; /* bit length count table */
|
||||
|
|
@ -489,6 +491,30 @@ static int inflate_codes(huft_t *tl, huft_t *td, int bl, int bd)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static const unsigned short cplens[] = { /* Copy lengths for literal codes 257..285 */
|
||||
3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
|
||||
35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0
|
||||
};
|
||||
/* note: see note #13 above about the 258 in this list. */
|
||||
static const extra_bits_t cplext[] = { /* Extra bits for literal codes 257..285 */
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
|
||||
3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 99, 99
|
||||
}; /* 99==invalid */
|
||||
static const unsigned short cpdist[] = { /* Copy offsets for distance codes 0..29 */
|
||||
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
|
||||
257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
|
||||
8193, 12289, 16385, 24577
|
||||
};
|
||||
static const extra_bits_t cpdext[] = { /* Extra bits for distance codes */
|
||||
0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
|
||||
7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
|
||||
12, 12, 13, 13
|
||||
};
|
||||
/* Tables for deflate from PKZIP's appnote.txt. */
|
||||
static const extra_bits_t border[] = { /* Order of the bit length code lengths */
|
||||
16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
|
||||
};
|
||||
|
||||
/*
|
||||
* decompress an inflated block
|
||||
* e: last block flag
|
||||
|
|
@ -500,25 +526,6 @@ static int inflate_block(int *e)
|
|||
unsigned t; /* block type */
|
||||
register unsigned long b; /* bit buffer */
|
||||
register unsigned k; /* number of bits in bit buffer */
|
||||
static unsigned short cplens[] = { /* Copy lengths for literal codes 257..285 */
|
||||
3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
|
||||
35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0
|
||||
};
|
||||
/* note: see note #13 above about the 258 in this list. */
|
||||
static unsigned short cplext[] = { /* Extra bits for literal codes 257..285 */
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
|
||||
3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 99, 99
|
||||
}; /* 99==invalid */
|
||||
static unsigned short cpdist[] = { /* Copy offsets for distance codes 0..29 */
|
||||
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
|
||||
257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
|
||||
8193, 12289, 16385, 24577
|
||||
};
|
||||
static unsigned short cpdext[] = { /* Extra bits for distance codes */
|
||||
0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
|
||||
7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
|
||||
12, 12, 13, 13
|
||||
};
|
||||
|
||||
/* make local bit buffer */
|
||||
b = bb;
|
||||
|
|
@ -657,12 +664,8 @@ static int inflate_block(int *e)
|
|||
}
|
||||
case 2: /* Inflate dynamic */
|
||||
{
|
||||
/* Tables for deflate from PKZIP's appnote.txt. */
|
||||
static unsigned border[] = { /* Order of the bit length code lengths */
|
||||
16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
|
||||
};
|
||||
int dbits = 6; /* bits in base distance lookup table */
|
||||
int lbits = 9; /* bits in base literal/length lookup table */
|
||||
const int dbits = 6; /* bits in base distance lookup table */
|
||||
const int lbits = 9; /* bits in base literal/length lookup table */
|
||||
|
||||
int i; /* temporary variables */
|
||||
unsigned j;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user