/[magellan-source]/trunk/mkinitrd-magellan/busybox/archival/gzip.c

Diff of /trunk/mkinitrd-magellan/busybox/archival/gzip.c

Parent Directory | Revision Log | View Patch Patch

-revision 815 by niro,
Sat Sep  1 22:45:15 2007 UTC
+revision 816 by niro,
Fri Apr 24 18:33:46 2009 UTC
 Line 39 
 gzip: bogus: No such file or directory
  aa:      85.1% -- replaced with aa.gz
  */
- #include "busybox.h"
+ #include "libbb.h"
+ #include "unarchive.h"
  /* ===========================================================================
-Line 47 
 aa:      85.1% -- replaced with aa.gz
+Line 48 
 aa:      85.1% -- replaced with aa.gz
  //#define DEBUG 1
  /* Diagnostic functions */
  #ifdef DEBUG
- #  define Assert(cond,msg) {if(!(cond)) bb_error_msg(msg);}
+ #  define Assert(cond,msg) { if (!(cond)) bb_error_msg(msg); }
  #  define Trace(x) fprintf x
- #  define Tracev(x) {if (verbose) fprintf x ;}
+ #  define Tracev(x) {if (verbose) fprintf x; }
- #  define Tracevv(x) {if (verbose > 1) fprintf x ;}
+ #  define Tracevv(x) {if (verbose > 1) fprintf x; }
- #  define Tracec(c,x) {if (verbose && (c)) fprintf x ;}
+ #  define Tracec(c,x) {if (verbose && (c)) fprintf x; }
- #  define Tracecv(c,x) {if (verbose > 1 && (c)) fprintf x ;}
+ #  define Tracecv(c,x) {if (verbose > 1 && (c)) fprintf x; }
  #else
  #  define Assert(cond,msg)
  #  define Trace(x)
-Line 67 
 aa:      85.1% -- replaced with aa.gz
+Line 68 
 aa:      85.1% -- replaced with aa.gz
   */
  #define SMALL_MEM
- /* Compression methods (see algorithm.doc) */
- /* Only STORED and DEFLATED are supported by this BusyBox module */
- #define STORED      0
- /* methods 4 to 7 reserved */
- #define DEFLATED    8
  #ifndef	INBUFSIZ
  #  ifdef SMALL_MEM
  #    define INBUFSIZ  0x2000	/* input buffer size */
-Line 195 
 typedef uint16_t ush;
+Line 190 
 typedef uint16_t ush;
  typedef uint32_t ulg;
  typedef int32_t lng;
- /* ===========================================================================
-  */
  typedef ush Pos;
  typedef unsigned IPos;
  /* A Pos is an index in the character window. We use short instead of int to
   * save space in the various tables. IPos is used only for parameter passing.
   */
- static lng block_start;
- /* window position at the beginning of the current output block. Gets
-  * negative when the window is moved backwards.
-  */
- static unsigned ins_h;	/* hash index of string to be inserted */
- #define H_SHIFT  ((HASH_BITS+MIN_MATCH-1) / MIN_MATCH)
- /* Number of bits by which ins_h and del_h must be shifted at each
-  * input step. It must be such that after MIN_MATCH steps, the oldest
-  * byte no longer takes part in the hash key, that is:
-  * H_SHIFT * MIN_MATCH >= HASH_BITS
-  */
- static unsigned int prev_length;
- /* Length of the best match at previous step. Matches not greater than this
-  * are discarded. This is used in the lazy match evaluation.
-  */
- static unsigned strstart;	/* start of string to insert */
- static unsigned match_start;	/* start of matching string */
- static int eofile;		/* flag set at end of input file */
- static unsigned lookahead;	/* number of valid bytes ahead in window */
  enum {
  	WINDOW_SIZE = 2 * WSIZE,
  /* window size, 2*WSIZE except for MMAP or BIG_MEM, where it is the
-Line 271 
 enum {
+Line 236 
 enum {
  };
+ struct globals {
+ 	lng block_start;
+ /* window position at the beginning of the current output block. Gets
+  * negative when the window is moved backwards.
+  */
+ 	unsigned ins_h;	/* hash index of string to be inserted */
+ #define H_SHIFT  ((HASH_BITS+MIN_MATCH-1) / MIN_MATCH)
+ /* Number of bits by which ins_h and del_h must be shifted at each
+  * input step. It must be such that after MIN_MATCH steps, the oldest
+  * byte no longer takes part in the hash key, that is:
+  * H_SHIFT * MIN_MATCH >= HASH_BITS
+  */
+ 	unsigned prev_length;
+ /* Length of the best match at previous step. Matches not greater than this
+  * are discarded. This is used in the lazy match evaluation.
+  */
+ 	unsigned strstart;	/* start of string to insert */
+ 	unsigned match_start;	/* start of matching string */
+ 	unsigned lookahead;	/* number of valid bytes ahead in window */
  /* ===========================================================================
   */
  #define DECLARE(type, array, size) \
- 	static type * array
+ 	type * array
  #define ALLOC(type, array, size) \
- { \
+ 	array = xzalloc((size_t)(((size)+1L)/2) * 2*sizeof(type));
- 	array = xzalloc((size_t)(((size)+1L)/2) * 2*sizeof(type)); \
- }
  #define FREE(array) \
- { \
+ 	do { free(array); array = NULL; } while (0)
- 	free(array); \
- 	array = NULL; \
- }
- /* global buffers */
+ 	/* global buffers */
- /* buffer for literals or lengths */
+ 	/* buffer for literals or lengths */
- /* DECLARE(uch, l_buf, LIT_BUFSIZE); */
+ 	/* DECLARE(uch, l_buf, LIT_BUFSIZE); */
- DECLARE(uch, l_buf, INBUFSIZ);
+ 	DECLARE(uch, l_buf, INBUFSIZ);
- DECLARE(ush, d_buf, DIST_BUFSIZE);
+ 	DECLARE(ush, d_buf, DIST_BUFSIZE);
- DECLARE(uch, outbuf, OUTBUFSIZ);
+ 	DECLARE(uch, outbuf, OUTBUFSIZ);
  /* Sliding window. Input bytes are read into the second half of the window,
   * and move to the first half later to keep a dictionary of at least WSIZE
-Line 305 
 DECLARE(uch, outbuf, OUTBUFSIZ);
+Line 289 
 DECLARE(uch, outbuf, OUTBUFSIZ);
   * To do: limit the window size to WSIZE+BSZ if SMALL_MEM (the code would
   * be less efficient).
   */
- DECLARE(uch, window, 2L * WSIZE);
+ 	DECLARE(uch, window, 2L * WSIZE);
  /* Link to older string with same hash index. To limit the size of this
   * array to 64K, this link is maintained only for the last 32K strings.
   * An index in this array is thus a window index modulo 32K.
   */
- /* DECLARE(Pos, prev, WSIZE); */
+ 	/* DECLARE(Pos, prev, WSIZE); */
- DECLARE(ush, prev, 1L << BITS);
+ 	DECLARE(ush, prev, 1L << BITS);
  /* Heads of the hash chains or 0. */
- /* DECLARE(Pos, head, 1<<HASH_BITS); */
+ 	/* DECLARE(Pos, head, 1<<HASH_BITS); */
- #define head (prev+WSIZE) /* hash head (see deflate.c) */
+ #define head (G1.prev + WSIZE) /* hash head (see deflate.c) */
  /* number of input bytes */
- static ulg isize;		/* only 32 bits stored in .gz file */
+ 	ulg isize;		/* only 32 bits stored in .gz file */
- static int foreground;		/* set if program run in foreground */
+ /* bbox always use stdin/stdout */
- static int method = DEFLATED;	/* compression method */
+ #define ifd STDIN_FILENO	/* input file descriptor */
- static int exit_code;		/* program exit code */
+ #define ofd STDOUT_FILENO	/* output file descriptor */
- /* original time stamp (modification time) */
- static ulg time_stamp;		/* only 32 bits stored in .gz file */
- static int ifd;			/* input file descriptor */
- static int ofd;			/* output file descriptor */
  #ifdef DEBUG
- static unsigned insize;	/* valid bytes in l_buf */
+ 	unsigned insize;	/* valid bytes in l_buf */
  #endif
- static unsigned outcnt;	/* bytes in output buffer */
+ 	unsigned outcnt;	/* bytes in output buffer */
- static uint32_t *crc_32_tab;
+ 	smallint eofile;	/* flag set at end of input file */
  /* ===========================================================================
   * Local data used by the "bit string" routines.
   */
- //// static int zfile;	/* output gzip file */
+ 	unsigned short bi_buf;
- static unsigned short bi_buf;
  /* Output buffer. bits are inserted starting at the bottom (least significant
   * bits).
   */
  #undef BUF_SIZE
- #define BUF_SIZE (8 * sizeof(bi_buf))
+ #define BUF_SIZE (8 * sizeof(G1.bi_buf))
  /* Number of bits used within bi_buf. (bi_buf might be implemented on
   * more than 16 bits on some systems.)
   */
- static int bi_valid;
+ 	int bi_valid;
  /* Current input function. Set to mem_read for in-memory compression */
  #ifdef DEBUG
- static ulg bits_sent;			/* bit length of the compressed data */
+ 	ulg bits_sent;			/* bit length of the compressed data */
  #endif
+ 	uint32_t *crc_32_tab;
+ 	uint32_t crc;	/* shift register contents */
+ };
+ #define G1 (*(ptr_to_globals - 1))
  /* ===========================================================================
   * Write the output buffer outbuf[0..outcnt-1] and update bytes_out.
-Line 372 
 static ulg bits_sent;			/* bit length of
+Line 353 
 static ulg bits_sent;			/* bit length of
   */
  static void flush_outbuf(void)
  {
- 	if (outcnt == 0)
+ 	if (G1.outcnt == 0)
  		return;
- 	xwrite(ofd, (char *) outbuf, outcnt);
+ 	xwrite(ofd, (char *) G1.outbuf, G1.outcnt);
- 	outcnt = 0;
+ 	G1.outcnt = 0;
  }
-Line 384 
 static void flush_outbuf(void)
+Line 365 
 static void flush_outbuf(void)
   */
  /* put_8bit is used for the compressed output */
  #define put_8bit(c) \
