X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Fgzip.c;h=cabcc5ecb4c819baeef85a1037aa4463211df6cd;hb=d21f596ddb294bdb65623ba1d0e49b17d0829229;hp=c8444ac25f5d0d6f245646a097d35476a6ea03c4;hpb=07766bb0e7adcefa5dd5a373986176a5cd42ed23;p=oweals%2Fbusybox.git diff --git a/archival/gzip.c b/archival/gzip.c index c8444ac25..cabcc5ecb 100644 --- a/archival/gzip.c +++ b/archival/gzip.c @@ -39,7 +39,7 @@ gzip: bogus: No such file or directory aa: 85.1% -- replaced with aa.gz */ -#include "busybox.h" +#include "libbb.h" /* =========================================================================== @@ -47,12 +47,12 @@ 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 Tracevv(x) {if (verbose > 1) fprintf x ;} -# define Tracec(c,x) {if (verbose && (c)) fprintf x ;} -# define Tracecv(c,x) {if (verbose > 1 && (c)) fprintf x ;} +# define Tracev(x) {if (verbose) fprintf x; } +# define Tracevv(x) {if (verbose > 1) fprintf x; } +# define Tracec(c,x) {if (verbose && (c)) fprintf x; } +# define Tracecv(c,x) {if (verbose > 1 && (c)) fprintf x; } #else # define Assert(cond,msg) # define Trace(x) @@ -67,12 +67,6 @@ 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 */ @@ -241,7 +235,7 @@ enum { }; -struct global1 { +struct globals { lng block_start; @@ -307,25 +301,19 @@ struct global1 { /* DECLARE(Pos, head, 1< 1) { bb_error_msg("\\[%d,%d]", start - match, length); do { - putc(G1.window[start++], stderr); + fputc(G1.window[start++], stderr); } while (--length != 0); } } @@ -743,10 +730,10 @@ static void check_match(IPos start, IPos match, int length) * Addison-Wesley, 1983. ISBN 0-201-06672-6. * * INTERFACE - * void ct_init() //// ush *attr, int *methodp) - * Allocate the match buffer, initialize the various tables and save + * void ct_init() + * 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. @@ -781,26 +768,24 @@ static void check_match(IPos start, IPos match, int length) #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, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 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, 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 }; /* 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, 0, 2, 3, 7 }; /* number of codes at each bit length for an optimal tree */ -static const uch bl_order[BL_CODES] = { +static const uint8_t bl_order[BL_CODES] ALIGN1 = { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 }; #define STORED_BLOCK 0 @@ -874,14 +859,14 @@ typedef struct ct_data { typedef struct tree_desc { ct_data *dyn_tree; /* the dynamic tree */ ct_data *static_tree; /* corresponding static tree or NULL */ - const extra_bits_t *extra_bits; /* extra bits for each code or NULL */ + const uint8_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; -struct global2 { +struct globals2 { ush heap[HEAP_SIZE]; /* heap used to build the Huffman trees */ int heap_len; /* number of elements in the heap */ @@ -966,13 +951,9 @@ struct global2 { ulg static_len; /* bit length of current block with static trees */ ulg compressed_len; /* total bit length of compressed file */ - -//// ush *file_type; /* pointer to UNKNOWN, BINARY or ASCII */ -//// int *file_method; /* pointer to DEFLATE or STORE */ - }; -#define G2ptr ((struct global2*)(ptr_to_globals)) +#define G2ptr ((struct globals2*)(ptr_to_globals)) #define G2 (*G2ptr) @@ -1081,7 +1062,7 @@ static void pqdownheap(ct_data * tree, int k) 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; @@ -1495,31 +1476,6 @@ static void send_all_trees(int lcodes, int dcodes, int blcodes) } -/////* =========================================================================== -//// * 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) -//// bin_freq += G2.dyn_ltree[n++].Freq; -//// while (n < 128) -//// ascii_freq += G2.dyn_ltree[n++].Freq; -//// while (n < LITERALS) -//// bin_freq += G2.dyn_ltree[n++].Freq; -//// *G2.file_type = (bin_freq > (ascii_freq >> 2)) ? BINARY : ASCII; -//// if (*G2.file_type == BINARY && translate_eol) { -//// bb_error_msg("-l used on binary file"); -//// } -////} - - /* =========================================================================== * Save the match info and tally the frequency counts. Return true if * the current block must be flushed. @@ -1638,10 +1594,6 @@ static ulg flush_block(char *buf, ulg stored_len, int eof) 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 (*G2.file_type == (ush) UNKNOWN) -//// set_file_type(); - /* Construct the literal and distance trees */ build_tree(&G2.l_desc); Tracev((stderr, "\nlit data: dyn %ld, stat %ld", G2.opt_len, G2.static_len)); @@ -1680,7 +1632,6 @@ static ulg flush_block(char *buf, ulg stored_len, int eof) copy_block(buf, (unsigned) stored_len, 0); /* without header */ G2.compressed_len = stored_len << 3; -//// *file_method = STORED; } else if (stored_len + 4 <= opt_lenb && buf != NULL) { /* 4: two words for the lengths */ @@ -1931,15 +1882,13 @@ static void lm_init(ush * flagsp) * (DEFLATE/STORE). * One callsite in zip() */ -static void ct_init(void) ////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; -//// file_method = methodp; G2.compressed_len = 0L; #ifdef NOT_NEEDED @@ -2022,42 +1971,26 @@ static void ct_init(void) ////ush * attr, int *methodp) /* =========================================================================== * 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 - * - for the initial 4 bytes that can't overflow the buffer. */ -#define put_header_byte(c) G1.outbuf[G1.outcnt++] = (c) - -static void zip(int in, int out) +static void zip(ulg time_stamp) { -//// uch my_flags = 0; /* general purpose bit flags */ -//// ush attr = 0; /* ascii/binary flag */ ush deflate_flags = 0; /* pkzip -es, -en or -ex equivalent */ -//// int method = DEFLATED; /* compression method */ - G1.ifd = in; - G1.ofd = out; G1.outcnt = 0; /* Write the header to the gzip file. See algorithm.doc for the format */ - - //put_header_byte(0x1f); /* magic header for gzip files, 1F 8B */ - //put_header_byte(0x8b); - //////put_header_byte(DEFLATED); /* compression method */ - //put_header_byte(8); /* compression method */ - //put_header_byte(0); /* general flags */ /* magic header for gzip files: 1F 8B */ - /* compression method: 8 */ + /* compression method: 8 (DEFLATED) */ /* general flags: 0 */ put_32bit(0x00088b1f); - put_32bit(G1.time_stamp); + put_32bit(time_stamp); /* Write deflated file to zip file */ G1.crc = ~0; bi_init(); - ct_init(); //// &attr, &method); + ct_init(); lm_init(&deflate_flags); put_8bit(deflate_flags); /* extra flags */ @@ -2074,65 +2007,44 @@ static void zip(int in, int out) /* ======================================================================== */ -static void abort_gzip(int ATTRIBUTE_UNUSED ignored) +static +char* make_new_name_gzip(char *filename) { - exit(1); + return xasprintf("%s.gz", filename); +} + +static +USE_DESKTOP(long long) int pack_gzip(void) +{ + struct stat s; + + clear_bufs(); + s.st_ctime = 0; + fstat(STDIN_FILENO, &s); + zip(s.st_ctime); + return 0; } int gzip_main(int argc, char **argv); int gzip_main(int argc, char **argv) { - enum { - OPT_tostdout = 0x1, - OPT_force = 0x2, - }; - 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! */ + opt = getopt32(argv, "cfv" USE_GUNZIP("d") "q123456789" ); + option_mask32 &= 0x7; /* Clear -d, ignore -q, -0..9 */ //if (opt & 0x1) // -c //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 (opt & 0x4) // -v #if ENABLE_GUNZIP /* gunzip_main may not be visible... */ - if (opt & 0x2000) { // -d - /* FIXME: getopt32 should not depend on optind */ - optind = 1; + if (opt & 0x8) { // -d return gunzip_main(argc, argv); } #endif + argv += optind; - /* Comment?? */ - if (signal(SIGINT, SIG_IGN) != SIG_IGN) { - signal(SIGINT, abort_gzip); - } -#ifdef SIGTERM - if (signal(SIGTERM, SIG_IGN) != SIG_IGN) { - signal(SIGTERM, abort_gzip); - } -#endif -#ifdef SIGHUP - if (signal(SIGHUP, SIG_IGN) != SIG_IGN) { - signal(SIGHUP, abort_gzip); - } -#endif - - ptr_to_globals = xzalloc(sizeof(struct global1) + sizeof(struct global2)); - ptr_to_globals++; + PTR_TO_GLOBALS = xzalloc(sizeof(struct globals) + sizeof(struct globals2)) + + sizeof(struct globals); G2.l_desc.dyn_tree = G2.dyn_ltree; G2.l_desc.static_tree = G2.static_ltree; G2.l_desc.extra_bits = extra_lbits; @@ -2165,78 +2077,7 @@ int gzip_main(int argc, char **argv) ALLOC(ush, G1.prev, 1L << BITS); /* Initialise the CRC32 table */ - G1.crc_32_tab = crc32_filltable(0); - - clear_bufs(); - - if (optind == argc) { - G1.time_stamp = 0; - zip(STDIN_FILENO, STDOUT_FILENO); - return 0; //## G1.exit_code; - } - - for (i = optind; i < argc; i++) { - char *path = NULL; - - clear_bufs(); - if (LONE_DASH(argv[i])) { - G1.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]); - G1.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); - } + G1.crc_32_tab = crc32_filltable(NULL, 0); - return 0; //##G1.exit_code; + return bbunpack(argv, make_new_name_gzip, pack_gzip); }