/[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 983 by niro,
Fri Apr 24 18:33:46 2009 UTC
+revision 984 by niro,
Sun May 30 11:32:42 2010 UTC
 Line 267 
 struct globals {
  #define DECLARE(type, array, size) \
  	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)
 Line 389 
 static void put_32bit(ulg n)
  }
  /* ===========================================================================
-  * Clear input and output buffers
-  */
- static void clear_bufs(void)
- {
- 	G1.outcnt = 0;
- #ifdef DEBUG
- 	G1.insize = 0;
- #endif
- 	G1.isize = 0;
- }
- /* ===========================================================================
   * Run a set of bytes through the crc shift register.  If s is a NULL
   * pointer, then initialize the crc shift register contents instead.
   * Return the current crc in either case.
-Line 1186 
 static void gen_codes(ct_data * tree, in
+Line 1173 
 static void gen_codes(ct_data * tree, in
  		Tracec(tree != G2.static_ltree,
  			   (stderr, "\nn %3d %c l %2d c %4x (%x) ", n,
- 				(isgraph(n) ? n : ' '), len, tree[n].Code,
+ 				(n > ' ' ? n : ' '), len, tree[n].Code,
  				next_code[len] - 1));
  	}
  }
-Line 1554 
 static void compress_block(ct_data * ltr
+Line 1541 
 static void compress_block(ct_data * ltr
  		lc = G1.l_buf[lx++];
  		if ((flag & 1) == 0) {
  			SEND_CODE(lc, ltree);	/* send a literal byte */
- 			Tracecv(isgraph(lc), (stderr, " '%c' ", lc));
+ 			Tracecv(lc > ' ', (stderr, " '%c' ", lc));
  		} else {
  			/* Here, lc is the match length - MIN_MATCH */
  			code = G2.length_code[lc];
-Line 2015 
 char* make_new_name_gzip(char *filename)
+Line 2002 
 char* make_new_name_gzip(char *filename)
  }
  static
- USE_DESKTOP(long long) int pack_gzip(unpack_info_t *info UNUSED_PARAM)
+ IF_DESKTOP(long long) int pack_gzip(unpack_info_t *info UNUSED_PARAM)
  {
  	struct stat s;
- 	clear_bufs();
+ 	/* Clear input and output buffers */
+ 	G1.outcnt = 0;
+ #ifdef DEBUG
+ 	G1.insize = 0;
+ #endif
+ 	G1.isize = 0;
+ 	/* Reinit G2.xxx */
+ 	memset(&G2, 0, sizeof(G2));
+ 	G2.l_desc.dyn_tree     = G2.dyn_ltree;
+ 	G2.l_desc.static_tree  = G2.static_ltree;
+ 	G2.l_desc.extra_bits   = extra_lbits;
+ 	G2.l_desc.extra_base   = LITERALS + 1;
+ 	G2.l_desc.elems        = L_CODES;
+ 	G2.l_desc.max_length   = MAX_BITS;
+ 	//G2.l_desc.max_code     = 0;
+ 	G2.d_desc.dyn_tree     = G2.dyn_dtree;
+ 	G2.d_desc.static_tree  = G2.static_dtree;
+ 	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;
  	s.st_ctime = 0;
  	fstat(STDIN_FILENO, &s);
  	zip(s.st_ctime);
  	return 0;
  }
+ #if ENABLE_FEATURE_GZIP_LONG_OPTIONS
+ static const char gzip_longopts[] ALIGN1 =
+ 	"stdout\0"              No_argument       "c"
+ 	"to-stdout\0"           No_argument       "c"
+ 	"force\0"               No_argument       "f"
+ 	"verbose\0"             No_argument       "v"
+ #if ENABLE_GUNZIP
+ 	"decompress\0"          No_argument       "d"
+ 	"uncompress\0"          No_argument       "d"
+ 	"test\0"                No_argument       "t"
+ #endif
+ 	"quiet\0"               No_argument       "q"
+ 	"fast\0"                No_argument       "1"
+ 	"best\0"                No_argument       "9"
+ 	;
+ #endif
  /*
   * Linux kernel build uses gzip -d -n. We accept and ignore it.
   * Man page says:
-Line 2049 
 int gzip_main(int argc UNUSED_PARAM, cha
+Line 2083 
 int gzip_main(int argc UNUSED_PARAM, cha
  {
  	unsigned opt;
+ #if ENABLE_FEATURE_GZIP_LONG_OPTIONS
+ 	applet_long_options = gzip_longopts;
+ #endif
  	/* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */
- 	opt = getopt32(argv, "cfv" USE_GUNZIP("dt") "q123456789n");
+ 	opt = getopt32(argv, "cfv" IF_GUNZIP("dt") "q123456789n");
  #if ENABLE_GUNZIP /* gunzip_main may not be visible... */
  	if (opt & 0x18) // -d and/or -t
  		return gunzip_main(argc, argv);
-Line 2061 
 int gzip_main(int argc UNUSED_PARAM, cha
+Line 2098 
 int gzip_main(int argc UNUSED_PARAM, cha
  	//if (opt & 0x4) // -v
  	argv += optind;
- 	SET_PTR_TO_GLOBALS(xzalloc(sizeof(struct globals) + sizeof(struct globals2))
+ 	SET_PTR_TO_GLOBALS((char *)xzalloc(sizeof(struct globals)+sizeof(struct globals2))
  			+ sizeof(struct globals));
- 	barrier();
- 	G2.l_desc.dyn_tree    = G2.dyn_ltree;
- 	G2.l_desc.static_tree = G2.static_ltree;
- 	G2.l_desc.extra_bits  = extra_lbits;
- 	G2.l_desc.extra_base  = LITERALS + 1;
- 	G2.l_desc.elems       = L_CODES;
- 	G2.l_desc.max_length  = MAX_BITS;
- 	//G2.l_desc.max_code    = 0;
- 	G2.d_desc.dyn_tree    = G2.dyn_dtree;
- 	G2.d_desc.static_tree = G2.static_dtree;
- 	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, G1.l_buf, INBUFSIZ);

 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
-Removed from v.983
+Added in v.984