- { \
+ do { \
- 	outbuf[outcnt++] = (c); \
+ 	G1.outbuf[G1.outcnt++] = (c); \
- 	if (outcnt == OUTBUFSIZ) flush_outbuf(); \
+ 	if (G1.outcnt == OUTBUFSIZ) flush_outbuf(); \
- }
+ } while (0)
  /* Output a 16 bit value, lsb first */
  static void put_16bit(ush w)
  {
- 	if (outcnt < OUTBUFSIZ - 2) {
+ 	if (G1.outcnt < OUTBUFSIZ - 2) {
- 		outbuf[outcnt++] = w;
+ 		G1.outbuf[G1.outcnt++] = w;
- 		outbuf[outcnt++] = w >> 8;
+ 		G1.outbuf[G1.outcnt++] = w >> 8;
  	} else {
  		put_8bit(w);
  		put_8bit(w >> 8);
-Line 412 
 static void put_32bit(ulg n)
+Line 393 
 static void put_32bit(ulg n)
   */
  static void clear_bufs(void)
  {
- 	outcnt = 0;
+ 	G1.outcnt = 0;
  #ifdef DEBUG
- 	insize = 0;
+ 	G1.insize = 0;
  #endif
- 	isize = 0;
+ 	G1.isize = 0;
  }
-Line 425 
 static void clear_bufs(void)
+Line 406 
 static void clear_bufs(void)
   * pointer, then initialize the crc shift register contents instead.
   * Return the current crc in either case.
   */
- static uint32_t crc;	/* shift register contents */
  static uint32_t updcrc(uch * s, unsigned n)
  {
- 	uint32_t c = crc;
+ 	uint32_t c = G1.crc;
  	while (n) {
- 		c = crc_32_tab[(uch)(c ^ *s++)] ^ (c >> 8);
+ 		c = G1.crc_32_tab[(uch)(c ^ *s++)] ^ (c >> 8);
  		n--;
  	}
- 	crc = c;
+ 	G1.crc = c;
  	return c;
  }
-Line 447 
 static unsigned file_read(void *buf, uns
+Line 427 
 static unsigned file_read(void *buf, uns
  {
  	unsigned len;
- 	Assert(insize == 0, "l_buf not empty");
+ 	Assert(G1.insize == 0, "l_buf not empty");
  	len = safe_read(ifd, buf, size);
  	if (len == (unsigned)(-1) || len == 0)
  		return len;
  	updcrc(buf, len);
- 	isize += len;
+ 	G1.isize += len;
  	return len;
  }
-Line 468 
 static void send_bits(int value, int len
+Line 448 
 static void send_bits(int value, int len
  #ifdef DEBUG
  	Tracev((stderr, " l %2d v %4x ", length, value));
  	Assert(length > 0 && length <= 15, "invalid length");
- 	bits_sent += length;
+ 	G1.bits_sent += length;
  #endif
  	/* If not enough room in bi_buf, use (valid) bits from bi_buf and
  	 * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
  	 * unused bits in value.
  	 */
- 	if (bi_valid > (int) BUF_SIZE - length) {
+ 	if (G1.bi_valid > (int) BUF_SIZE - length) {
- 		bi_buf |= (value << bi_valid);
+ 		G1.bi_buf |= (value << G1.bi_valid);
- 		put_16bit(bi_buf);
+ 		put_16bit(G1.bi_buf);
- 		bi_buf = (ush) value >> (BUF_SIZE - bi_valid);
+ 		G1.bi_buf = (ush) value >> (BUF_SIZE - G1.bi_valid);
- 		bi_valid += length - BUF_SIZE;
+ 		G1.bi_valid += length - BUF_SIZE;
  	} else {
- 		bi_buf |= value << bi_valid;
+ 		G1.bi_buf |= value << G1.bi_valid;
- 		bi_valid += length;
+ 		G1.bi_valid += length;
  	}
  }
-Line 509 
 static unsigned bi_reverse(unsigned code
+Line 489 
 static unsigned bi_reverse(unsigned code
   */
  static void bi_windup(void)
  {
- 	if (bi_valid > 8) {
+ 	if (G1.bi_valid > 8) {
- 		put_16bit(bi_buf);
+ 		put_16bit(G1.bi_buf);
- 	} else if (bi_valid > 0) {
+ 	} else if (G1.bi_valid > 0) {
- 		put_8bit(bi_buf);
+ 		put_8bit(G1.bi_buf);
  	}
- 	bi_buf = 0;
+ 	G1.bi_buf = 0;
- 	bi_valid = 0;
+ 	G1.bi_valid = 0;
  #ifdef DEBUG
- 	bits_sent = (bits_sent + 7) & ~7;
+ 	G1.bits_sent = (G1.bits_sent + 7) & ~7;
  #endif
  }
-Line 534 
 static void copy_block(char *buf, unsign
+Line 514 
 static void copy_block(char *buf, unsign
  		put_16bit(len);
  		put_16bit(~len);
  #ifdef DEBUG
- 		bits_sent += 2 * 16;
+ 		G1.bits_sent += 2 * 16;
  #endif
  	}
  #ifdef DEBUG
- 	bits_sent += (ulg) len << 3;
+ 	G1.bits_sent += (ulg) len << 3;
  #endif
  	while (len--) {
  		put_8bit(*buf++);
-Line 557 
 static void copy_block(char *buf, unsign
+Line 537 
 static void copy_block(char *buf, unsign
  static void fill_window(void)
  {
  	unsigned n, m;
- 	unsigned more =	WINDOW_SIZE - lookahead - strstart;
+ 	unsigned more =	WINDOW_SIZE - G1.lookahead - G1.strstart;
  	/* Amount of free space at the end of the window. */
  	/* If the window is almost full and there is insufficient lookahead,
-Line 568 
 static void fill_window(void)
+Line 548 
 static void fill_window(void)
  		 * and lookahead == 1 (input done one byte at time)
  		 */
  		more--;
- 	} else if (strstart >= WSIZE + MAX_DIST) {
+ 	} else if (G1.strstart >= WSIZE + MAX_DIST) {
  		/* By the IN assertion, the window is not empty so we can't confuse
  		 * more == 0 with more == 64K on a 16 bit machine.
  		 */
  		Assert(WINDOW_SIZE == 2 * WSIZE, "no sliding with BIG_MEM");
- 		memcpy(window, window + WSIZE, WSIZE);
+ 		memcpy(G1.window, G1.window + WSIZE, WSIZE);
- 		match_start -= WSIZE;
+ 		G1.match_start -= WSIZE;
- 		strstart -= WSIZE;	/* we now have strstart >= MAX_DIST: */
+ 		G1.strstart -= WSIZE;	/* we now have strstart >= MAX_DIST: */
- 		block_start -= WSIZE;
+ 		G1.block_start -= WSIZE;
  		for (n = 0; n < HASH_SIZE; n++) {
  			m = head[n];
  			head[n] = (Pos) (m >= WSIZE ? m - WSIZE : 0);
  		}
  		for (n = 0; n < WSIZE; n++) {
- 			m = prev[n];
+ 			m = G1.prev[n];
- 			prev[n] = (Pos) (m >= WSIZE ? m - WSIZE : 0);
+ 			G1.prev[n] = (Pos) (m >= WSIZE ? m - WSIZE : 0);
  			/* If n is not on any hash chain, prev[n] is garbage but
  			 * its value will never be used.
  			 */
-Line 594 
 static void fill_window(void)
+Line 574 
 static void fill_window(void)
  		more += WSIZE;
  	}
  	/* At this point, more >= 2 */
- 	if (!eofile) {
+ 	if (!G1.eofile) {
- 		n = file_read(window + strstart + lookahead, more);
+ 		n = file_read(G1.window + G1.strstart + G1.lookahead, more);
  		if (n == 0 || n == (unsigned) -1) {
- 			eofile = 1;
+ 			G1.eofile = 1;
  		} else {
- 			lookahead += n;
+ 			G1.lookahead += n;
  		}
  	}
  }
-Line 621 
 static void fill_window(void)
+Line 601 
 static void fill_window(void)
  static int longest_match(IPos cur_match)
  {
  	unsigned chain_length = max_chain_length;	/* max hash chain length */
- 	uch *scan = window + strstart;	/* current string */
+ 	uch *scan = G1.window + G1.strstart;	/* current string */
  	uch *match;	/* matched string */
  	int len;	/* length of current match */
- 	int best_len = prev_length;	/* best match length so far */
+ 	int best_len = G1.prev_length;	/* best match length so far */
- 	IPos limit = strstart > (IPos) MAX_DIST ? strstart - (IPos) MAX_DIST : 0;
+ 	IPos limit = G1.strstart > (IPos) MAX_DIST ? G1.strstart - (IPos) MAX_DIST : 0;
  	/* Stop when cur_match becomes <= limit. To simplify the code,
  	 * we prevent matches with the string of window index 0.
  	 */
-Line 636 
 static int longest_match(IPos cur_match)
+Line 616 
 static int longest_match(IPos cur_match)
  #if HASH_BITS < 8 || MAX_MATCH != 258
  #  error Code too clever
  #endif
- 	uch *strend = window + strstart + MAX_MATCH;
+ 	uch *strend = G1.window + G1.strstart + MAX_MATCH;
  	uch scan_end1 = scan[best_len - 1];
  	uch scan_end = scan[best_len];
  	/* Do not waste too much time if we already have a good match: */
- 	if (prev_length >= good_match) {
+ 	if (G1.prev_length >= good_match) {
  		chain_length >>= 2;
  	}
- 	Assert(strstart <= WINDOW_SIZE - MIN_LOOKAHEAD, "insufficient lookahead");
+ 	Assert(G1.strstart <= WINDOW_SIZE - MIN_LOOKAHEAD, "insufficient lookahead");
  	do {
- 		Assert(cur_match < strstart, "no future");
+ 		Assert(cur_match < G1.strstart, "no future");
- 		match = window + cur_match;
+ 		match = G1.window + cur_match;
  		/* Skip to next match if the match length cannot increase
  		 * or if the match length is less than 2:
-Line 679 
 static int longest_match(IPos cur_match)
+Line 659 
 static int longest_match(IPos cur_match)
  		scan = strend - MAX_MATCH;
  		if (len > best_len) {
- 			match_start = cur_match;
+ 			G1.match_start = cur_match;
  			best_len = len;
  			if (len >= nice_match)
  				break;
  			scan_end1 = scan[best_len - 1];
  			scan_end = scan[best_len];
  		}
- 	} while ((cur_match = prev[cur_match & WMASK]) > limit
+ 	} while ((cur_match = G1.prev[cur_match & WMASK]) > limit
  			 && --chain_length != 0);
  	return best_len;
-Line 700 
 static int longest_match(IPos cur_match)
+Line 680 
 static int longest_match(IPos cur_match)
  static void check_match(IPos start, IPos match, int length)
  {
  	/* check that the match is indeed a match */
- 	if (memcmp(window + match, window + start, length) != 0) {
+ 	if (memcmp(G1.window + match, G1.window + start, length) != 0) {
  		bb_error_msg(" start %d, match %d, length %d", start, match, length);
  		bb_error_msg("invalid match");
  	}
  	if (verbose > 1) {
  		bb_error_msg("\\[%d,%d]", start - match, length);
  		do {
- 			putc(window[start++], stderr);
+ 			fputc(G1.window[start++], stderr);
  		} while (--length != 0);
  	}
  }
-Line 751 
 static void check_match(IPos start, IPos
+Line 731 
 static void check_match(IPos start, IPos
   *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
   *
   *  INTERFACE
-  *      void ct_init(ush *attr, int *methodp)
+  *      void ct_init()
-  *          Allocate the match buffer, initialize the various tables and save
+  *          Allocate the match buffer, initialize the various tables [and save
   *          the location of the internal file attribute (ascii/binary) and
-  *          method (DEFLATE/STORE)
+  *          method (DEFLATE/STORE) -- deleted in bbox]
   *
   *      void ct_tally(int dist, int lc);
   *          Save the match info and tally the frequency counts.
-Line 789 
 static void check_match(IPos start, IPos
+Line 769 
 static void check_match(IPos start, IPos
  #define BL_CODES  19
  /* number of codes used to transfer the bit lengths */
- typedef uch extra_bits_t;
  /* extra bits for each length code */
- static const extra_bits_t extra_lbits[LENGTH_CODES]= {
+ static const uint8_t extra_lbits[LENGTH_CODES] ALIGN1 = {
 , 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4,
 , 4, 5, 5, 5, 5, 0
  };
  /* extra bits for each distance code */
- static const extra_bits_t extra_dbits[D_CODES] = {
+ static const uint8_t extra_dbits[D_CODES] ALIGN1 = {
 , 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,
 , 10, 11, 11, 12, 12, 13, 13
  };
  /* extra bits for each bit length code */
- static const extra_bits_t extra_blbits[BL_CODES] = {
+ static const uint8_t extra_blbits[BL_CODES] ALIGN1 = {
 , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 7 };
+ /* number of codes at each bit length for an optimal tree */
+ static const uint8_t bl_order[BL_CODES] ALIGN1 = {
+, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 };
  #define STORED_BLOCK 0
  #define STATIC_TREES 1
  #define DYN_TREES    2
-Line 875 
 typedef struct ct_data {
+Line 857 
 typedef struct ct_data {
  #define HEAP_SIZE (2*L_CODES + 1)
  /* maximum heap size */
- ////static int heap[HEAP_SIZE];     /* heap used to build the Huffman trees */
+ typedef struct tree_desc {
- ////let's try this
+ 	ct_data *dyn_tree;	/* the dynamic tree */
- static ush heap[HEAP_SIZE];     /* heap used to build the Huffman trees */
+ 	ct_data *static_tree;	/* corresponding static tree or NULL */
- static int heap_len;            /* number of elements in the heap */
+ 	const uint8_t *extra_bits;	/* extra bits for each code or NULL */
- static int heap_max;            /* element of largest frequency */
+ 	int extra_base;		/* base index for extra_bits */
+ 	int elems;			/* max number of elements in the tree */
+ 	int max_length;		/* max bit length for the codes */
+ 	int max_code;		/* largest code with non zero frequency */
+ } tree_desc;
+ struct globals2 {
+ 	ush heap[HEAP_SIZE];     /* heap used to build the Huffman trees */
+ 	int heap_len;            /* number of elements in the heap */
+ 	int heap_max;            /* element of largest frequency */
  /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
   * The same heap array is used to build all trees.
   */
- static ct_data dyn_ltree[HEAP_SIZE];	/* literal and length tree */
+ 	ct_data dyn_ltree[HEAP_SIZE];	/* literal and length tree */
- static ct_data dyn_dtree[2 * D_CODES + 1];	/* distance tree */
+ 	ct_data dyn_dtree[2 * D_CODES + 1];	/* distance tree */
- static ct_data static_ltree[L_CODES + 2];
+ 	ct_data static_ltree[L_CODES + 2];
  /* The static literal tree. Since the bit lengths are imposed, there is no
   * need for the L_CODES extra codes used during heap construction. However
-Line 896 
 static ct_data static_ltree[L_CODES + 2]
+Line 888 
 static ct_data static_ltree[L_CODES + 2]
   * below).
   */
- static ct_data static_dtree[D_CODES];
+ 	ct_data static_dtree[D_CODES];
  /* The static distance tree. (Actually a trivial tree since all codes use
   * 5 bits.)
   */
- static ct_data bl_tree[2 * BL_CODES + 1];
+ 	ct_data bl_tree[2 * BL_CODES + 1];
  /* Huffman tree for the bit lengths */
- typedef struct tree_desc {
+ 	tree_desc l_desc;
- 	ct_data *dyn_tree;	/* the dynamic tree */
+ 	tree_desc d_desc;
- 	ct_data *static_tree;	/* corresponding static tree or NULL */
+ 	tree_desc bl_desc;
- 	const extra_bits_t *extra_bits;	/* extra bits for each code or NULL */
- 	int extra_base;		/* base index for extra_bits */
- 	int elems;			/* max number of elements in the tree */
- 	int max_length;		/* max bit length for the codes */
- 	int max_code;		/* largest code with non zero frequency */
- } tree_desc;
- static tree_desc l_desc = {
- 	dyn_ltree, static_ltree, extra_lbits,
- 	LITERALS + 1, L_CODES, MAX_BITS, 0
- };
- static tree_desc d_desc = {
+ 	ush bl_count[MAX_BITS + 1];
- 	dyn_dtree, static_dtree, extra_dbits, 0, D_CODES, MAX_BITS, 0
- };
- static tree_desc bl_desc = {
- 	bl_tree, NULL, extra_blbits, 0, BL_CODES, MAX_BL_BITS,	0
- };
- static ush bl_count[MAX_BITS + 1];
- /* number of codes at each bit length for an optimal tree */
- static const uch bl_order[BL_CODES] = {
-, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
- };
  /* The lengths of the bit length codes are sent in order of decreasing
   * probability, to avoid transmitting the lengths for unused bit length codes.
   */
- static uch depth[2 * L_CODES + 1];
+ 	uch depth[2 * L_CODES + 1];
  /* Depth of each subtree used as tie breaker for trees of equal frequency */
- static uch length_code[MAX_MATCH - MIN_MATCH + 1];
+ 	uch length_code[MAX_MATCH - MIN_MATCH + 1];
  /* length code for each normalized match length (0 == MIN_MATCH) */
- static uch dist_code[512];
+ 	uch dist_code[512];
  /* distance codes. The first 256 values correspond to the distances
   * 3 .. 258, the last 256 values correspond to the top 8 bits of
   * the 15 bit distances.
   */
- static int base_length[LENGTH_CODES];
+ 	int base_length[LENGTH_CODES];
  /* First normalized length for each code (0 = MIN_MATCH) */
- static int base_dist[D_CODES];
+ 	int base_dist[D_CODES];
  /* First normalized distance for each code (0 = distance of 1) */
- static uch flag_buf[LIT_BUFSIZE / 8];
+ 	uch flag_buf[LIT_BUFSIZE / 8];
  /* flag_buf is a bit array distinguishing literals from lengths in
   * l_buf, thus indicating the presence or absence of a distance.
   */
- static unsigned last_lit;       /* running index in l_buf */
+ 	unsigned last_lit;       /* running index in l_buf */
- static unsigned last_dist;      /* running index in d_buf */
+ 	unsigned last_dist;      /* running index in d_buf */
- static unsigned last_flags;     /* running index in flag_buf */
+ 	unsigned last_flags;     /* running index in flag_buf */
- static uch flags;               /* current flags not yet saved in flag_buf */
+ 	uch flags;               /* current flags not yet saved in flag_buf */
- static uch flag_bit;            /* current bit used in flags */
+ 	uch flag_bit;            /* current bit used in flags */
  /* bits are filled in flags starting at bit 0 (least significant).
   * Note: these flags are overkill in the current code since we don't
   * take advantage of DIST_BUFSIZE == LIT_BUFSIZE.
   */
- static ulg opt_len;             /* bit length of current block with optimal trees */
+ 	ulg opt_len;             /* bit length of current block with optimal trees */
- static ulg static_len;          /* bit length of current block with static trees */
+ 	ulg static_len;          /* bit length of current block with static trees */
- static ulg compressed_len;      /* total bit length of compressed file */
+ 	ulg compressed_len;      /* total bit length of compressed file */
+ };
+ #define G2ptr ((struct globals2*)(ptr_to_globals))
+ #define G2 (*G2ptr)
- static ush *file_type;          /* pointer to UNKNOWN, BINARY or ASCII */
- static int *file_method;        /* pointer to DEFLATE or STORE */
  /* ===========================================================================
   */
-Line 1013 
 static void compress_block(ct_data * ltr
+Line 981 
 static void compress_block(ct_data * ltr
  #endif
  #define D_CODE(dist) \
- 	((dist) < 256 ? dist_code[dist] : dist_code[256 + ((dist)>>7)])
+ 	((dist) < 256 ? G2.dist_code[dist] : G2.dist_code[256 + ((dist)>>7)])
  /* Mapping from a distance to a distance code. dist is the distance - 1 and
   * must not have side effects. dist_code[256] and dist_code[257] are never
   * used.
-Line 1030 
 static void init_block(void)
+Line 998 
 static void init_block(void)
  	/* Initialize the trees. */
  	for (n = 0; n < L_CODES; n++)
- 		dyn_ltree[n].Freq = 0;
+ 		G2.dyn_ltree[n].Freq = 0;
  	for (n = 0; n < D_CODES; n++)
- 		dyn_dtree[n].Freq = 0;
+ 		G2.dyn_dtree[n].Freq = 0;
  	for (n = 0; n < BL_CODES; n++)
- 		bl_tree[n].Freq = 0;
+ 		G2.bl_tree[n].Freq = 0;
- 	dyn_ltree[END_BLOCK].Freq = 1;
+ 	G2.dyn_ltree[END_BLOCK].Freq = 1;
- 	opt_len = static_len = 0;
+ 	G2.opt_len = G2.static_len = 0;
- 	last_lit = last_dist = last_flags = 0;
+ 	G2.last_lit = G2.last_dist = G2.last_flags = 0;
- 	flags = 0;
+ 	G2.flags = 0;
- 	flag_bit = 1;
+ 	G2.flag_bit = 1;
  }
-Line 1055 
 static void init_block(void)
+Line 1023 
 static void init_block(void)
   * the subtrees have equal frequency. This minimizes the worst case length. */
  #define SMALLER(tree, n, m) \
  	(tree[n].Freq < tree[m].Freq \
- 	|| (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m]))
+ 	|| (tree[n].Freq == tree[m].Freq && G2.depth[n] <= G2.depth[m]))
  static void pqdownheap(ct_data * tree, int k)
  {
- 	int v = heap[k];
+ 	int v = G2.heap[k];
  	int j = k << 1;		/* left son of k */
- 	while (j <= heap_len) {
+ 	while (j <= G2.heap_len) {
  		/* Set j to the smallest of the two sons: */
- 		if (j < heap_len && SMALLER(tree, heap[j + 1], heap[j]))
+ 		if (j < G2.heap_len && SMALLER(tree, G2.heap[j + 1], G2.heap[j]))
  			j++;
  		/* Exit if v is smaller than both sons */
- 		if (SMALLER(tree, v, heap[j]))
+ 		if (SMALLER(tree, v, G2.heap[j]))
  			break;
  		/* Exchange v with the smallest son */
- 		heap[k] = heap[j];
+ 		G2.heap[k] = G2.heap[j];
  		k = j;
  		/* And continue down the tree, setting j to the left son of k */
  		j <<= 1;
  	}
- 	heap[k] = v;
+ 	G2.heap[k] = v;
  }
-Line 1095 
 static void pqdownheap(ct_data * tree, i
+Line 1063 
 static void pqdownheap(ct_data * tree, i
  static void gen_bitlen(tree_desc * desc)
  {
  	ct_data *tree = desc->dyn_tree;
- 	const extra_bits_t *extra = desc->extra_bits;
+ 	const uint8_t *extra = desc->extra_bits;
  	int base = desc->extra_base;
  	int max_code = desc->max_code;
  	int max_length = desc->max_length;
-Line 1108 
 static void gen_bitlen(tree_desc * desc)
+Line 1076 
 static void gen_bitlen(tree_desc * desc)
  	int overflow = 0;	/* number of elements with bit length too large */
  	for (bits = 0; bits <= MAX_BITS; bits++)
- 		bl_count[bits] = 0;
+ 		G2.bl_count[bits] = 0;
  	/* In a first pass, compute the optimal bit lengths (which may
  	 * overflow in the case of the bit length tree).
  	 */
- 	tree[heap[heap_max]].Len = 0;	/* root of the heap */
+ 	tree[G2.heap[G2.heap_max]].Len = 0;	/* root of the heap */
- 	for (h = heap_max + 1; h < HEAP_SIZE; h++) {
+ 	for (h = G2.heap_max + 1; h < HEAP_SIZE; h++) {
- 		n = heap[h];
+ 		n = G2.heap[h];
  		bits = tree[tree[n].Dad].Len + 1;
  		if (bits > max_length) {
  			bits = max_length;
-Line 1128 
 static void gen_bitlen(tree_desc * desc)
+Line 1096 
 static void gen_bitlen(tree_desc * desc)
  		if (n > max_code)
  			continue;	/* not a leaf node */
- 		bl_count[bits]++;
+ 		G2.bl_count[bits]++;
  		xbits = 0;
  		if (n >= base)
  			xbits = extra[n - base];
  		f = tree[n].Freq;
- 		opt_len += (ulg) f *(bits + xbits);
+ 		G2.opt_len += (ulg) f *(bits + xbits);
  		if (stree)
- 			static_len += (ulg) f * (stree[n].Len + xbits);
+ 			G2.static_len += (ulg) f * (stree[n].Len + xbits);
  	}
  	if (overflow == 0)
  		return;
-Line 1147 
 static void gen_bitlen(tree_desc * desc)
+Line 1115 
 static void gen_bitlen(tree_desc * desc)
  	/* Find the first bit length which could increase: */
  	do {
  		bits = max_length - 1;
- 		while (bl_count[bits] == 0)
+ 		while (G2.bl_count[bits] == 0)
  			bits--;
- 		bl_count[bits]--;	/* move one leaf down the tree */
+ 		G2.bl_count[bits]--;	/* move one leaf down the tree */
- 		bl_count[bits + 1] += 2;	/* move one overflow item as its brother */
+ 		G2.bl_count[bits + 1] += 2;	/* move one overflow item as its brother */
- 		bl_count[max_length]--;
+ 		G2.bl_count[max_length]--;
  		/* The brother of the overflow item also moves one step up,
  		 * but this does not affect bl_count[max_length]
  		 */
-Line 1164 
 static void gen_bitlen(tree_desc * desc)
+Line 1132 
 static void gen_bitlen(tree_desc * desc)
  	 * from 'ar' written by Haruhiko Okumura.)
  	 */
  	for (bits = max_length; bits != 0; bits--) {
- 		n = bl_count[bits];
+ 		n = G2.bl_count[bits];
  		while (n != 0) {
- 			m = heap[--h];
+ 			m = G2.heap[--h];
  			if (m > max_code)
  				continue;
  			if (tree[m].Len != (unsigned) bits) {
  				Trace((stderr, "code %d bits %d->%d\n", m, tree[m].Len, bits));
- 				opt_len += ((int32_t) bits - tree[m].Len) * tree[m].Freq;
+ 				G2.opt_len += ((int32_t) bits - tree[m].Len) * tree[m].Freq;
  				tree[m].Len = bits;
  			}
  			n--;
-Line 1199 
 static void gen_codes(ct_data * tree, in
+Line 1167 
 static void gen_codes(ct_data * tree, in
  	 * without bit reversal.
  	 */
  	for (bits = 1; bits <= MAX_BITS; bits++) {
- 		next_code[bits] = code = (code + bl_count[bits - 1]) << 1;
+ 		next_code[bits] = code = (code + G2.bl_count[bits - 1]) << 1;
  	}
  	/* Check that the bit counts in bl_count are consistent. The last code
  	 * must be all ones.
  	 */
- 	Assert(code + bl_count[MAX_BITS] - 1 == (1 << MAX_BITS) - 1,
+ 	Assert(code + G2.bl_count[MAX_BITS] - 1 == (1 << MAX_BITS) - 1,
  		   "inconsistent bit counts");
  	Tracev((stderr, "\ngen_codes: max_code %d ", max_code));
-Line 1216 
 static void gen_codes(ct_data * tree, in
+Line 1184 
 static void gen_codes(ct_data * tree, in
  		/* Now reverse the bits */
  		tree[n].Code = bi_reverse(next_code[len]++, len);
- 		Tracec(tree != static_ltree,
+ 		Tracec(tree != G2.static_ltree,
  			   (stderr, "\nn %3d %c l %2d c %4x (%x) ", n,
  				(isgraph(n) ? n : ' '), len, tree[n].Code,
  				next_code[len] - 1));
-Line 1240 
 static void gen_codes(ct_data * tree, in
+Line 1208 
 static void gen_codes(ct_data * tree, in
  /* Index within the heap array of least frequent node in the Huffman tree */
  #define PQREMOVE(tree, top) \
- { \
+ do { \
- 	top = heap[SMALLEST]; \
+ 	top = G2.heap[SMALLEST]; \
- 	heap[SMALLEST] = heap[heap_len--]; \
+ 	G2.heap[SMALLEST] = G2.heap[G2.heap_len--]; \
  	pqdownheap(tree, SMALLEST); \
- }
+ } while (0)
  static void build_tree(tree_desc * desc)
  {
-Line 1259 
 static void build_tree(tree_desc * desc)
+Line 1227 
 static void build_tree(tree_desc * desc)
  	 * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
  	 * heap[0] is not used.
  	 */
- 	heap_len = 0, heap_max = HEAP_SIZE;
+ 	G2.heap_len = 0;
+ 	G2.heap_max = HEAP_SIZE;
  	for (n = 0; n < elems; n++) {
  		if (tree[n].Freq != 0) {
- 			heap[++heap_len] = max_code = n;
+ 			G2.heap[++G2.heap_len] = max_code = n;
- 			depth[n] = 0;
+ 			G2.depth[n] = 0;
  		} else {
  			tree[n].Len = 0;
  		}
-Line 1275 
 static void build_tree(tree_desc * desc)
+Line 1244 
 static void build_tree(tree_desc * desc)
  	 * possible code. So to avoid special checks later on we force at least
  	 * two codes of non zero frequency.
  	 */
- 	while (heap_len < 2) {
+ 	while (G2.heap_len < 2) {
- 		int new = heap[++heap_len] = (max_code < 2 ? ++max_code : 0);
+ 		int new = G2.heap[++G2.heap_len] = (max_code < 2 ? ++max_code : 0);
  		tree[new].Freq = 1;
- 		depth[new] = 0;
+ 		G2.depth[new] = 0;
- 		opt_len--;
+ 		G2.opt_len--;
  		if (stree)
- 			static_len -= stree[new].Len;
+ 			G2.static_len -= stree[new].Len;
  		/* new is 0 or 1 so it does not have extra bits */
  	}
  	desc->max_code = max_code;
-Line 1290 
 static void build_tree(tree_desc * desc)
+Line 1259 
 static void build_tree(tree_desc * desc)
  	/* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
  	 * establish sub-heaps of increasing lengths:
  	 */
- 	for (n = heap_len / 2; n >= 1; n--)
+ 	for (n = G2.heap_len / 2; n >= 1; n--)
  		pqdownheap(tree, n);
  	/* Construct the Huffman tree by repeatedly combining the least two
-Line 1298 
 static void build_tree(tree_desc * desc)
+Line 1267 
 static void build_tree(tree_desc * desc)
  	 */
  	do {
  		PQREMOVE(tree, n);	/* n = node of least frequency */
- 		m = heap[SMALLEST];	/* m = node of next least frequency */
+ 		m = G2.heap[SMALLEST];	/* m = node of next least frequency */
- 		heap[--heap_max] = n;	/* keep the nodes sorted by frequency */
+ 		G2.heap[--G2.heap_max] = n;	/* keep the nodes sorted by frequency */
- 		heap[--heap_max] = m;
+ 		G2.heap[--G2.heap_max] = m;
  		/* Create a new node father of n and m */
  		tree[node].Freq = tree[n].Freq + tree[m].Freq;
- 		depth[node] = MAX(depth[n], depth[m]) + 1;
+ 		G2.depth[node] = MAX(G2.depth[n], G2.depth[m]) + 1;
  		tree[n].Dad = tree[m].Dad = (ush) node;
  #ifdef DUMP_BL_TREE
- 		if (tree == bl_tree) {
+ 		if (tree == G2.bl_tree) {
  			bb_error_msg("\nnode %d(%d), sons %d(%d) %d(%d)",
  					node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq);
  		}
  #endif
  		/* and insert the new node in the heap */
- 		heap[SMALLEST] = node++;
+ 		G2.heap[SMALLEST] = node++;
  		pqdownheap(tree, SMALLEST);
- 	} while (heap_len >= 2);
+ 	} while (G2.heap_len >= 2);
- 	heap[--heap_max] = heap[SMALLEST];
+ 	G2.heap[--G2.heap_max] = G2.heap[SMALLEST];
  	/* At this point, the fields freq and dad are set. We can now
  	 * generate the bit lengths.
-Line 1360 
 static void scan_tree(ct_data * tree, in
+Line 1329 
 static void scan_tree(ct_data * tree, in
  			continue;
  		if (count < min_count) {
- 			bl_tree[curlen].Freq += count;
+ 			G2.bl_tree[curlen].Freq += count;
  		} else if (curlen != 0) {
  			if (curlen != prevlen)
- 				bl_tree[curlen].Freq++;
+ 				G2.bl_tree[curlen].Freq++;
- 			bl_tree[REP_3_6].Freq++;
+ 			G2.bl_tree[REP_3_6].Freq++;
  		} else if (count <= 10) {
- 			bl_tree[REPZ_3_10].Freq++;
+ 			G2.bl_tree[REPZ_3_10].Freq++;
  		} else {
- 			bl_tree[REPZ_11_138].Freq++;
+ 			G2.bl_tree[REPZ_11_138].Freq++;
  		}
  		count = 0;
  		prevlen = curlen;
-Line 1411 
 static void send_tree(ct_data * tree, in
+Line 1380 
 static void send_tree(ct_data * tree, in
  			continue;
  		} else if (count < min_count) {
  			do {
- 				SEND_CODE(curlen, bl_tree);
+ 				SEND_CODE(curlen, G2.bl_tree);
  			} while (--count);
  		} else if (curlen != 0) {
  			if (curlen != prevlen) {
- 				SEND_CODE(curlen, bl_tree);
+ 				SEND_CODE(curlen, G2.bl_tree);
  				count--;
  			}
  			Assert(count >= 3 && count <= 6, " 3_6?");
- 			SEND_CODE(REP_3_6, bl_tree);
+ 			SEND_CODE(REP_3_6, G2.bl_tree);
  			send_bits(count - 3, 2);
  		} else if (count <= 10) {
- 			SEND_CODE(REPZ_3_10, bl_tree);
+ 			SEND_CODE(REPZ_3_10, G2.bl_tree);
  			send_bits(count - 3, 3);
  		} else {
- 			SEND_CODE(REPZ_11_138, bl_tree);
+ 			SEND_CODE(REPZ_11_138, G2.bl_tree);
  			send_bits(count - 11, 7);
  		}
  		count = 0;
-Line 1453 
 static int build_bl_tree(void)
+Line 1422 
 static int build_bl_tree(void)
  	int max_blindex;	/* index of last bit length code of non zero freq */
  	/* Determine the bit length frequencies for literal and distance trees */
- 	scan_tree((ct_data *) dyn_ltree, l_desc.max_code);
+ 	scan_tree(G2.dyn_ltree, G2.l_desc.max_code);
- 	scan_tree((ct_data *) dyn_dtree, d_desc.max_code);
+ 	scan_tree(G2.dyn_dtree, G2.d_desc.max_code);
  	/* Build the bit length tree: */
- 	build_tree((tree_desc *) &bl_desc);
+ 	build_tree(&G2.bl_desc);
  	/* opt_len now includes the length of the tree representations, except
  	 * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
  	 */
-Line 1467 
 static int build_bl_tree(void)
+Line 1436 
 static int build_bl_tree(void)
  	 * 3 but the actual value used is 4.)
  	 */
  	for (max_blindex = BL_CODES - 1; max_blindex >= 3; max_blindex--) {
- 		if (bl_tree[bl_order[max_blindex]].Len != 0)
+ 		if (G2.bl_tree[bl_order[max_blindex]].Len != 0)
  			break;
  	}
  	/* Update opt_len to include the bit length tree and counts */
- 	opt_len += 3 * (max_blindex + 1) + 5 + 5 + 4;
+ 	G2.opt_len += 3 * (max_blindex + 1) + 5 + 5 + 4;
- 	Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld", opt_len, static_len));
+ 	Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld", G2.opt_len, G2.static_len));
  	return max_blindex;
  }
-Line 1496 
 static void send_all_trees(int lcodes, i
+Line 1465 
 static void send_all_trees(int lcodes, i
  	send_bits(blcodes - 4, 4);	/* not -3 as stated in appnote.txt */
  	for (rank = 0; rank < blcodes; rank++) {
  		Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
- 		send_bits(bl_tree[bl_order[rank]].Len, 3);
+ 		send_bits(G2.bl_tree[bl_order[rank]].Len, 3);
  	}
- 	Tracev((stderr, "\nbl tree: sent %ld", bits_sent));
+ 	Tracev((stderr, "\nbl tree: sent %ld", G1.bits_sent));
- 	send_tree((ct_data *) dyn_ltree, lcodes - 1);	/* send the literal tree */
- 	Tracev((stderr, "\nlit tree: sent %ld", bits_sent));
- 	send_tree((ct_data *) dyn_dtree, dcodes - 1);	/* send the distance tree */
+ 	send_tree((ct_data *) G2.dyn_ltree, lcodes - 1);	/* send the literal tree */
- 	Tracev((stderr, "\ndist tree: sent %ld", bits_sent));
+ 	Tracev((stderr, "\nlit tree: sent %ld", G1.bits_sent));
- }
- /* ===========================================================================
-  * Set the file type to ASCII or BINARY, using a crude approximation:
-  * binary if more than 20% of the bytes are <= 6 or >= 128, ascii otherwise.
-  * IN assertion: the fields freq of dyn_ltree are set and the total of all
-  * frequencies does not exceed 64K (to fit in an int on 16 bit machines).
-  */
- static void set_file_type(void)
- {
- 	int n = 0;
- 	unsigned ascii_freq = 0;
- 	unsigned bin_freq = 0;
- 	while (n < 7)
+ 	send_tree((ct_data *) G2.dyn_dtree, dcodes - 1);	/* send the distance tree */
- 		bin_freq += dyn_ltree[n++].Freq;
+ 	Tracev((stderr, "\ndist tree: sent %ld", G1.bits_sent));
- 	while (n < 128)
- 		ascii_freq += dyn_ltree[n++].Freq;
- 	while (n < LITERALS)
- 		bin_freq += dyn_ltree[n++].Freq;
- 	*file_type = (bin_freq > (ascii_freq >> 2)) ? BINARY : ASCII;
- 	if (*file_type == BINARY && translate_eol) {
- 		bb_error_msg("-l used on binary file");
- 	}
  }
-Line 1539 
 static void set_file_type(void)
+Line 1483 
 static void set_file_type(void)
   */
  static int ct_tally(int dist, int lc)
  {
- 	l_buf[last_lit++] = lc;
+ 	G1.l_buf[G2.last_lit++] = lc;
  	if (dist == 0) {
  		/* lc is the unmatched char */
- 		dyn_ltree[lc].Freq++;
+ 		G2.dyn_ltree[lc].Freq++;
  	} else {
  		/* Here, lc is the match length - MIN_MATCH */
  		dist--;			/* dist = match distance - 1 */
-Line 1551 
 static int ct_tally(int dist, int lc)
+Line 1495 
 static int ct_tally(int dist, int lc)
  		 && (ush) D_CODE(dist) < (ush) D_CODES, "ct_tally: bad match"
  		);
- 		dyn_ltree[length_code[lc] + LITERALS + 1].Freq++;
+ 		G2.dyn_ltree[G2.length_code[lc] + LITERALS + 1].Freq++;
- 		dyn_dtree[D_CODE(dist)].Freq++;
+ 		G2.dyn_dtree[D_CODE(dist)].Freq++;
- 		d_buf[last_dist++] = dist;
+ 		G1.d_buf[G2.last_dist++] = dist;
- 		flags |= flag_bit;
+ 		G2.flags |= G2.flag_bit;
  	}
- 	flag_bit <<= 1;
+ 	G2.flag_bit <<= 1;
  	/* Output the flags if they fill a byte: */
- 	if ((last_lit & 7) == 0) {
+ 	if ((G2.last_lit & 7) == 0) {
- 		flag_buf[last_flags++] = flags;
+ 		G2.flag_buf[G2.last_flags++] = G2.flags;
- 		flags = 0, flag_bit = 1;
+ 		G2.flags = 0;
+ 		G2.flag_bit = 1;
  	}
  	/* Try to guess if it is profitable to stop the current block here */
- 	if ((last_lit & 0xfff) == 0) {
+ 	if ((G2.last_lit & 0xfff) == 0) {
  		/* Compute an upper bound for the compressed length */
- 		ulg out_length = last_lit * 8L;
+ 		ulg out_length = G2.last_lit * 8L;
- 		ulg in_length = (ulg) strstart - block_start;
+ 		ulg in_length = (ulg) G1.strstart - G1.block_start;
  		int dcode;
  		for (dcode = 0; dcode < D_CODES; dcode++) {
- 			out_length += dyn_dtree[dcode].Freq * (5L + extra_dbits[dcode]);
+ 			out_length += G2.dyn_dtree[dcode].Freq * (5L + extra_dbits[dcode]);
  		}
  		out_length >>= 3;
  		Trace((stderr,
  			   "\nlast_lit %u, last_dist %u, in %ld, out ~%ld(%ld%%) ",
- 			   last_lit, last_dist, in_length, out_length,
+ 			   G2.last_lit, G2.last_dist, in_length, out_length,
 L - out_length * 100L / in_length));
- 		if (last_dist < last_lit / 2 && out_length < in_length / 2)
+ 		if (G2.last_dist < G2.last_lit / 2 && out_length < in_length / 2)
  			return 1;
  	}
- 	return (last_lit == LIT_BUFSIZE - 1 || last_dist == DIST_BUFSIZE);
+ 	return (G2.last_lit == LIT_BUFSIZE - 1 || G2.last_dist == DIST_BUFSIZE);
  	/* We avoid equality with LIT_BUFSIZE because of wraparound at 64K
  	 * on 16 bit machines and because stored blocks are restricted to
  	 * 64K-1 bytes.
-Line 1603 
 static void compress_block(ct_data * ltr
+Line 1548 
 static void compress_block(ct_data * ltr
  	unsigned code;          /* the code to send */
  	int extra;              /* number of extra bits to send */
- 	if (last_lit != 0) do {
+ 	if (G2.last_lit != 0) do {
  		if ((lx & 7) == 0)
- 			flag = flag_buf[fx++];
+ 			flag = G2.flag_buf[fx++];
- 		lc = l_buf[lx++];
+ 		lc = G1.l_buf[lx++];
  		if ((flag & 1) == 0) {
  			SEND_CODE(lc, ltree);	/* send a literal byte */
  			Tracecv(isgraph(lc), (stderr, " '%c' ", lc));
  		} else {
  			/* Here, lc is the match length - MIN_MATCH */
- 			code = length_code[lc];
+ 			code = G2.length_code[lc];
  			SEND_CODE(code + LITERALS + 1, ltree);	/* send the length code */
  			extra = extra_lbits[code];
  			if (extra != 0) {
- 				lc -= base_length[code];
+ 				lc -= G2.base_length[code];
  				send_bits(lc, extra);	/* send the extra length bits */
  			}
- 			dist = d_buf[dx++];
+ 			dist = G1.d_buf[dx++];
  			/* Here, dist is the match distance - 1 */
  			code = D_CODE(dist);
  			Assert(code < D_CODES, "bad d_code");
-Line 1627 
 static void compress_block(ct_data * ltr
+Line 1572 
 static void compress_block(ct_data * ltr
  			SEND_CODE(code, dtree);	/* send the distance code */
  			extra = extra_dbits[code];
  			if (extra != 0) {
- 				dist -= base_dist[code];
+ 				dist -= G2.base_dist[code];
  				send_bits(dist, extra);	/* send the extra distance bits */
  			}
  		}			/* literal or match pair ? */
  		flag >>= 1;
- 	} while (lx < last_lit);
+ 	} while (lx < G2.last_lit);
  	SEND_CODE(END_BLOCK, ltree);
  }
-Line 1648 
 static ulg flush_block(char *buf, ulg st
+Line 1593 
 static ulg flush_block(char *buf, ulg st
  	ulg opt_lenb, static_lenb;      /* opt_len and static_len in bytes */
  	int max_blindex;                /* index of last bit length code of non zero freq */
- 	flag_buf[last_flags] = flags;   /* Save the flags for the last 8 items */
+ 	G2.flag_buf[G2.last_flags] = G2.flags;   /* Save the flags for the last 8 items */
- 	/* Check if the file is ascii or binary */
- 	if (*file_type == (ush) UNKNOWN)
- 		set_file_type();
  	/* Construct the literal and distance trees */
- 	build_tree((tree_desc *) &l_desc);
+ 	build_tree(&G2.l_desc);
- 	Tracev((stderr, "\nlit data: dyn %ld, stat %ld", opt_len, static_len));
+ 	Tracev((stderr, "\nlit data: dyn %ld, stat %ld", G2.opt_len, G2.static_len));
- 	build_tree((tree_desc *) &d_desc);
+ 	build_tree(&G2.d_desc);
- 	Tracev((stderr, "\ndist data: dyn %ld, stat %ld", opt_len, static_len));
+ 	Tracev((stderr, "\ndist data: dyn %ld, stat %ld", G2.opt_len, G2.static_len));
  	/* At this point, opt_len and static_len are the total bit lengths of
  	 * the compressed block data, excluding the tree representations.
  	 */
-Line 1670 
 static ulg flush_block(char *buf, ulg st
+Line 1611 
 static ulg flush_block(char *buf, ulg st
  	max_blindex = build_bl_tree();
  	/* Determine the best encoding. Compute first the block length in bytes */
- 	opt_lenb = (opt_len + 3 + 7) >> 3;
+ 	opt_lenb = (G2.opt_len + 3 + 7) >> 3;
- 	static_lenb = (static_len + 3 + 7) >> 3;
+ 	static_lenb = (G2.static_len + 3 + 7) >> 3;
  	Trace((stderr,
  		   "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u dist %u ",
- 		   opt_lenb, opt_len, static_lenb, static_len, stored_len,
+ 		   opt_lenb, G2.opt_len, static_lenb, G2.static_len, stored_len,
- 		   last_lit, last_dist));
+ 		   G2.last_lit, G2.last_dist));
  	if (static_lenb <= opt_lenb)
  		opt_lenb = static_lenb;
-Line 1685 
 static ulg flush_block(char *buf, ulg st
+Line 1626 
 static ulg flush_block(char *buf, ulg st
  	 * and if the zip file can be seeked (to rewrite the local header),
  	 * the whole file is transformed into a stored file:
  	 */
- 	if (stored_len <= opt_lenb && eof && compressed_len == 0L && seekable()) {
+ 	if (stored_len <= opt_lenb && eof && G2.compressed_len == 0L && seekable()) {
  		/* Since LIT_BUFSIZE <= 2*WSIZE, the input data must be there: */
  		if (buf == NULL)
  			bb_error_msg("block vanished");
  		copy_block(buf, (unsigned) stored_len, 0);	/* without header */
- 		compressed_len = stored_len << 3;
+ 		G2.compressed_len = stored_len << 3;
- 		*file_method = STORED;
  	} else if (stored_len + 4 <= opt_lenb && buf != NULL) {
  		/* 4: two words for the lengths */
-Line 1703 
 static ulg flush_block(char *buf, ulg st
+Line 1643 
 static ulg flush_block(char *buf, ulg st
  		 * transform a block into a stored block.
  		 */
  		send_bits((STORED_BLOCK << 1) + eof, 3);	/* send block type */
- 		compressed_len = (compressed_len + 3 + 7) & ~7L;
+ 		G2.compressed_len = (G2.compressed_len + 3 + 7) & ~7L;
- 		compressed_len += (stored_len + 4) << 3;
+ 		G2.compressed_len += (stored_len + 4) << 3;
  		copy_block(buf, (unsigned) stored_len, 1);	/* with header */
  	} else if (static_lenb == opt_lenb) {
  		send_bits((STATIC_TREES << 1) + eof, 3);
- 		compress_block((ct_data *) static_ltree, (ct_data *) static_dtree);
+ 		compress_block((ct_data *) G2.static_ltree, (ct_data *) G2.static_dtree);
- 		compressed_len += 3 + static_len;
+ 		G2.compressed_len += 3 + G2.static_len;
  	} else {
  		send_bits((DYN_TREES << 1) + eof, 3);
- 		send_all_trees(l_desc.max_code + 1, d_desc.max_code + 1,
+ 		send_all_trees(G2.l_desc.max_code + 1, G2.d_desc.max_code + 1,
  					   max_blindex + 1);
- 		compress_block((ct_data *) dyn_ltree, (ct_data *) dyn_dtree);
+ 		compress_block((ct_data *) G2.dyn_ltree, (ct_data *) G2.dyn_dtree);
- 		compressed_len += 3 + opt_len;
+ 		G2.compressed_len += 3 + G2.opt_len;
  	}
- 	Assert(compressed_len == bits_sent, "bad compressed size");
+ 	Assert(G2.compressed_len == G1.bits_sent, "bad compressed size");
  	init_block();
  	if (eof) {
  		bi_windup();
- 		compressed_len += 7;	/* align on byte boundary */
+ 		G2.compressed_len += 7;	/* align on byte boundary */
  	}
- 	Tracev((stderr, "\ncomprlen %lu(%lu) ", compressed_len >> 3,
+ 	Tracev((stderr, "\ncomprlen %lu(%lu) ", G2.compressed_len >> 3,
- 			compressed_len - 7 * eof));
+ 			G2.compressed_len - 7 * eof));
- 	return compressed_len >> 3;
+ 	return G2.compressed_len >> 3;
  }
-Line 1756 
 static ulg flush_block(char *buf, ulg st
+Line 1696 
 static ulg flush_block(char *buf, ulg st
   * IN assertion: strstart is set to the end of the current match. */
  #define FLUSH_BLOCK(eof) \
  	flush_block( \
- 		block_start >= 0L \
+ 		G1.block_start >= 0L \
- 			? (char*)&window[(unsigned)block_start] \
+ 			? (char*)&G1.window[(unsigned)G1.block_start] \
  			: (char*)NULL, \
- 		(ulg)strstart - block_start, \
+ 		(ulg)G1.strstart - G1.block_start, \
  		(eof) \
  	)
-Line 1770 
 static ulg flush_block(char *buf, ulg st
+Line 1710 
 static ulg flush_block(char *buf, ulg st
   *    input characters and the first MIN_MATCH bytes of s are valid
   *    (except for the last MIN_MATCH-1 bytes of the input file). */
  #define INSERT_STRING(s, match_head) \
- { \
+ do { \
- 	UPDATE_HASH(ins_h, window[(s) + MIN_MATCH-1]); \
+ 	UPDATE_HASH(G1.ins_h, G1.window[(s) + MIN_MATCH-1]); \
- 	prev[(s) & WMASK] = match_head = head[ins_h]; \
+ 	G1.prev[(s) & WMASK] = match_head = head[G1.ins_h]; \
- 	head[ins_h] = (s); \
+ 	head[G1.ins_h] = (s); \
- }
+ } while (0)
  static ulg deflate(void)
  {
-Line 1785 
 static ulg deflate(void)
+Line 1725 
 static ulg deflate(void)
  	unsigned match_length = MIN_MATCH - 1;	/* length of best match */
  	/* Process the input block. */
- 	while (lookahead != 0) {
+ 	while (G1.lookahead != 0) {
  		/* Insert the string window[strstart .. strstart+2] in the
  		 * dictionary, and set hash_head to the head of the hash chain:
  		 */
- 		INSERT_STRING(strstart, hash_head);
+ 		INSERT_STRING(G1.strstart, hash_head);
  		/* Find the longest match, discarding those <= prev_length.
  		 */
- 		prev_length = match_length, prev_match = match_start;
+ 		G1.prev_length = match_length;
+ 		prev_match = G1.match_start;
  		match_length = MIN_MATCH - 1;
- 		if (hash_head != 0 && prev_length < max_lazy_match
+ 		if (hash_head != 0 && G1.prev_length < max_lazy_match
- 		 && strstart - hash_head <= MAX_DIST
+ 		 && G1.strstart - hash_head <= MAX_DIST
  		) {
  			/* To simplify the code, we prevent matches with the string
  			 * of window index 0 (in particular we have to avoid a match
-Line 1805 
 static ulg deflate(void)
+Line 1746 
 static ulg deflate(void)
  			 */
  			match_length = longest_match(hash_head);
  			/* longest_match() sets match_start */
- 			if (match_length > lookahead)
+ 			if (match_length > G1.lookahead)
- 				match_length = lookahead;
+ 				match_length = G1.lookahead;
  			/* Ignore a length 3 match if it is too distant: */
- 			if (match_length == MIN_MATCH && strstart - match_start > TOO_FAR) {
+ 			if (match_length == MIN_MATCH && G1.strstart - G1.match_start > TOO_FAR) {
- 				/* If prev_match is also MIN_MATCH, match_start is garbage
+ 				/* If prev_match is also MIN_MATCH, G1.match_start is garbage
  				 * but we will ignore the current match anyway.
  				 */
  				match_length--;
-Line 1819 
 static ulg deflate(void)
+Line 1760 
 static ulg deflate(void)
  		/* If there was a match at the previous step and the current
  		 * match is not better, output the previous match:
  		 */
- 		if (prev_length >= MIN_MATCH && match_length <= prev_length) {
+ 		if (G1.prev_length >= MIN_MATCH && match_length <= G1.prev_length) {
- 			check_match(strstart - 1, prev_match, prev_length);
+ 			check_match(G1.strstart - 1, prev_match, G1.prev_length);
- 			flush = ct_tally(strstart - 1 - prev_match, prev_length - MIN_MATCH);
+ 			flush = ct_tally(G1.strstart - 1 - prev_match, G1.prev_length - MIN_MATCH);
  			/* Insert in hash table all strings up to the end of the match.
  			 * strstart-1 and strstart are already inserted.
  			 */
- 			lookahead -= prev_length - 1;
+ 			G1.lookahead -= G1.prev_length - 1;
- 			prev_length -= 2;
+ 			G1.prev_length -= 2;
  			do {
- 				strstart++;
+ 				G1.strstart++;
- 				INSERT_STRING(strstart, hash_head);
+ 				INSERT_STRING(G1.strstart, hash_head);
  				/* strstart never exceeds WSIZE-MAX_MATCH, so there are
  				 * always MIN_MATCH bytes ahead. If lookahead < MIN_MATCH
  				 * these bytes are garbage, but it does not matter since the
  				 * next lookahead bytes will always be emitted as literals.
  				 */
- 			} while (--prev_length != 0);
+ 			} while (--G1.prev_length != 0);
  			match_available = 0;
  			match_length = MIN_MATCH - 1;
- 			strstart++;
+ 			G1.strstart++;
  			if (flush) {
  				FLUSH_BLOCK(0);
- 				block_start = strstart;
+ 				G1.block_start = G1.strstart;
  			}
  		} else if (match_available) {
  			/* If there was no match at the previous position, output a
  			 * single literal. If there was a match but the current match
  			 * is longer, truncate the previous match to a single literal.
  			 */
- 			Tracevv((stderr, "%c", window[strstart - 1]));
+ 			Tracevv((stderr, "%c", G1.window[G1.strstart - 1]));
- 			if (ct_tally(0, window[strstart - 1])) {
+ 			if (ct_tally(0, G1.window[G1.strstart - 1])) {
  				FLUSH_BLOCK(0);
- 				block_start = strstart;
+ 				G1.block_start = G1.strstart;
  			}
- 			strstart++;
+ 			G1.strstart++;
- 			lookahead--;
+ 			G1.lookahead--;
  		} else {
  			/* There is no previous match to compare with, wait for
  			 * the next step to decide.
  			 */
  			match_available = 1;
- 			strstart++;
+ 			G1.strstart++;
- 			lookahead--;
+ 			G1.lookahead--;
  		}
- 		Assert(strstart <= isize && lookahead <= isize, "a bit too far");
+ 		Assert(G1.strstart <= G1.isize && lookahead <= G1.isize, "a bit too far");
  		/* Make sure that we always have enough lookahead, except
  		 * at the end of the input file. We need MAX_MATCH bytes
  		 * for the next match, plus MIN_MATCH bytes to insert the
  		 * string following the next match.
  		 */
- 		while (lookahead < MIN_LOOKAHEAD && !eofile)
+ 		while (G1.lookahead < MIN_LOOKAHEAD && !G1.eofile)
  			fill_window();
  	}
  	if (match_available)
- 		ct_tally(0, window[strstart - 1]);
+ 		ct_tally(0, G1.window[G1.strstart - 1]);
  	return FLUSH_BLOCK(1);	/* eof */
  }
-Line 1884 
 static ulg deflate(void)
+Line 1825 
 static ulg deflate(void)
  /* ===========================================================================
   * Initialize the bit string routines.
   */
- static void bi_init(void) //// int zipfile)
+ static void bi_init(void)
  {
- ////	zfile = zipfile;
+ 	G1.bi_buf = 0;
- 	bi_buf = 0;
+ 	G1.bi_valid = 0;
- 	bi_valid = 0;
  #ifdef DEBUG
- 	bits_sent = 0L;
+ 	G1.bits_sent = 0L;
  #endif
  }
-Line 1910 
 static void lm_init(ush * flagsp)
+Line 1850 
 static void lm_init(ush * flagsp)
  	*flagsp |= 2;	/* FAST 4, SLOW 2 */
  	/* ??? reduce max_chain_length for binary files */
- 	strstart = 0;
+ 	G1.strstart = 0;
- 	block_start = 0L;
+ 	G1.block_start = 0L;
- 	lookahead = file_read(window,
+ 	G1.lookahead = file_read(G1.window,
  			sizeof(int) <= 2 ? (unsigned) WSIZE : 2 * WSIZE);
- 	if (lookahead == 0 || lookahead == (unsigned) -1) {
+ 	if (G1.lookahead == 0 || G1.lookahead == (unsigned) -1) {
- 		eofile = 1;
+ 		G1.eofile = 1;
- 		lookahead = 0;
+ 		G1.lookahead = 0;
  		return;
  	}
- 	eofile = 0;
+ 	G1.eofile = 0;
  	/* Make sure that we always have enough lookahead. This is important
  	 * if input comes from a device such as a tty.
  	 */
- 	while (lookahead < MIN_LOOKAHEAD && !eofile)
+ 	while (G1.lookahead < MIN_LOOKAHEAD && !G1.eofile)
  		fill_window();
- 	ins_h = 0;
+ 	G1.ins_h = 0;
  	for (j = 0; j < MIN_MATCH - 1; j++)
- 		UPDATE_HASH(ins_h, window[j]);
+ 		UPDATE_HASH(G1.ins_h, G1.window[j]);
  	/* If lookahead < MIN_MATCH, ins_h is garbage, but this is
  	 * not important since only literal bytes will be emitted.
  	 */
-Line 1943 
 static void lm_init(ush * flagsp)
+Line 1883 
 static void lm_init(ush * flagsp)
   * (DEFLATE/STORE).
   * One callsite in zip()
   */
- static void ct_init(ush * attr, int *methodp)
+ static void ct_init(void)
  {
  	int n;				/* iterates over tree elements */
  	int length;			/* length value */
  	int code;			/* code value */
  	int dist;			/* distance index */
- 	file_type = attr;
+ 	G2.compressed_len = 0L;
- 	file_method = methodp;
- 	compressed_len = 0L;
  #ifdef NOT_NEEDED
- 	if (static_dtree[0].Len != 0)
+ 	if (G2.static_dtree[0].Len != 0)
  		return;			/* ct_init already called */
  #endif
  	/* Initialize the mapping length (0..255) -> length code (0..28) */
  	length = 0;
  	for (code = 0; code < LENGTH_CODES - 1; code++) {
- 		base_length[code] = length;
+ 		G2.base_length[code] = length;
  		for (n = 0; n < (1 << extra_lbits[code]); n++) {
- 			length_code[length++] = code;
+ 			G2.length_code[length++] = code;
  		}
  	}
  	Assert(length == 256, "ct_init: length != 256");
-Line 1972 
 static void ct_init(ush * attr, int *met
+Line 1910 
 static void ct_init(ush * attr, int *met
  	 * in two different ways: code 284 + 5 bits or code 285, so we
  	 * overwrite length_code[255] to use the best encoding:
  	 */
- 	length_code[length - 1] = code;
+ 	G2.length_code[length - 1] = code;
  	/* Initialize the mapping dist (0..32K) -> dist code (0..29) */
  	dist = 0;
  	for (code = 0; code < 16; code++) {
- 		base_dist[code] = dist;
+ 		G2.base_dist[code] = dist;
  		for (n = 0; n < (1 << extra_dbits[code]); n++) {
- 			dist_code[dist++] = code;
+ 			G2.dist_code[dist++] = code;
  		}
  	}
  	Assert(dist == 256, "ct_init: dist != 256");
  	dist >>= 7;			/* from now on, all distances are divided by 128 */
  	for (; code < D_CODES; code++) {
- 		base_dist[code] = dist << 7;
+ 		G2.base_dist[code] = dist << 7;
  		for (n = 0; n < (1 << (extra_dbits[code] - 7)); n++) {
- 			dist_code[256 + dist++] = code;
+ 			G2.dist_code[256 + dist++] = code;
  		}
  	}
  	Assert(dist == 256, "ct_init: 256+dist != 512");
-Line 1995 
 static void ct_init(ush * attr, int *met
+Line 1933 
 static void ct_init(ush * attr, int *met
  	/* Construct the codes of the static literal tree */
  	/* already zeroed - it's in bss
  	for (n = 0; n <= MAX_BITS; n++)
- 		bl_count[n] = 0; */
+ 		G2.bl_count[n] = 0; */
  	n = 0;
  	while (n <= 143) {
- 		static_ltree[n++].Len = 8;
+ 		G2.static_ltree[n++].Len = 8;
- 		bl_count[8]++;
+ 		G2.bl_count[8]++;
  	}
  	while (n <= 255) {
- 		static_ltree[n++].Len = 9;
+ 		G2.static_ltree[n++].Len = 9;
- 		bl_count[9]++;
+ 		G2.bl_count[9]++;
  	}
  	while (n <= 279) {
- 		static_ltree[n++].Len = 7;
+ 		G2.static_ltree[n++].Len = 7;
- 		bl_count[7]++;
+ 		G2.bl_count[7]++;
  	}
  	while (n <= 287) {
- 		static_ltree[n++].Len = 8;
+ 		G2.static_ltree[n++].Len = 8;
- 		bl_count[8]++;
+ 		G2.bl_count[8]++;
  	}
  	/* Codes 286 and 287 do not exist, but we must include them in the
  	 * tree construction to get a canonical Huffman tree (longest code
  	 * all ones)
  	 */
- 	gen_codes((ct_data *) static_ltree, L_CODES + 1);
+ 	gen_codes((ct_data *) G2.static_ltree, L_CODES + 1);
  	/* The static distance tree is trivial: */
  	for (n = 0; n < D_CODES; n++) {
- 		static_dtree[n].Len = 5;
+ 		G2.static_dtree[n].Len = 5;
- 		static_dtree[n].Code = bi_reverse(n, 5);
+ 		G2.static_dtree[n].Code = bi_reverse(n, 5);
  	}
  	/* Initialize the first block of the first file: */
-Line 2034 
 static void ct_init(ush * attr, int *met
+Line 1972 
 static void ct_init(ush * attr, int *met
  /* ===========================================================================
   * Deflate in to out.
   * IN assertions: the input and output buffers are cleared.
-  *   The variables time_stamp and save_orig_name are initialized.
   */
- /* put_header_byte is used for the compressed output
+ static void zip(ulg time_stamp)
-  * - for the initial 4 bytes that can't overflow the buffer. */
- #define put_header_byte(c) outbuf[outcnt++] = (c)
- static void zip(int in, int out)
  {
- 	uch my_flags = 0;       /* general purpose bit flags */
- 	ush attr = 0;           /* ascii/binary flag */
  	ush deflate_flags = 0;  /* pkzip -es, -en or -ex equivalent */
- 	ifd = in;
+ 	G1.outcnt = 0;
- 	ofd = out;
- 	outcnt = 0;
  	/* Write the header to the gzip file. See algorithm.doc for the format */
+ 	/* magic header for gzip files: 1F 8B */
- 	method = DEFLATED;
+ 	/* compression method: 8 (DEFLATED) */
- 	put_header_byte(0x1f); /* magic header for gzip files, 1F 8B */
+ 	/* general flags: 0 */
- 	put_header_byte(0x8b);
+ 	put_32bit(0x00088b1f);
- 	put_header_byte(DEFLATED); /* compression method */
- 	put_header_byte(my_flags); /* general flags */
  	put_32bit(time_stamp);
  	/* Write deflated file to zip file */
- 	crc = ~0;
+ 	G1.crc = ~0;
- 	bi_init(); //// (out);
+ 	bi_init();
- 	ct_init(&attr, &method);
+ 	ct_init();
  	lm_init(&deflate_flags);
  	put_8bit(deflate_flags);	/* extra flags */
-Line 2073 
 static void zip(int in, int out)
+Line 2000 
 static void zip(int in, int out)
  	deflate();
  	/* Write the crc and uncompressed size */
- 	put_32bit(~crc);
+ 	put_32bit(~G1.crc);
- 	put_32bit(isize);
+ 	put_32bit(G1.isize);
  	flush_outbuf();
  }
  /* ======================================================================== */
- static void abort_gzip(int ATTRIBUTE_UNUSED ignored)
+ static
+ char* make_new_name_gzip(char *filename)
  {
- 	exit(1);
+ 	return xasprintf("%s.gz", filename);
  }
- int gzip_main(int argc, char **argv)
+ static
+ USE_DESKTOP(long long) int pack_gzip(unpack_info_t *info UNUSED_PARAM)
  {
- 	enum {
+ 	struct stat s;
- 		OPT_tostdout = 0x1,
- 		OPT_force = 0x2,
- 	};
+ 	clear_bufs();
+ 	s.st_ctime = 0;
+ 	fstat(STDIN_FILENO, &s);
+ 	zip(s.st_ctime);
+ 	return 0;
+ }
+ /*
+  * Linux kernel build uses gzip -d -n. We accept and ignore it.
+  * Man page says:
+  * -n --no-name
+  * gzip: do not save the original file name and time stamp.
+  * (The original name is always saved if the name had to be truncated.)
+  * gunzip: do not restore the original file name/time even if present
+  * (remove only the gzip suffix from the compressed file name).
+  * This option is the default when decompressing.
+  * -N --name
+  * gzip: always save the original file name and time stamp (this is the default)
+  * gunzip: restore the original file name and time stamp if present.
+  */
+ int gzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+ #if ENABLE_GUNZIP
+ int gzip_main(int argc, char **argv)
+ #else
+ int gzip_main(int argc UNUSED_PARAM, char **argv)
+ #endif
+ {
  	unsigned opt;
- 	int inFileNum;
- 	int outFileNum;
- 	int i;
- 	struct stat statBuf;
- 	opt = getopt32(argc, argv, "cf123456789qv" USE_GUNZIP("d"));
+ 	/* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */
- 	//if (opt & 0x1) // -c
+ 	opt = getopt32(argv, "cfv" USE_GUNZIP("dt") "q123456789n");
- 	//if (opt & 0x2) // -f
- 	/* Ignore 1-9 (compression level) options */
- 	//if (opt & 0x4) // -1
- 	//if (opt & 0x8) // -2
- 	//if (opt & 0x10) // -3
- 	//if (opt & 0x20) // -4
- 	//if (opt & 0x40) // -5
- 	//if (opt & 0x80) // -6
- 	//if (opt & 0x100) // -7
- 	//if (opt & 0x200) // -8
- 	//if (opt & 0x400) // -9
- 	//if (opt & 0x800) // -q
- 	//if (opt & 0x1000) // -v
  #if ENABLE_GUNZIP /* gunzip_main may not be visible... */
- 	if (opt & 0x2000) { // -d
+ 	if (opt & 0x18) // -d and/or -t
- 		/* FIXME: getopt32 should not depend on optind */
- 		optind = 1;
  		return gunzip_main(argc, argv);
- 	}
  #endif
+ 	option_mask32 &= 0x7; /* ignore -q, -0..9 */
+ 	//if (opt & 0x1) // -c
+ 	//if (opt & 0x2) // -f
+ 	//if (opt & 0x4) // -v
+ 	argv += optind;
- 	foreground = signal(SIGINT, SIG_IGN) != SIG_IGN;
+ 	SET_PTR_TO_GLOBALS(xzalloc(sizeof(struct globals) + sizeof(struct globals2))
- 	if (foreground) {
+ 			+ sizeof(struct globals));
- 		signal(SIGINT, abort_gzip);
+ 	barrier();
- 	}
+ 	G2.l_desc.dyn_tree    = G2.dyn_ltree;
- #ifdef SIGTERM
+ 	G2.l_desc.static_tree = G2.static_ltree;
- 	if (signal(SIGTERM, SIG_IGN) != SIG_IGN) {
+ 	G2.l_desc.extra_bits  = extra_lbits;
- 		signal(SIGTERM, abort_gzip);
+ 	G2.l_desc.extra_base  = LITERALS + 1;
- 	}
+ 	G2.l_desc.elems       = L_CODES;
- #endif
+ 	G2.l_desc.max_length  = MAX_BITS;
- #ifdef SIGHUP
+ 	//G2.l_desc.max_code    = 0;
- 	if (signal(SIGHUP, SIG_IGN) != SIG_IGN) {
- 		signal(SIGHUP, abort_gzip);
+ 	G2.d_desc.dyn_tree    = G2.dyn_dtree;
- 	}
+ 	G2.d_desc.static_tree = G2.static_dtree;
- #endif
+ 	G2.d_desc.extra_bits  = extra_dbits;
+ 	//G2.d_desc.extra_base  = 0;
+ 	G2.d_desc.elems       = D_CODES;
+ 	G2.d_desc.max_length  = MAX_BITS;
+ 	//G2.d_desc.max_code    = 0;
+ 	G2.bl_desc.dyn_tree    = G2.bl_tree;
+ 	//G2.bl_desc.static_tree = NULL;
+ 	G2.bl_desc.extra_bits  = extra_blbits,
+ 	//G2.bl_desc.extra_base  = 0;
+ 	G2.bl_desc.elems       = BL_CODES;
+ 	G2.bl_desc.max_length  = MAX_BL_BITS;
+ 	//G2.bl_desc.max_code    = 0;
  	/* Allocate all global buffers (for DYN_ALLOC option) */
- 	ALLOC(uch, l_buf, INBUFSIZ);
+ 	ALLOC(uch, G1.l_buf, INBUFSIZ);
- 	ALLOC(uch, outbuf, OUTBUFSIZ);
+ 	ALLOC(uch, G1.outbuf, OUTBUFSIZ);
- 	ALLOC(ush, d_buf, DIST_BUFSIZE);
+ 	ALLOC(ush, G1.d_buf, DIST_BUFSIZE);
- 	ALLOC(uch, window, 2L * WSIZE);
+ 	ALLOC(uch, G1.window, 2L * WSIZE);
- 	ALLOC(ush, prev, 1L << BITS);
+ 	ALLOC(ush, G1.prev, 1L << BITS);
  	/* Initialise the CRC32 table */
- 	crc_32_tab = crc32_filltable(0);
+ 	G1.crc_32_tab = crc32_filltable(NULL, 0);
- 	clear_bufs();
- 	if (optind == argc) {
- 		time_stamp = 0;
- 		zip(STDIN_FILENO, STDOUT_FILENO);
- 		return exit_code;
- 	}
- 	for (i = optind; i < argc; i++) {
- 		char *path = NULL;
- 		clear_bufs();
- 		if (LONE_DASH(argv[i])) {
- 			time_stamp = 0;
- 			inFileNum = STDIN_FILENO;
- 			outFileNum = STDOUT_FILENO;
- 		} else {
- 			inFileNum = xopen(argv[i], O_RDONLY);
- 			if (fstat(inFileNum, &statBuf) < 0)
- 				bb_perror_msg_and_die("%s", argv[i]);
- 			time_stamp = statBuf.st_ctime;
- 			if (!(opt & OPT_tostdout)) {
- 				path = xasprintf("%s.gz", argv[i]);
- 				/* Open output file */
- #if defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1 && defined(O_NOFOLLOW)
- 				outFileNum = open(path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW);
- #else
- 				outFileNum = open(path, O_RDWR | O_CREAT | O_EXCL);
- #endif
- 				if (outFileNum < 0) {
- 					bb_perror_msg("%s", path);
- 					free(path);
- 					continue;
- 				}
- 				/* Set permissions on the file */
- 				fchmod(outFileNum, statBuf.st_mode);
- 			} else
- 				outFileNum = STDOUT_FILENO;
- 		}
- 		if (path == NULL && isatty(outFileNum) && !(opt & OPT_force)) {
- 			bb_error_msg("compressed data not written "
- 				"to a terminal. Use -f to force compression.");
- 			free(path);
- 			continue;
- 		}
- 		zip(inFileNum, outFileNum);
- 		if (path != NULL) {
- 			char *delFileName;
- 			close(inFileNum);
- 			close(outFileNum);
- 			/* Delete the original file */
- 			// Pity we don't propagate zip failures to this place...
- 			//if (zip_is_ok)
- 				delFileName = argv[i];
- 			//else
- 			//	delFileName = path;
- 			if (unlink(delFileName) < 0)
- 				bb_perror_msg("%s", delFileName);
- 		}
- 		free(path);
- 	}
- 	return exit_code;
+ 	return bbunpack(argv, make_new_name_gzip, pack_gzip);
  }

 Legend:



Removed from v.815
 


changed lines


 
Added in v.816
 Legend:



Removed from v.815
 


changed lines


 
Added in v.816
-Removed from v.815
+Added in v.816