X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Fgzip.c;h=c31706af3720fb8e9c93250b22fce1465ae9ab6e;hb=7e21d5f6b1bdac9c20139e8bef82b17559e548a0;hp=9248cfecd651bb5b19a0d474b4d2d7d90abb0fc5;hpb=b610615be9aedfac07d1e01f12575707fa3a227c;p=oweals%2Fbusybox.git diff --git a/archival/gzip.c b/archival/gzip.c index 9248cfecd..c31706af3 100644 --- a/archival/gzip.c +++ b/archival/gzip.c @@ -9,62 +9,34 @@ * only standard in to standard out with -9 compression. It also requires * the zcat module for some important functions." * - * Adjusted further by Erik Andersen , - * to support files as well as stdin/stdout, and to generally behave itself wrt + * Adjusted further by Erik Andersen to support + * files as well as stdin/stdout, and to generally behave itself wrt * command line handling. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include "internal.h" -#define BB_DECLARE_EXTERN -#define bb_need_memory_exhausted -#include "messages.c" - /* These defines are very important for BusyBox. Without these, - * huge chunks of ram are pre-allocated making the BusyBox bss + * huge chunks of ram are pre-allocated making the BusyBox bss * size Freaking Huge(tm), which is a bad thing.*/ #define SMALL_MEM #define DYN_ALLOC - -static const char gzip_usage[] = - "gzip [OPTION]... FILE\n" -#ifndef BB_FEATURE_TRIVIAL_HELP - "\nCompress FILE with maximum compression.\n" - "When FILE is '-', reads standard input. Implies -c.\n\n" - - "Options:\n" - "\t-c\tWrite output to standard output instead of FILE.gz\n" -#endif - ; - - -/* I don't like nested includes, but the string and io functions are used - * too often - */ +#include #include #include -#define memzero(s, n) memset ((void *)(s), 0, (n)) - -#ifndef RETSIGTYPE -# define RETSIGTYPE void -#endif - -#define local static +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "busybox.h" typedef unsigned char uch; typedef unsigned short ush; @@ -76,22 +48,15 @@ typedef unsigned long ulg; #define WARNING 2 /* Compression methods (see algorithm.doc) */ +/* Only STORED and DEFLATED are supported by this BusyBox module */ #define STORED 0 -#define COMPRESSED 1 -#define PACKED 2 -#define LZHED 3 /* methods 4 to 7 reserved */ #define DEFLATED 8 -#define MAX_METHODS 9 -extern int method; /* compression method */ /* To save memory for 16 bit systems, some arrays are overlaid between * the various modules: * deflate: prev+head window d_buf l_buf outbuf * unlzw: tab_prefix tab_suffix stack inbuf outbuf - * inflate: window inbuf - * unpack: window inbuf prefix_len - * unlzh: left+right window c_table inbuf c_len * For compression, input is done in window[]. For decompression, output * is done in window except for unlzw. */ @@ -103,7 +68,7 @@ extern int method; /* compression method */ # define INBUFSIZ 0x8000 /* input buffer size */ # endif #endif -#define INBUF_EXTRA 64 /* required by unlzw() */ +#define INBUF_EXTRA 64 /* required by unlzw() */ #ifndef OUTBUFSIZ # ifdef SMALL_MEM @@ -112,7 +77,7 @@ extern int method; /* compression method */ # define OUTBUFSIZ 16384 /* output buffer size */ # endif #endif -#define OUTBUF_EXTRA 2048 /* required by unlzw() */ +#define OUTBUF_EXTRA 2048 /* required by unlzw() */ #ifndef DIST_BUFSIZE # ifdef SMALL_MEM @@ -123,59 +88,29 @@ extern int method; /* compression method */ #endif #ifdef DYN_ALLOC -# define EXTERN(type, array) extern type * array -# define DECLARE(type, array, size) type * array +# define DECLARE(type, array, size) static type * array # define ALLOC(type, array, size) { \ - array = (type*)calloc((size_t)(((size)+1L)/2), 2*sizeof(type)); \ - if (array == NULL) errorMsg(memory_exhausted, "gzip"); \ + array = (type*)xcalloc((size_t)(((size)+1L)/2), 2*sizeof(type)); \ } -# define FREE(array) {if (array != NULL) free(array), array=NULL;} +# define FREE(array) {free(array), array=NULL;} #else -# define EXTERN(type, array) extern type array[] -# define DECLARE(type, array, size) type array[size] +# define DECLARE(type, array, size) static type array[size] # define ALLOC(type, array, size) # define FREE(array) #endif -EXTERN(uch, inbuf); /* input buffer */ -EXTERN(uch, outbuf); /* output buffer */ -EXTERN(ush, d_buf); /* buffer for distances, see trees.c */ -EXTERN(uch, window); /* Sliding window and suffix table (unlzw) */ #define tab_suffix window -#ifndef MAXSEG_64K -# define tab_prefix prev /* hash link (see deflate.c) */ -# define head (prev+WSIZE) /* hash head (see deflate.c) */ -EXTERN(ush, tab_prefix); /* prefix code (see unlzw.c) */ -#else -# define tab_prefix0 prev -# define head tab_prefix1 -EXTERN(ush, tab_prefix0); /* prefix for even codes */ -EXTERN(ush, tab_prefix1); /* prefix for odd codes */ -#endif - -extern unsigned insize; /* valid bytes in inbuf */ -extern unsigned inptr; /* index of next byte to be processed in inbuf */ -extern unsigned outcnt; /* bytes in output buffer */ +#define tab_prefix prev /* hash link (see deflate.c) */ +#define head (prev+WSIZE) /* hash head (see deflate.c) */ -extern long bytes_in; /* number of input bytes */ -extern long bytes_out; /* number of output bytes */ -extern long header_bytes; /* number of bytes in gzip header */ +static long bytes_in; /* number of input bytes */ #define isize bytes_in /* for compatibility with old zip sources (to be cleaned) */ -extern int ifd; /* input file descriptor */ -extern int ofd; /* output file descriptor */ -extern char ifname[]; /* input file name or "stdin" */ -extern char ofname[]; /* output file name or "stdout" */ -extern char *progname; /* program name */ - -extern long time_stamp; /* original time stamp (modification time) */ -extern long ifile_size; /* input file size, -1 for devices (debug only) */ +typedef int file_t; /* Do not use stdio */ -typedef int file_t; /* Do not use stdio */ - -#define NO_FILE (-1) /* in memory compression */ +#define NO_FILE (-1) /* in memory compression */ #define PACK_MAGIC "\037\036" /* Magic header for packed files */ @@ -185,13 +120,12 @@ typedef int file_t; /* Do not use stdio */ #define PKZIP_MAGIC "\120\113\003\004" /* Magic header for pkzip files */ /* gzip flag byte */ -#define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */ -#define CONTINUATION 0x02 /* bit 1 set: continuation of multi-part gzip file */ -#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */ -#define ORIG_NAME 0x08 /* bit 3 set: original file name present */ -#define COMMENT 0x10 /* bit 4 set: file comment present */ -#define ENCRYPTED 0x20 /* bit 5 set: file is encrypted */ -#define RESERVED 0xC0 /* bit 6,7: reserved */ +#define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */ +#define CONTINUATION 0x02 /* bit 1 set: continuation of multi-part gzip file */ +#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */ +#define ORIG_NAME 0x08 /* bit 3 set: original file name present */ +#define COMMENT 0x10 /* bit 4 set: file comment present */ +#define RESERVED 0xC0 /* bit 6,7: reserved */ /* internal file attribute */ #define UNKNOWN 0xffff @@ -199,7 +133,7 @@ typedef int file_t; /* Do not use stdio */ #define ASCII 1 #ifndef WSIZE -# define WSIZE 0x8000 /* window size--must be a power of two, and */ +# define WSIZE 0x8000 /* window size--must be a power of two, and */ #endif /* at least 32K for zip's deflate method */ #define MIN_MATCH 3 @@ -216,55 +150,25 @@ typedef int file_t; /* Do not use stdio */ * distances are limited to MAX_DIST instead of WSIZE. */ -extern int decrypt; /* flag to turn on decryption */ -extern int exit_code; /* program exit code */ -extern int verbose; /* be verbose (-v) */ -extern int quiet; /* be quiet (-q) */ -extern int test; /* check .z file integrity */ -extern int save_orig_name; /* set if original name must be saved */ - -#define get_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(0)) -#define try_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(1)) - -/* put_byte is used for the compressed output, put_ubyte for the - * uncompressed output. However unlzw() uses window for its - * suffix table instead of its output buffer, so it does not use put_ubyte - * (to be cleaned up). - */ +/* put_byte is used for the compressed output */ #define put_byte(c) {outbuf[outcnt++]=(uch)(c); if (outcnt==OUTBUFSIZ)\ flush_outbuf();} -#define put_ubyte(c) {window[outcnt++]=(uch)(c); if (outcnt==WSIZE)\ - flush_window();} -/* 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_byte((uch)((w) & 0xff)); \ - put_byte((uch)((ush)(w) >> 8)); \ - } \ -} /* Output a 32 bit value to the bit stream, lsb first */ +#if 0 #define put_long(n) { \ put_short((n) & 0xffff); \ put_short(((ulg)(n)) >> 16); \ } +#endif -#define seekable() 0 /* force sequential output */ -#define translate_eol 0 /* no option -a yet */ - -#define tolow(c) (isupper(c) ? (c)-'A'+'a' : (c)) /* force to lower case */ - -/* Macros for getting two-byte and four-byte header values */ -#define SH(p) ((ush)(uch)((p)[0]) | ((ush)(uch)((p)[1]) << 8)) -#define LG(p) ((ulg)(SH(p)) | ((ulg)(SH((p)+2)) << 16)) +#define seekable() 0 /* force sequential output */ +#define translate_eol 0 /* no option -a yet */ /* Diagnostic functions */ #ifdef DEBUG -# define Assert(cond,msg) {if(!(cond)) errorMsg(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 ;} @@ -282,57 +186,34 @@ extern int save_orig_name; /* set if original name must be saved */ #define WARN(msg) {if (!quiet) fprintf msg ; \ if (exit_code == OK) exit_code = WARNING;} +#ifndef MAX_PATH_LEN +# define MAX_PATH_LEN 1024 /* max pathname length */ +#endif + + + /* from zip.c: */ +static int zip(int in, int out); +static int file_read(char *buf, unsigned size); + + /* from deflate.c */ +static void lm_init(ush * flags); +static ulg deflate(void); + + /* from trees.c */ +static void ct_init(ush * attr, int *methodp); +static int ct_tally(int dist, int lc); +static ulg flush_block(char *buf, ulg stored_len, int eof); - /* in zip.c: */ -extern int zip (int in, int out); -extern int file_read (char *buf, unsigned size); - - /* in unzip.c */ -extern int unzip (int in, int out); -extern int check_zipfile (int in); - - /* in unpack.c */ -extern int unpack (int in, int out); - - /* in unlzh.c */ -extern int unlzh (int in, int out); - - /* in gzip.c */ -RETSIGTYPE abort_gzip (void); - - /* in deflate.c */ -void lm_init (ush * flags); -ulg deflate (void); - - /* in trees.c */ -void ct_init (ush * attr, int *method); -int ct_tally (int dist, int lc); -ulg flush_block (char *buf, ulg stored_len, int eof); - - /* in bits.c */ -void bi_init (file_t zipfile); -void send_bits (int value, int length); -unsigned bi_reverse (unsigned value, int length); -void bi_windup (void); -void copy_block (char *buf, unsigned len, int header); -extern int (*read_buf) (char *buf, unsigned size); - - /* in util.c: */ -extern int copy (int in, int out); -extern ulg updcrc (uch * s, unsigned n); -extern void clear_bufs (void); -extern int fill_inbuf (int eof_ok); -extern void flush_outbuf (void); -extern void flush_window (void); -extern void write_buf (int fd, void * buf, unsigned cnt); -extern char *strlwr (char *s); -extern char *add_envopt (int *argcp, char ***argvp, char *env); -extern void read_error_msg (void); -extern void write_error_msg (void); -extern void display_ratio (long num, long den, FILE * file); - - /* in inflate.c */ -extern int inflate (void); + /* from bits.c */ +static void bi_init(file_t zipfile); +static void send_bits(int value, int length); +static unsigned bi_reverse(unsigned value, int length); +static void bi_windup(void); +static void copy_block(char *buf, unsigned len, int header); +static int (*read_buf) (char *buf, unsigned size); + + /* from util.c: */ +static void flush_outbuf(void); /* lzw.h -- define the lzw functions. * Copyright (C) 1992-1993 Jean-loup Gailly. @@ -340,16 +221,12 @@ extern int inflate (void); * terms of the GNU General Public License, see the file COPYING. */ -#if !defined(OF) && defined(lint) -# include "gzip.h" -#endif - #ifndef BITS # define BITS 16 #endif -#define INIT_BITS 9 /* Initial number of bits per code */ +#define INIT_BITS 9 /* Initial number of bits per code */ -#define BIT_MASK 0x1f /* Mask for 'number of compression bits' */ +#define BIT_MASK 0x1f /* Mask for 'number of compression bits' */ /* Mask 0x20 is reserved to mean a fourth header byte, and 0x40 is free. * It's a pity that old uncompress does not check bit 0x20. That makes * extension of the format actually undesirable because old compress @@ -359,34 +236,6 @@ extern int inflate (void); * "can only handle 16 bits". */ -#define BLOCK_MODE 0x80 -/* Block compression: if table is full and compression rate is dropping, - * clear the dictionary. - */ - -#define LZW_RESERVED 0x60 /* reserved bits */ - -#define CLEAR 256 /* flush the dictionary */ -#define FIRST (CLEAR+1) /* first free entry */ - -extern int maxbits; /* max bits per code for LZW */ -extern int block_mode; /* block compress mode -C compatible with 2.0 */ - -/* revision.h -- define the version number - * Copyright (C) 1992-1993 Jean-loup Gailly. - * This is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License, see the file COPYING. - */ - -#define VERSION "1.2.4" -#define PATCHLEVEL 0 -#define REVDATE "18 Aug 93" - -/* This version does not support compression into old compress format: */ -#ifdef LZW -# undef LZW -#endif - /* tailor.h -- target dependent definitions * Copyright (C) 1992-1993 Jean-loup Gailly. * This is free software; you can redistribute it and/or modify it under the @@ -398,273 +247,16 @@ extern int block_mode; /* block compress mode -C compatible with 2.0 */ */ -#if defined(__MSDOS__) && !defined(MSDOS) -# define MSDOS -#endif - -#if defined(__OS2__) && !defined(OS2) -# define OS2 -#endif - -#if defined(OS2) && defined(MSDOS) /* MS C under OS/2 */ -# undef MSDOS -#endif - -#ifdef MSDOS -# ifdef __GNUC__ - /* DJGPP version 1.09+ on MS-DOS. - * The DJGPP 1.09 stat() function must be upgraded before gzip will - * fully work. - * No need for DIRENT, since defines POSIX_SOURCE which - * implies DIRENT. - */ -# define near -# else -# define MAXSEG_64K -# ifdef __TURBOC__ -# define NO_OFF_T -# ifdef __BORLANDC__ -# define DIRENT -# else -# define NO_UTIME -# endif -# else /* MSC */ -# define HAVE_SYS_UTIME_H -# define NO_UTIME_H -# endif -# endif -# define PATH_SEP2 '\\' -# define PATH_SEP3 ':' -# define MAX_PATH_LEN 128 -# define NO_MULTIPLE_DOTS -# define MAX_EXT_CHARS 3 -# define Z_SUFFIX "z" -# define NO_CHOWN -# define PROTO -# define STDC_HEADERS -# define NO_SIZE_CHECK -# define casemap(c) tolow(c) /* Force file names to lower case */ -# include -# define OS_CODE 0x00 -# define SET_BINARY_MODE(fd) setmode(fd, O_BINARY) -# if !defined(NO_ASM) && !defined(ASMV) -# define ASMV -# endif -#else -# define near -#endif - -#ifdef OS2 -# define PATH_SEP2 '\\' -# define PATH_SEP3 ':' -# define MAX_PATH_LEN 260 -# ifdef OS2FAT -# define NO_MULTIPLE_DOTS -# define MAX_EXT_CHARS 3 -# define Z_SUFFIX "z" -# define casemap(c) tolow(c) -# endif -# define NO_CHOWN -# define PROTO -# define STDC_HEADERS -# include -# define OS_CODE 0x06 -# define SET_BINARY_MODE(fd) setmode(fd, O_BINARY) -# ifdef _MSC_VER -# define HAVE_SYS_UTIME_H -# define NO_UTIME_H -# define MAXSEG_64K -# undef near -# define near _near -# endif -# ifdef __EMX__ -# define HAVE_SYS_UTIME_H -# define NO_UTIME_H -# define DIRENT -# define EXPAND(argc,argv) \ - {_response(&argc, &argv); _wildcard(&argc, &argv);} -# endif -# ifdef __BORLANDC__ -# define DIRENT -# endif -# ifdef __ZTC__ -# define NO_DIR -# define NO_UTIME_H -# include -# define EXPAND(argc,argv) \ - {response_expand(&argc, &argv);} -# endif -#endif - -#ifdef WIN32 /* Windows NT */ -# define HAVE_SYS_UTIME_H -# define NO_UTIME_H -# define PATH_SEP2 '\\' -# define PATH_SEP3 ':' -# define MAX_PATH_LEN 260 -# define NO_CHOWN -# define PROTO -# define STDC_HEADERS -# define SET_BINARY_MODE(fd) setmode(fd, O_BINARY) -# include -# include -# ifdef NTFAT -# define NO_MULTIPLE_DOTS -# define MAX_EXT_CHARS 3 -# define Z_SUFFIX "z" -# define casemap(c) tolow(c) /* Force file names to lower case */ -# endif -# define OS_CODE 0x0b -#endif - -#ifdef MSDOS -# ifdef __TURBOC__ -# include -# define DYN_ALLOC - /* Turbo C 2.0 does not accept static allocations of large arrays */ -void *fcalloc(unsigned items, unsigned size); -void fcfree(void *ptr); -# else /* MSC */ -# include -# define fcalloc(nitems,itemsize) halloc((long)(nitems),(itemsize)) -# define fcfree(ptr) hfree(ptr) -# endif -#else -# ifdef MAXSEG_64K -# define fcalloc(items,size) calloc((items),(size)) -# else -# define fcalloc(items,size) malloc((size_t)(items)*(size_t)(size)) -# endif -# define fcfree(ptr) free(ptr) -#endif - -#if defined(VAXC) || defined(VMS) -# define PATH_SEP ']' -# define PATH_SEP2 ':' -# define SUFFIX_SEP ';' -# define NO_MULTIPLE_DOTS -# define Z_SUFFIX "-gz" -# define RECORD_IO 1 -# define casemap(c) tolow(c) -# define OS_CODE 0x02 -# define OPTIONS_VAR "GZIP_OPT" -# define STDC_HEADERS -# define NO_UTIME -# define EXPAND(argc,argv) vms_expand_args(&argc,&argv); -# include -# define unlink delete -# ifdef VAXC -# define NO_FCNTL_H -# include -# endif -#endif - -#ifdef AMIGA -# define PATH_SEP2 ':' -# define STDC_HEADERS -# define OS_CODE 0x01 -# define ASMV -# ifdef __GNUC__ -# define DIRENT -# define HAVE_UNISTD_H -# else /* SASC */ -# define NO_STDIN_FSTAT -# define SYSDIR -# define NO_SYMLINK -# define NO_CHOWN -# define NO_FCNTL_H -# include /* for read() and write() */ -# define direct dirent -extern void _expand_args(int *argc, char ***argv); - -# define EXPAND(argc,argv) _expand_args(&argc,&argv); -# undef O_BINARY /* disable useless --ascii option */ -# endif -#endif - -#if defined(ATARI) || defined(atarist) -# ifndef STDC_HEADERS -# define STDC_HEADERS -# define HAVE_UNISTD_H -# define DIRENT -# endif -# define ASMV -# define OS_CODE 0x05 -# ifdef TOSFS -# define PATH_SEP2 '\\' -# define PATH_SEP3 ':' -# define MAX_PATH_LEN 128 -# define NO_MULTIPLE_DOTS -# define MAX_EXT_CHARS 3 -# define Z_SUFFIX "z" -# define NO_CHOWN -# define casemap(c) tolow(c) /* Force file names to lower case */ -# define NO_SYMLINK -# endif -#endif - -#ifdef MACOS -# define PATH_SEP ':' -# define DYN_ALLOC -# define PROTO -# define NO_STDIN_FSTAT -# define NO_CHOWN -# define NO_UTIME -# define chmod(file, mode) (0) -# define OPEN(name, flags, mode) open(name, flags) -# define OS_CODE 0x07 -# ifdef MPW -# define isatty(fd) ((fd) <= 2) -# endif -#endif - -#ifdef __50SERIES /* Prime/PRIMOS */ -# define PATH_SEP '>' -# define STDC_HEADERS -# define NO_MEMORY_H -# define NO_UTIME_H -# define NO_UTIME -# define NO_CHOWN -# define NO_STDIN_FSTAT -# define NO_SIZE_CHECK -# define NO_SYMLINK -# define RECORD_IO 1 -# define casemap(c) tolow(c) /* Force file names to lower case */ -# define put_char(c) put_byte((c) & 0x7F) -# define get_char(c) ascii2pascii(get_byte()) -# define OS_CODE 0x0F /* temporary, subject to change */ -# ifdef SIGTERM -# undef SIGTERM /* We don't want a signal handler for SIGTERM */ -# endif -#endif - -#if defined(pyr) && !defined(NOMEMCPY) /* Pyramid */ -# define NOMEMCPY /* problem with overlapping copies */ -#endif - -#ifdef TOPS20 -# define OS_CODE 0x0a -#endif - -#ifndef unix -# define NO_ST_INO /* don't rely on inode numbers */ -#endif - - /* Common defaults */ #ifndef OS_CODE -# define OS_CODE 0x03 /* assume Unix */ +# define OS_CODE 0x03 /* assume Unix */ #endif #ifndef PATH_SEP # define PATH_SEP '/' #endif -#ifndef casemap -# define casemap(c) (c) -#endif - #ifndef OPTIONS_VAR # define OPTIONS_VAR "GZIP" #endif @@ -679,42 +271,98 @@ extern void _expand_args(int *argc, char ***argv); # define MAX_SUFFIX 30 #endif -#ifndef MAKE_LEGAL_NAME -# ifdef NO_MULTIPLE_DOTS -# define MAKE_LEGAL_NAME(name) make_simple_name(name) -# else -# define MAKE_LEGAL_NAME(name) -# endif -#endif + /* global buffers */ -#ifndef MIN_PART -# define MIN_PART 3 - /* keep at least MIN_PART chars between dots in a file name. */ -#endif +DECLARE(uch, inbuf, INBUFSIZ + INBUF_EXTRA); +DECLARE(uch, outbuf, OUTBUFSIZ + OUTBUF_EXTRA); +DECLARE(ush, d_buf, DIST_BUFSIZE); +DECLARE(uch, window, 2L * WSIZE); +DECLARE(ush, tab_prefix, 1L << BITS); -#ifndef EXPAND -# define EXPAND(argc,argv) -#endif +static int foreground; /* set if program run in foreground */ +static int method = DEFLATED; /* compression method */ +static int exit_code = OK; /* program exit code */ +static int part_nb; /* number of parts in .gz file */ +static long time_stamp; /* original time stamp (modification time) */ +static long ifile_size; /* input file size, -1 for devices (debug only) */ +static char z_suffix[MAX_SUFFIX + 1]; /* default suffix (can be set with --suffix) */ +static int z_len; /* strlen(z_suffix) */ -#ifndef RECORD_IO -# define RECORD_IO 0 -#endif +static int ifd; /* input file descriptor */ +static int ofd; /* output file descriptor */ +static unsigned insize; /* valid bytes in inbuf */ +static unsigned outcnt; /* bytes in output buffer */ -#ifndef SET_BINARY_MODE -# define SET_BINARY_MODE(fd) -#endif +static uint32_t *crc_32_tab; -#ifndef OPEN -# define OPEN(name, flags, mode) open(name, flags, mode) -#endif +/* 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)); + } +} -#ifndef get_char -# define get_char() get_byte() -#endif +/* ======================================================================== + * Signal and error handler. + */ +static void abort_gzip(int ATTRIBUTE_UNUSED ignored) +{ + exit(ERROR); +} + +/* =========================================================================== + * Clear input and output buffers + */ +static void clear_bufs(void) +{ + outcnt = 0; + insize = 0; + bytes_in = 0L; +} + +/* =========================================================================== + * Does the same as write(), but also handles partial pipe writes and checks + * for error return. + */ +static void write_buf(int fd, void *buf, unsigned cnt) +{ + unsigned n; + + while ((n = write(fd, buf, cnt)) != cnt) { + if (n == (unsigned) (-1)) bb_error_msg_and_die("can't write"); + cnt -= n; + buf = (void *) ((char *) buf + n); + } +} + +/* =========================================================================== + * 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. + */ +static uint32_t updcrc(uch * s, unsigned n) +{ + static uint32_t crc = ~0; /* shift register contents */ + uint32_t c; /* temporary variable */ + + if (s == NULL) { + c = ~0; + } else { + c = crc; + if (n) + do { + c = crc_32_tab[((int) c ^ (*s++)) & 0xff] ^ (c >> 8); + } while (--n); + } + crc = c; + return ~c; +} -#ifndef put_char -# define put_char(c) put_byte(c) -#endif /* bits.c -- output variable-length bit strings * Copyright (C) 1992-1993 Jean-loup Gailly * This is free software; you can redistribute it and/or modify it under the @@ -768,17 +416,13 @@ extern void _expand_args(int *argc, char ***argv); * */ -#ifdef DEBUG -# include -#endif - /* =========================================================================== * Local data used by the "bit string" routines. */ -local file_t zfile; /* output gzip file */ +static file_t zfile; /* output gzip file */ -local unsigned short bi_buf; +static unsigned short bi_buf; /* Output buffer. bits are inserted starting at the bottom (least significant * bits). @@ -789,25 +433,18 @@ local unsigned short bi_buf; * more than 16 bits on some systems.) */ -local int bi_valid; - -/* Number of valid bits in bi_buf. All bits above the last valid bit - * are always zero. - */ - -int (*read_buf) (char *buf, unsigned size); +static int bi_valid; /* Current input function. Set to mem_read for in-memory compression */ #ifdef DEBUG -ulg bits_sent; /* bit length of the compressed data */ +ulg bits_sent; /* bit length of the compressed data */ #endif /* =========================================================================== * Initialize the bit string routines. */ -void bi_init(zipfile) -file_t zipfile; /* output zip file, NO_FILE for in-memory compression */ +static void bi_init(file_t zipfile) { zfile = zipfile; bi_buf = 0; @@ -828,9 +465,7 @@ file_t zipfile; /* output zip file, NO_FILE for in-memory compression */ * Send a value on a given number of bits. * IN assertion: length <= 16 and value fits in length bits. */ -void send_bits(value, length) -int value; /* value to send */ -int length; /* number of bits */ +static void send_bits(int value, int length) { #ifdef DEBUG Tracev((stderr, " l %2d v %4x ", length, value)); @@ -857,9 +492,7 @@ int length; /* number of bits */ * method would use a table) * IN assertion: 1 <= len <= 15 */ -unsigned bi_reverse(code, len) -unsigned code; /* the value to invert */ -int len; /* its bit length */ +static unsigned bi_reverse(unsigned code, int len) { register unsigned res = 0; @@ -873,7 +506,7 @@ int len; /* its bit length */ /* =========================================================================== * Write out any remaining bits in an incomplete byte. */ -void bi_windup() +static void bi_windup(void) { if (bi_valid > 8) { put_short(bi_buf); @@ -891,12 +524,9 @@ void bi_windup() * Copy a stored block to the zip file, storing first the length and its * one's complement if requested. */ -void copy_block(buf, len, header) -char *buf; /* the input data */ -unsigned len; /* its length */ -int header; /* true if block header must be written */ +static void copy_block(char *buf, unsigned len, int header) { - bi_windup(); /* align on byte boundary */ + bi_windup(); /* align on byte boundary */ if (header) { put_short((ush) len); @@ -909,12 +539,6 @@ int header; /* true if block header must be written */ bits_sent += (ulg) len << 3; #endif while (len--) { -#ifdef CRYPT - int t; - - if (key) - zencode(*buf, t); -#endif put_byte(*buf++); } } @@ -955,7 +579,7 @@ int header; /* true if block header must be written */ * However the F&G algorithm may be faster for some highly redundant * files if the parameter max_chain_length (described below) is too large. * - * ACKNOWLEDGEMENTS + * ACKNOWLEDGMENTS * * The idea of lazy evaluation of matches is due to Jan-Mark Wams, and * I found it in 'freeze' written by Leonid Broukhis. @@ -982,7 +606,6 @@ int header; /* true if block header must be written */ * attributes. */ -#include /* =========================================================================== * Configuration parameters @@ -997,7 +620,7 @@ int header; /* true if block header must be written */ */ #ifdef SMALL_MEM -# define HASH_BITS 13 /* Number of bits used to hash strings */ +# define HASH_BITS 13 /* Number of bits used to hash strings */ #endif #ifdef MEDIUM_MEM # define HASH_BITS 14 @@ -1011,10 +634,10 @@ int header; /* true if block header must be written */ * window with tab_suffix. Check that we can do this: */ #if (WSIZE<<1) > (1< BITS-1 -error:cannot overlay head with tab_prefix1 +# error cannot overlay head with tab_prefix1 #endif #define HASH_SIZE (unsigned)(1<= HASH_BITS */ -unsigned int near prev_length; +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. */ -unsigned near strstart; /* start of string to insert */ -unsigned near match_start; /* start of matching string */ -local int eofile; /* flag set at end of input file */ -local unsigned lookahead; /* number of valid bytes ahead in window */ +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 */ -unsigned near max_chain_length; +enum { + max_chain_length = 4096, /* To speed up deflation, hash chains are never searched beyond this length. * A higher limit improves compression ratio but degrades the speed. */ -local unsigned int max_lazy_match; + max_lazy_match = 258, /* Attempt to find a better match only when the current match is strictly * smaller than this value. This mechanism is used only for compression * levels >= 4. */ -#define max_insert_length max_lazy_match + max_insert_length = max_lazy_match, /* Insert new strings in the hash table only if the match length * is not greater than this length. This saves time but degrades compression. * max_insert_length is used only for compression levels <= 3. */ -unsigned near good_match; + good_match = 32, /* Use a faster search when the previous match is longer than this */ @@ -1120,27 +744,13 @@ unsigned near good_match; * found for specific files. */ -typedef struct config { - ush good_length; /* reduce lazy search above this match length */ - ush max_lazy; /* do not perform lazy search above this match length */ - ush nice_length; /* quit search above this match length */ - ush max_chain; -} config; - -#ifdef FULL_SEARCH -# define nice_match MAX_MATCH -#else -int near nice_match; /* Stop searching when current match exceeds this */ -#endif - -local config configuration_table = - /* 9 */ { 32, 258, 258, 4096 }; - /* maximum compression */ + nice_match = 258 /* Stop searching when current match exceeds this */ /* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4 * For deflate_fast() (levels <= 3) good is ignored and lazy has a different * meaning. */ +}; #define EQUAL 0 /* result of memcmp for equal strings */ @@ -1148,16 +758,12 @@ local config configuration_table = /* =========================================================================== * Prototypes for local functions. */ -local void fill_window (void); - -int longest_match (IPos cur_match); +static void fill_window(void); -#ifdef ASMV -void match_init (void); /* asm code initialization */ -#endif +static int longest_match(IPos cur_match); #ifdef DEBUG -local void check_match (IPos start, IPos match, int length); +static void check_match(IPos start, IPos match, int length); #endif /* =========================================================================== @@ -1184,36 +790,19 @@ local void check_match (IPos start, IPos match, int length); /* =========================================================================== * Initialize the "longest match" routines for a new file */ -void lm_init(flags) -ush *flags; /* general purpose bit flag */ +static void lm_init(ush * flags) { register unsigned j; /* Initialize the hash table. */ -#if defined(MAXSEG_64K) && HASH_BITS == 15 - for (j = 0; j < HASH_SIZE; j++) - head[j] = NIL; -#else - memzero((char *) head, HASH_SIZE * sizeof(*head)); -#endif + memset(head, 0, HASH_SIZE * sizeof(*head)); /* prev will be initialized on the fly */ - /* Set the default configuration parameters: - */ - max_lazy_match = configuration_table.max_lazy; - good_match = configuration_table.good_length; -#ifndef FULL_SEARCH - nice_match = configuration_table.nice_length; -#endif - max_chain_length = configuration_table.max_chain; *flags |= SLOW; /* ??? reduce max_chain_length for binary files */ strstart = 0; block_start = 0L; -#ifdef ASMV - match_init(); /* initialize the asm code */ -#endif lookahead = read_buf((char *) window, sizeof(int) <= 2 ? (unsigned) WSIZE : 2 * WSIZE); @@ -1245,21 +834,19 @@ ush *flags; /* general purpose bit flag */ * IN assertions: cur_match is the head of the hash chain for the current * string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1 */ -#ifndef ASMV + /* For MSDOS, OS/2 and 386 Unix, an optimized version is in match.asm or * match.s. The code is functionally equivalent, so you can use the C version * if desired. */ -int longest_match(cur_match) -IPos cur_match; /* current match */ +static int longest_match(IPos cur_match) { unsigned chain_length = max_chain_length; /* max hash chain length */ register uch *scan = window + strstart; /* current string */ - register uch *match; /* matched string */ - register int len; /* length of current match */ + register uch *match; /* matched string */ + register int len; /* length of current match */ int best_len = prev_length; /* best match length so far */ IPos limit = - strstart > (IPos) MAX_DIST ? strstart - (IPos) MAX_DIST : NIL; /* Stop when cur_match becomes <= limit. To simplify the code, * we prevent matches with the string of window index 0. @@ -1269,27 +856,17 @@ IPos cur_match; /* current match */ * It is easy to get rid of this optimization if necessary. */ #if HASH_BITS < 8 || MAX_MATCH != 258 - error:Code too clever +# error Code too clever #endif -#ifdef UNALIGNED_OK - /* Compare two bytes at a time. Note: this is not always beneficial. - * Try with and without -DUNALIGNED_OK to check. - */ - register uch *strend = window + strstart + MAX_MATCH - 1; - register ush scan_start = *(ush *) scan; - register ush scan_end = *(ush *) (scan + best_len - 1); -#else register uch *strend = window + strstart + MAX_MATCH; register uch scan_end1 = scan[best_len - 1]; register uch scan_end = scan[best_len]; -#endif /* Do not waste too much time if we already have a good match: */ if (prev_length >= good_match) { chain_length >>= 2; } - Assert(strstart <= window_size - MIN_LOOKAHEAD, - "insufficient lookahead"); + Assert(strstart <= window_size - MIN_LOOKAHEAD, "insufficient lookahead"); do { Assert(cur_match < strstart, "no future"); @@ -1298,42 +875,6 @@ IPos cur_match; /* current match */ /* Skip to next match if the match length cannot increase * or if the match length is less than 2: */ -#if (defined(UNALIGNED_OK) && MAX_MATCH == 258) - /* This code assumes sizeof(unsigned short) == 2. Do not use - * UNALIGNED_OK if your compiler uses a different size. - */ - if (*(ush *) (match + best_len - 1) != scan_end || - *(ush *) match != scan_start) - continue; - - /* It is not necessary to compare scan[2] and match[2] since they are - * always equal when the other bytes match, given that the hash keys - * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at - * strstart+3, +5, ... up to strstart+257. We check for insufficient - * lookahead only every 4th comparison; the 128th check will be made - * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is - * necessary to put more guard bytes at the end of the window, or - * to check more often for insufficient lookahead. - */ - scan++, match++; - do { - } while (*(ush *) (scan += 2) == *(ush *) (match += 2) && - *(ush *) (scan += 2) == *(ush *) (match += 2) && - *(ush *) (scan += 2) == *(ush *) (match += 2) && - *(ush *) (scan += 2) == *(ush *) (match += 2) && - scan < strend); - /* The funny "do {}" generates better code on most compilers */ - - /* Here, scan <= window+strstart+257 */ - Assert(scan <= window + (unsigned) (window_size - 1), "wild scan"); - if (*scan == *match) - scan++; - - len = (MAX_MATCH - 1) - (int) (strend - scan); - scan = strend - (MAX_MATCH - 1); - -#else /* UNALIGNED_OK */ - if (match[best_len] != scan_end || match[best_len - 1] != scan_end1 || *match != *scan || *++match != scan[1]) @@ -1354,50 +895,39 @@ IPos cur_match; /* current match */ } while (*++scan == *++match && *++scan == *++match && *++scan == *++match && *++scan == *++match && *++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - scan < strend); + *++scan == *++match && *++scan == *++match && scan < strend); len = MAX_MATCH - (int) (strend - scan); scan = strend - MAX_MATCH; -#endif /* UNALIGNED_OK */ - if (len > best_len) { match_start = cur_match; best_len = len; if (len >= nice_match) break; -#ifdef UNALIGNED_OK - scan_end = *(ush *) (scan + best_len - 1); -#else scan_end1 = scan[best_len - 1]; scan_end = scan[best_len]; -#endif } } while ((cur_match = prev[cur_match & WMASK]) > limit && --chain_length != 0); return best_len; } -#endif /* ASMV */ #ifdef DEBUG /* =========================================================================== * Check that the match at match_start is indeed a match. */ -local void check_match(start, match, length) -IPos start, match; -int length; +static void check_match(IPos start, IPos match, int length) { /* check that the match is indeed a match */ if (memcmp((char *) window + match, (char *) window + start, length) != EQUAL) { - fprintf(stderr, - " start %d, match %d, length %d\n", start, match, length); - errorMsg("invalid match"); + bb_error_msg(" start %d, match %d, length %d", start, match, length); + bb_error_msg("invalid match"); } if (verbose > 1) { - fprintf(stderr, "\\[%d,%d]", start - match, length); + bb_error_msg("\\[%d,%d]", start - match, length); do { putc(window[start++], stderr); } while (--length != 0); @@ -1415,11 +945,10 @@ int length; * file reads are performed for at least two bytes (required for the * translate_eol option). */ -local void fill_window() +static void fill_window(void) { register unsigned n, m; unsigned more = - (unsigned) (window_size - (ulg) lookahead - (ulg) strstart); /* Amount of free space at the end of the window. */ @@ -1439,7 +968,7 @@ local void fill_window() memcpy((char *) window, (char *) window + WSIZE, (unsigned) WSIZE); match_start -= WSIZE; - strstart -= WSIZE; /* we now have strstart >= MAX_DIST: */ + strstart -= WSIZE; /* we now have strstart >= MAX_DIST: */ block_start -= (long) WSIZE; @@ -1473,25 +1002,21 @@ local void fill_window() */ #define FLUSH_BLOCK(eof) \ flush_block(block_start >= 0L ? (char*)&window[(unsigned)block_start] : \ - (char*)NULL, (long)strstart - block_start, (eof)) + (char*)NULL, (long)strstart - block_start, (eof)) /* =========================================================================== * Same as above, but achieves better compression. We use a lazy * evaluation for matches: a match is finally adopted only if there is * no better match at the next window position. */ -ulg deflate() +static ulg deflate(void) { - IPos hash_head; /* head of hash chain */ - IPos prev_match; /* previous match */ - int flush; /* set if current block must be flushed */ + IPos hash_head; /* head of hash chain */ + IPos prev_match; /* previous match */ + int flush; /* set if current block must be flushed */ int match_available = 0; /* set if previous match exists */ register unsigned match_length = MIN_MATCH - 1; /* length of best match */ -#ifdef DEBUG - extern long isize; /* byte length of input file, for debug only */ -#endif - /* Process the input block. */ while (lookahead != 0) { /* Insert the string window[strstart .. strstart+2] in the @@ -1516,8 +1041,7 @@ ulg deflate() match_length = 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 && strstart - match_start > TOO_FAR) { /* If prev_match is also MIN_MATCH, match_start is garbage * but we will ignore the current match anyway. */ @@ -1532,8 +1056,7 @@ ulg deflate() check_match(strstart - 1, prev_match, prev_length); flush = - ct_tally(strstart - 1 - prev_match, - prev_length - MIN_MATCH); + ct_tally(strstart - 1 - prev_match, prev_length - MIN_MATCH); /* Insert in hash table all strings up to the end of the match. * strstart-1 and strstart are already inserted. @@ -1587,7 +1110,7 @@ ulg deflate() if (match_available) ct_tally(0, window[strstart - 1]); - return FLUSH_BLOCK(1); /* eof */ + return FLUSH_BLOCK(1); /* eof */ } /* gzip (GNU zip) -- compress files with zip algorithm and 'compress' interface @@ -1608,203 +1131,13 @@ ulg deflate() * or stdout with -c option or if stdin used as input. * If the output file name had to be truncated, the original name is kept * in the compressed file. - * On MSDOS, file.tmp -> file.tmz. On VMS, file.tmp -> file.tmp-gz. - * - * Using gz on MSDOS would create too many file name conflicts. For - * example, foo.txt -> foo.tgz (.tgz must be reserved as shorthand for - * tar.gz). Similarly, foo.dir and foo.doc would both be mapped to foo.dgz. - * I also considered 12345678.txt -> 12345txt.gz but this truncates the name - * too heavily. There is no ideal solution given the MSDOS 8+3 limitation. - * - * For the meaning of all compilation flags, see comments in Makefile.in. */ -#include -#include -#include -#include -#include - /* configuration */ -#ifdef NO_TIME_H -# include -#else -# include -#endif - -#ifndef NO_FCNTL_H -# include -#endif - -#ifdef HAVE_UNISTD_H -# include -#endif - -#if defined(STDC_HEADERS) || !defined(NO_STDLIB_H) -# include -#else -extern int errno; -#endif - -#if defined(DIRENT) -# include typedef struct dirent dir_type; -# define NLENGTH(dirent) ((int)strlen((dirent)->d_name)) -# define DIR_OPT "DIRENT" -#else -# define NLENGTH(dirent) ((dirent)->d_namlen) -# ifdef SYSDIR -# include -typedef struct direct dir_type; - -# define DIR_OPT "SYSDIR" -# else -# ifdef SYSNDIR -# include -typedef struct direct dir_type; - -# define DIR_OPT "SYSNDIR" -# else -# ifdef NDIR -# include -typedef struct direct dir_type; - -# define DIR_OPT "NDIR" -# else -# define NO_DIR -# define DIR_OPT "NO_DIR" -# endif -# endif -# endif -#endif - -#ifndef NO_UTIME -# ifndef NO_UTIME_H -# include -# define TIME_OPT "UTIME" -# else -# ifdef HAVE_SYS_UTIME_H -# include -# define TIME_OPT "SYS_UTIME" -# else -struct utimbuf { - time_t actime; - time_t modtime; -}; - -# define TIME_OPT "" -# endif -# endif -#else -# define TIME_OPT "NO_UTIME" -#endif - -#if !defined(S_ISDIR) && defined(S_IFDIR) -# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) -#endif -#if !defined(S_ISREG) && defined(S_IFREG) -# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) -#endif - -typedef RETSIGTYPE(*sig_type) (int); - -#ifndef O_BINARY -# define O_BINARY 0 /* creation mode for open() */ -#endif - -#ifndef O_CREAT - /* Pure BSD system? */ -# include -# ifndef O_CREAT -# define O_CREAT FCREAT -# endif -# ifndef O_EXCL -# define O_EXCL FEXCL -# endif -#endif - -#ifndef S_IRUSR -# define S_IRUSR 0400 -#endif -#ifndef S_IWUSR -# define S_IWUSR 0200 -#endif -#define RW_USER (S_IRUSR | S_IWUSR) /* creation mode for open() */ - -#ifndef MAX_PATH_LEN -# define MAX_PATH_LEN 1024 /* max pathname length */ -#endif - -#ifndef SEEK_END -# define SEEK_END 2 -#endif - -#ifdef NO_OFF_T -typedef long off_t; -off_t lseek (int fd, off_t offset, int whence); -#endif - -/* Separator for file name parts (see shorten_name()) */ -#ifdef NO_MULTIPLE_DOTS -# define PART_SEP "-" -#else -# define PART_SEP "." -#endif - - /* global buffers */ - -DECLARE(uch, inbuf, INBUFSIZ + INBUF_EXTRA); -DECLARE(uch, outbuf, OUTBUFSIZ + OUTBUF_EXTRA); -DECLARE(ush, d_buf, DIST_BUFSIZE); -DECLARE(uch, window, 2L * WSIZE); -#ifndef MAXSEG_64K -DECLARE(ush, tab_prefix, 1L << BITS); -#else -DECLARE(ush, tab_prefix0, 1L << (BITS - 1)); -DECLARE(ush, tab_prefix1, 1L << (BITS - 1)); -#endif - - /* local variables */ - -int ascii = 0; /* convert end-of-lines to local OS conventions */ -int decompress = 0; /* decompress (-d) */ -int no_name = -1; /* don't save or restore the original file name */ -int no_time = -1; /* don't save or restore the original file time */ -int foreground; /* set if program run in foreground */ -char *progname; /* program name */ -static int method = DEFLATED; /* compression method */ -static int exit_code = OK; /* program exit code */ -int save_orig_name; /* set if original name must be saved */ -int last_member; /* set for .zip and .Z files */ -int part_nb; /* number of parts in .gz file */ -long time_stamp; /* original time stamp (modification time) */ -long ifile_size; /* input file size, -1 for devices (debug only) */ -char *env; /* contents of GZIP env variable */ -char z_suffix[MAX_SUFFIX + 1]; /* default suffix (can be set with --suffix) */ -int z_len; /* strlen(z_suffix) */ - -long bytes_in; /* number of input bytes */ -long bytes_out; /* number of output bytes */ -char ifname[MAX_PATH_LEN]; /* input file name */ -char ofname[MAX_PATH_LEN]; /* output file name */ -int remove_ofname = 0; /* remove output file on error */ -struct stat istat; /* status for input file */ -int ifd; /* input file descriptor */ -int ofd; /* output file descriptor */ -unsigned insize; /* valid bytes in inbuf */ -unsigned inptr; /* index of next byte to be processed in inbuf */ -unsigned outcnt; /* bytes in output buffer */ - -/* local functions */ - -#define strequ(s1, s2) (strcmp((s1),(s2)) == 0) - /* ======================================================================== */ -// int main (argc, argv) -// int argc; -// char **argv; int gzip_main(int argc, char **argv) { int result; @@ -1813,40 +1146,52 @@ int gzip_main(int argc, char **argv) struct stat statBuf; char *delFileName; int tostdout = 0; - int fromstdin = 0; + int force = 0; + int opt; - if (argc == 1) - usage(gzip_usage); - - /* Parse any options */ - while (--argc > 0 && **(++argv) == '-') { - if (*((*argv) + 1) == '\0') { - fromstdin = 1; + while ((opt = getopt(argc, argv, "cf123456789dq")) != -1) { + switch (opt) { + case 'c': tostdout = 1; - } - while (*(++(*argv))) { - switch (**argv) { - case 'c': - tostdout = 1; - break; - default: - usage(gzip_usage); - } + break; + case 'f': + force = 1; + break; + /* Ignore 1-9 (compression level) options */ + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + break; + case 'q': + break; +#ifdef CONFIG_GUNZIP + case 'd': + optind = 1; + return gunzip_main(argc, argv); +#endif + default: + bb_show_usage(); } } foreground = signal(SIGINT, SIG_IGN) != SIG_IGN; if (foreground) { - (void) signal(SIGINT, (sig_type) abort_gzip); + (void) signal(SIGINT, abort_gzip); } #ifdef SIGTERM if (signal(SIGTERM, SIG_IGN) != SIG_IGN) { - (void) signal(SIGTERM, (sig_type) abort_gzip); + (void) signal(SIGTERM, abort_gzip); } #endif #ifdef SIGHUP if (signal(SIGHUP, SIG_IGN) != SIG_IGN) { - (void) signal(SIGHUP, (sig_type) abort_gzip); + (void) signal(SIGHUP, abort_gzip); } #endif @@ -1858,95 +1203,89 @@ int gzip_main(int argc, char **argv) ALLOC(uch, outbuf, OUTBUFSIZ + OUTBUF_EXTRA); ALLOC(ush, d_buf, DIST_BUFSIZE); ALLOC(uch, window, 2L * WSIZE); -#ifndef MAXSEG_64K ALLOC(ush, tab_prefix, 1L << BITS); -#else - ALLOC(ush, tab_prefix0, 1L << (BITS - 1)); - ALLOC(ush, tab_prefix1, 1L << (BITS - 1)); -#endif - if (fromstdin == 1) { - strcpy(ofname, "stdin"); + /* Initialise the CRC32 table */ + crc_32_tab = bb_crc32_filltable(0); + + clear_bufs(); + part_nb = 0; - inFileNum = fileno(stdin); - time_stamp = 0; /* time unknown by default */ - ifile_size = -1L; /* convention for unknown size */ + if (optind == argc) { + time_stamp = 0; + ifile_size = -1L; + zip(STDIN_FILENO, STDOUT_FILENO); } else { - /* Open up the input file */ - if (*argv == '\0') - usage(gzip_usage); - strncpy(ifname, *argv, MAX_PATH_LEN); - - /* Open input fille */ - inFileNum = open(ifname, O_RDONLY); - if (inFileNum < 0) { - perror(ifname); - exit(WARNING); - } - /* Get the time stamp on the input file. */ - result = stat(ifname, &statBuf); - if (result < 0) { - perror(ifname); - exit(WARNING); - } - time_stamp = statBuf.st_ctime; - ifile_size = statBuf.st_size; - } + int i; + for (i = optind; i < argc; i++) { + char *path = NULL; - if (tostdout == 1) { - /* And get to work */ - strcpy(ofname, "stdout"); - outFileNum = fileno(stdout); - SET_BINARY_MODE(fileno(stdout)); + clear_bufs(); + if (strcmp(argv[i], "-") == 0) { + time_stamp = 0; + ifile_size = -1L; + inFileNum = STDIN_FILENO; + outFileNum = STDOUT_FILENO; + } else { + inFileNum = bb_xopen3(argv[i], O_RDONLY, 0); + if (fstat(inFileNum, &statBuf) < 0) + bb_perror_msg_and_die("%s", argv[i]); + time_stamp = statBuf.st_ctime; + ifile_size = statBuf.st_size; + + if (!tostdout) { + path = xmalloc(strlen(argv[i]) + 4); + strcpy(path, argv[i]); + strcat(path, ".gz"); + + /* Open output file */ +#if (__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; + } - clear_bufs(); /* clear input and output buffers */ - part_nb = 0; + if (path == NULL && isatty(outFileNum) && force == 0) { + bb_error_msg + ("compressed data not written to a terminal. Use -f to force compression."); + free(path); + continue; + } - /* Actually do the compression/decompression. */ - zip(inFileNum, outFileNum); + result = zip(inFileNum, outFileNum); - } else { + if (path != NULL) { + close(inFileNum); + close(outFileNum); - /* And get to work */ - strncpy(ofname, ifname, MAX_PATH_LEN - 4); - strcat(ofname, ".gz"); + /* Delete the original file */ + if (result == OK) + delFileName = argv[i]; + else + delFileName = path; + if (unlink(delFileName) < 0) + bb_perror_msg("%s", delFileName); + } - /* Open output fille */ -#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) - outFileNum = open(ofname, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW); -#else - outFileNum = open(ofname, O_RDWR | O_CREAT | O_EXCL); -#endif - if (outFileNum < 0) { - perror(ofname); - exit(WARNING); - } - SET_BINARY_MODE(outFileNum); - /* Set permissions on the file */ - fchmod(outFileNum, statBuf.st_mode); - - clear_bufs(); /* clear input and output buffers */ - part_nb = 0; - - /* Actually do the compression/decompression. */ - result = zip(inFileNum, outFileNum); - close(outFileNum); - close(inFileNum); - /* Delete the original file */ - if (result == OK) - delFileName = ifname; - else - delFileName = ofname; - - if (unlink(delFileName) < 0) { - perror(delFileName); - exit(FALSE); + free(path); } } - return(exit_code); + return (exit_code); } /* trees.c -- output deflated data using Huffman coding @@ -2004,8 +1343,6 @@ int gzip_main(int argc, char **argv) * */ -#include - /* =========================================================================== * Constants */ @@ -2034,16 +1371,22 @@ int gzip_main(int argc, char **argv) #define BL_CODES 19 /* number of codes used to transfer the bit lengths */ +typedef uch extra_bits_t; -local int near extra_lbits[LENGTH_CODES] /* extra bits for each length code */ +/* extra bits for each length code */ +static const extra_bits_t extra_lbits[LENGTH_CODES] = { 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 }; + 4, 4, 5, 5, 5, 5, 0 +}; -local int near extra_dbits[D_CODES] /* extra bits for each distance code */ +/* extra bits for each distance code */ +static const extra_bits_t extra_dbits[D_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 }; + 10, 10, 11, 11, 12, 12, 13, 13 +}; -local int near extra_blbits[BL_CODES] /* extra bits for each bit length code */ +/* extra bits for each bit length code */ +static const extra_bits_t extra_blbits[BL_CODES] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 7 }; #define STORED_BLOCK 0 @@ -2086,23 +1429,28 @@ local int near extra_blbits[BL_CODES] /* extra bits for each bit length code */ * 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) */ #define REPZ_3_10 17 /* repeat a zero length 3-10 times (3 bits of repeat count) */ #define REPZ_11_138 18 -/* repeat a zero length 11-138 times (7 bits of repeat count) *//* =========================================================================== +/* repeat a zero length 11-138 times (7 bits of repeat count) */ + +/* =========================================================================== * Local data - *//* Data structure describing a single value and its code string. */ typedef struct ct_data { + */ + +/* Data structure describing a single value and its code string. */ +typedef struct ct_data { union { - ush freq; /* frequency count */ - ush code; /* bit string */ + ush freq; /* frequency count */ + ush code; /* bit string */ } fc; union { - ush dad; /* father node in Huffman tree */ - ush len; /* length of bit string */ + ush dad; /* father node in Huffman tree */ + ush len; /* length of bit string */ } dl; } ct_data; @@ -2114,10 +1462,10 @@ error cannot overlay l_buf and inbuf #define HEAP_SIZE (2*L_CODES+1) /* maximum heap size */ -local ct_data near dyn_ltree[HEAP_SIZE]; /* literal and length tree */ -local ct_data near dyn_dtree[2 * D_CODES + 1]; /* distance tree */ +static ct_data dyn_ltree[HEAP_SIZE]; /* literal and length tree */ +static ct_data dyn_dtree[2 * D_CODES + 1]; /* distance tree */ -local ct_data near static_ltree[L_CODES + 2]; +static 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 @@ -2125,77 +1473,79 @@ local ct_data near static_ltree[L_CODES + 2]; * below). */ -local ct_data near static_dtree[D_CODES]; +static ct_data static_dtree[D_CODES]; /* The static distance tree. (Actually a trivial tree since all codes use * 5 bits.) */ -local ct_data near bl_tree[2 * BL_CODES + 1]; +static ct_data bl_tree[2 * BL_CODES + 1]; /* Huffman tree for the bit lengths */ typedef struct tree_desc { - ct_data near *dyn_tree; /* the dynamic tree */ - ct_data near *static_tree; /* corresponding static tree or NULL */ - int near *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 */ + 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 */ + 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; -local tree_desc near l_desc = +static tree_desc l_desc = { dyn_ltree, static_ltree, extra_lbits, LITERALS + 1, L_CODES, - MAX_BITS, 0 }; + MAX_BITS, 0 +}; -local tree_desc near d_desc = +static tree_desc d_desc = { dyn_dtree, static_dtree, extra_dbits, 0, D_CODES, MAX_BITS, 0 }; -local tree_desc near bl_desc = - { bl_tree, (ct_data near *) 0, extra_blbits, 0, BL_CODES, MAX_BL_BITS, - 0 }; +static tree_desc bl_desc = + { bl_tree, (ct_data *) 0, extra_blbits, 0, BL_CODES, MAX_BL_BITS, + 0 +}; -local ush near bl_count[MAX_BITS + 1]; +static ush bl_count[MAX_BITS + 1]; /* number of codes at each bit length for an optimal tree */ -local uch near bl_order[BL_CODES] +static const uch bl_order[BL_CODES] = { 16, 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. */ -local int near heap[2 * L_CODES + 1]; /* heap used to build the Huffman trees */ -local int heap_len; /* number of elements in the heap */ -local int heap_max; /* element of largest frequency */ +static int heap[2 * L_CODES + 1]; /* heap used to build the Huffman trees */ +static int heap_len; /* number of elements in the heap */ +static 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. */ -local uch near depth[2 * L_CODES + 1]; +static uch depth[2 * L_CODES + 1]; /* Depth of each subtree used as tie breaker for trees of equal frequency */ -local uch length_code[MAX_MATCH - MIN_MATCH + 1]; +static uch length_code[MAX_MATCH - MIN_MATCH + 1]; /* length code for each normalized match length (0 == MIN_MATCH) */ -local uch dist_code[512]; +static 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. */ -local int near base_length[LENGTH_CODES]; +static int base_length[LENGTH_CODES]; /* First normalized length for each code (0 = MIN_MATCH) */ -local int near base_dist[D_CODES]; +static int base_dist[D_CODES]; /* First normalized distance for each code (0 = distance of 1) */ @@ -2204,58 +1554,47 @@ local int near base_dist[D_CODES]; /* DECLARE(ush, d_buf, DIST_BUFSIZE); buffer for distances */ -local uch near flag_buf[(LIT_BUFSIZE / 8)]; +static 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. */ -local unsigned last_lit; /* running index in l_buf */ -local unsigned last_dist; /* running index in d_buf */ -local unsigned last_flags; /* running index in flag_buf */ -local uch flags; /* current flags not yet saved in flag_buf */ -local uch flag_bit; /* current bit used in flags */ +static unsigned last_lit; /* running index in l_buf */ +static unsigned last_dist; /* running index in d_buf */ +static unsigned last_flags; /* running index in flag_buf */ +static uch flags; /* current flags not yet saved in flag_buf */ +static 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. */ -local ulg opt_len; /* bit length of current block with optimal trees */ -local ulg static_len; /* bit length of current block with static trees */ +static ulg opt_len; /* bit length of current block with optimal trees */ +static ulg static_len; /* bit length of current block with static trees */ -local ulg compressed_len; /* total bit length of compressed file */ +static ulg compressed_len; /* total bit length of compressed file */ -local ulg input_len; /* total byte length of input file */ -/* input_len is for debugging only since we can get it by other means. */ - -ush *file_type; /* pointer to UNKNOWN, BINARY or ASCII */ -int *file_method; /* pointer to DEFLATE or STORE */ - -#ifdef DEBUG -extern ulg bits_sent; /* bit length of the compressed data */ -extern long isize; /* byte length of input file */ -#endif - -extern long block_start; /* window offset of current block */ -extern unsigned near strstart; /* window offset of current string */ +static ush *file_type; /* pointer to UNKNOWN, BINARY or ASCII */ +static int *file_method; /* pointer to DEFLATE or STORE */ /* =========================================================================== * Local (static) routines in this file. */ -local void init_block (void); -local void pqdownheap (ct_data near * tree, int k); -local void gen_bitlen (tree_desc near * desc); -local void gen_codes (ct_data near * tree, int max_code); -local void build_tree (tree_desc near * desc); -local void scan_tree (ct_data near * tree, int max_code); -local void send_tree (ct_data near * tree, int max_code); -local int build_bl_tree (void); -local void send_all_trees (int lcodes, int dcodes, int blcodes); -local void compress_block (ct_data near * ltree, ct_data near * dtree); -local void set_file_type (void); +static void init_block(void); +static void pqdownheap(ct_data * tree, int k); +static void gen_bitlen(tree_desc * desc); +static void gen_codes(ct_data * tree, int max_code); +static void build_tree(tree_desc * desc); +static void scan_tree(ct_data * tree, int max_code); +static void send_tree(ct_data * tree, int max_code); +static int build_bl_tree(void); +static void send_all_trees(int lcodes, int dcodes, int blcodes); +static void compress_block(ct_data * ltree, ct_data * dtree); +static void set_file_type(void); #ifndef DEBUG @@ -2264,7 +1603,7 @@ local void set_file_type (void); #else /* DEBUG */ # define send_code(c, tree) \ - { if (verbose>1) fprintf(stderr,"\ncd %3d ",(c)); \ + { if (verbose>1) bb_error_msg("\ncd %3d ",(c)); \ send_bits(tree[c].Code, tree[c].Len); } #endif @@ -2282,22 +1621,20 @@ local void set_file_type (void); * location of the internal file attribute (ascii/binary) and method * (DEFLATE/STORE). */ -void ct_init(attr, methodp) -ush *attr; /* pointer to internal file attribute */ -int *methodp; /* pointer to compression method */ +static void ct_init(ush * attr, int *methodp) { - int n; /* iterates over tree elements */ - int bits; /* bit counter */ - int length; /* length value */ - int code; /* code value */ - int dist; /* distance index */ + int n; /* iterates over tree elements */ + int bits; /* bit counter */ + int length; /* length value */ + int code; /* code value */ + int dist; /* distance index */ file_type = attr; file_method = methodp; - compressed_len = input_len = 0L; + compressed_len = 0L; if (static_dtree[0].Len != 0) - return; /* ct_init already called */ + return; /* ct_init already called */ /* Initialize the mapping length (0..255) -> length code (0..28) */ length = 0; @@ -2323,7 +1660,7 @@ int *methodp; /* pointer to compression method */ } } Assert(dist == 256, "ct_init: dist != 256"); - dist >>= 7; /* from now on, all distances are divided by 128 */ + dist >>= 7; /* from now on, all distances are divided by 128 */ for (; code < D_CODES; code++) { base_dist[code] = dist << 7; for (n = 0; n < (1 << (extra_dbits[code] - 7)); n++) { @@ -2348,7 +1685,7 @@ int *methodp; /* pointer to compression method */ * tree construction to get a canonical Huffman tree (longest code * all ones) */ - gen_codes((ct_data near *) static_ltree, L_CODES + 1); + gen_codes((ct_data *) static_ltree, L_CODES + 1); /* The static distance tree is trivial: */ for (n = 0; n < D_CODES; n++) { @@ -2363,9 +1700,9 @@ int *methodp; /* pointer to compression method */ /* =========================================================================== * Initialize a new block. */ -local void init_block() +static void init_block(void) { - int n; /* iterates over tree elements */ + int n; /* iterates over tree elements */ /* Initialize the trees. */ for (n = 0; n < L_CODES; n++) @@ -2411,12 +1748,10 @@ local void init_block() * when the heap property is re-established (each father smaller than its * two sons). */ -local void pqdownheap(tree, k) -ct_data near *tree; /* the tree to restore */ -int k; /* node to move down */ +static void pqdownheap(ct_data * tree, int k) { int v = heap[k]; - int j = k << 1; /* left son of k */ + int j = k << 1; /* left son of k */ while (j <= heap_len) { /* Set j to the smallest of the two sons: */ @@ -2447,21 +1782,20 @@ int k; /* node to move down */ * The length opt_len is updated; static_len is also updated if stree is * not null. */ -local void gen_bitlen(desc) -tree_desc near *desc; /* the tree descriptor */ +static void gen_bitlen(tree_desc * desc) { - ct_data near *tree = desc->dyn_tree; - int near *extra = desc->extra_bits; + ct_data *tree = desc->dyn_tree; + const extra_bits_t *extra = desc->extra_bits; int base = desc->extra_base; int max_code = desc->max_code; int max_length = desc->max_length; - ct_data near *stree = desc->static_tree; - int h; /* heap index */ - int n, m; /* iterate over the tree elements */ - int bits; /* bit length */ - int xbits; /* extra bits */ - ush f; /* frequency */ - int overflow = 0; /* number of elements with bit length too large */ + ct_data *stree = desc->static_tree; + int h; /* heap index */ + int n, m; /* iterate over the tree elements */ + int bits; /* bit length */ + int xbits; /* extra bits */ + ush f; /* frequency */ + int overflow = 0; /* number of elements with bit length too large */ for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0; @@ -2480,7 +1814,7 @@ tree_desc near *desc; /* the tree descriptor */ /* We overwrite tree[n].Dad which is no longer needed */ if (n > max_code) - continue; /* not a leaf node */ + continue; /* not a leaf node */ bl_count[bits]++; xbits = 0; @@ -2503,7 +1837,7 @@ tree_desc near *desc; /* the tree descriptor */ bits = max_length - 1; while (bl_count[bits] == 0) bits--; - bl_count[bits]--; /* move one leaf down the tree */ + bl_count[bits]--; /* move one leaf down the tree */ bl_count[bits + 1] += 2; /* move one overflow item as its brother */ bl_count[max_length]--; /* The brother of the overflow item also moves one step up, @@ -2524,12 +1858,10 @@ tree_desc near *desc; /* the tree descriptor */ if (m > max_code) continue; if (tree[m].Len != (unsigned) bits) { - Trace( - (stderr, "code %d bits %d->%d\n", m, tree[m].Len, + Trace((stderr, "code %d bits %d->%d\n", m, tree[m].Len, bits)); opt_len += - ((long) bits - - (long) tree[m].Len) * (long) tree[m].Freq; + ((long) bits - (long) tree[m].Len) * (long) tree[m].Freq; tree[m].Len = (ush) bits; } n--; @@ -2545,14 +1877,12 @@ tree_desc near *desc; /* the tree descriptor */ * OUT assertion: the field code is set for all tree elements of non * zero code length. */ -local void gen_codes(tree, max_code) -ct_data near *tree; /* the tree to decorate */ -int max_code; /* largest code with non zero frequency */ +static void gen_codes(ct_data * tree, int max_code) { ush next_code[MAX_BITS + 1]; /* next code value for each bit length */ - ush code = 0; /* running code value */ - int bits; /* bit index */ - int n; /* code index */ + ush code = 0; /* running code value */ + int bits; /* bit index */ + int n; /* code index */ /* The distribution counts are first used to generate the code values * without bit reversal. @@ -2590,15 +1920,14 @@ int max_code; /* largest code with non zero frequency */ * and corresponding code. The length opt_len is updated; static_len is * also updated if stree is not null. The field max_code is set. */ -local void build_tree(desc) -tree_desc near *desc; /* the tree descriptor */ +static void build_tree(tree_desc * desc) { - ct_data near *tree = desc->dyn_tree; - ct_data near *stree = desc->static_tree; + ct_data *tree = desc->dyn_tree; + ct_data *stree = desc->static_tree; int elems = desc->elems; - int n, m; /* iterate over heap elements */ - int max_code = -1; /* largest code with non zero frequency */ - int node = elems; /* next internal node of the tree */ + int n, m; /* iterate over heap elements */ + int max_code = -1; /* largest code with non zero frequency */ + int node = elems; /* next internal node of the tree */ /* Construct the initial heap, with least frequent element in * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1]. @@ -2642,8 +1971,8 @@ tree_desc near *desc; /* the tree descriptor */ * frequent nodes. */ do { - pqremove(tree, n); /* n = node of least frequency */ - m = heap[SMALLEST]; /* m = node of next least frequency */ + pqremove(tree, n); /* n = node of least frequency */ + m = heap[SMALLEST]; /* m = node of next least frequency */ heap[--heap_max] = n; /* keep the nodes sorted by frequency */ heap[--heap_max] = m; @@ -2654,9 +1983,8 @@ tree_desc near *desc; /* the tree descriptor */ tree[n].Dad = tree[m].Dad = (ush) node; #ifdef DUMP_BL_TREE if (tree == bl_tree) { - fprintf(stderr, "\nnode %d(%d), sons %d(%d) %d(%d)", - node, tree[node].Freq, n, tree[n].Freq, m, - tree[m].Freq); + 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 */ @@ -2670,10 +1998,10 @@ tree_desc near *desc; /* the tree descriptor */ /* At this point, the fields freq and dad are set. We can now * generate the bit lengths. */ - gen_bitlen((tree_desc near *) desc); + gen_bitlen((tree_desc *) desc); /* The field len is now set, we can generate the bit codes */ - gen_codes((ct_data near *) tree, max_code); + gen_codes((ct_data *) tree, max_code); } /* =========================================================================== @@ -2682,17 +2010,15 @@ tree_desc near *desc; /* the tree descriptor */ * counts. (The contribution of the bit length codes will be added later * during the construction of bl_tree.) */ -local void scan_tree(tree, max_code) -ct_data near *tree; /* the tree to be scanned */ -int max_code; /* and its largest code of non zero frequency */ +static void scan_tree(ct_data * tree, int max_code) { - int n; /* iterates over all tree elements */ - int prevlen = -1; /* last emitted length */ - int curlen; /* length of current code */ + int n; /* iterates over all tree elements */ + int prevlen = -1; /* last emitted length */ + int curlen; /* length of current code */ int nextlen = tree[0].Len; /* length of next code */ - int count = 0; /* repeat count of the current code */ - int max_count = 7; /* max repeat count */ - int min_count = 4; /* min repeat count */ + int count = 0; /* repeat count of the current code */ + int max_count = 7; /* max repeat count */ + int min_count = 4; /* min repeat count */ if (nextlen == 0) max_count = 138, min_count = 3; @@ -2730,17 +2056,15 @@ int max_code; /* and its largest code of non zero frequency */ * Send a literal or distance tree in compressed form, using the codes in * bl_tree. */ -local void send_tree(tree, max_code) -ct_data near *tree; /* the tree to be scanned */ -int max_code; /* and its largest code of non zero frequency */ +static void send_tree(ct_data * tree, int max_code) { - int n; /* iterates over all tree elements */ - int prevlen = -1; /* last emitted length */ - int curlen; /* length of current code */ + int n; /* iterates over all tree elements */ + int prevlen = -1; /* last emitted length */ + int curlen; /* length of current code */ int nextlen = tree[0].Len; /* length of next code */ - int count = 0; /* repeat count of the current code */ - int max_count = 7; /* max repeat count */ - int min_count = 4; /* min repeat count */ + int count = 0; /* repeat count of the current code */ + int max_count = 7; /* max repeat count */ + int min_count = 4; /* min repeat count */ /* tree[max_code+1].Len = -1; *//* guard already set */ if (nextlen == 0) @@ -2789,16 +2113,16 @@ int max_code; /* and its largest code of non zero frequency */ * Construct the Huffman tree for the bit lengths and return the index in * bl_order of the last bit length code to send. */ -local int build_bl_tree() +static int build_bl_tree(void) { - int max_blindex; /* index of last bit length code of non zero freq */ + 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 near *) dyn_ltree, l_desc.max_code); - scan_tree((ct_data near *) dyn_dtree, d_desc.max_code); + scan_tree((ct_data *) dyn_ltree, l_desc.max_code); + scan_tree((ct_data *) dyn_dtree, d_desc.max_code); /* Build the bit length tree: */ - build_tree((tree_desc near *) (&bl_desc)); + build_tree((tree_desc *) (&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. */ @@ -2813,9 +2137,7 @@ local int build_bl_tree() } /* Update opt_len to include the bit length tree and counts */ 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", opt_len, static_len)); return max_blindex; } @@ -2825,13 +2147,11 @@ local int build_bl_tree() * lengths of the bit length codes, the literal tree and the distance tree. * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4. */ -local void send_all_trees(lcodes, dcodes, blcodes) -int lcodes, dcodes, blcodes; /* number of codes for each tree */ +static void send_all_trees(int lcodes, int dcodes, int blcodes) { - int rank; /* index in bl_order */ + int rank; /* index in bl_order */ - Assert(lcodes >= 257 && dcodes >= 1 - && blcodes >= 4, "not enough codes"); + Assert(lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes"); Assert(lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES, "too many codes"); Tracev((stderr, "\nbl counts: ")); @@ -2844,10 +2164,10 @@ int lcodes, dcodes, blcodes; /* number of codes for each tree */ } Tracev((stderr, "\nbl tree: sent %ld", bits_sent)); - send_tree((ct_data near *) dyn_ltree, lcodes - 1); /* send the literal tree */ + send_tree((ct_data *) dyn_ltree, lcodes - 1); /* send the literal tree */ Tracev((stderr, "\nlit tree: sent %ld", bits_sent)); - send_tree((ct_data near *) dyn_dtree, dcodes - 1); /* send the distance tree */ + send_tree((ct_data *) dyn_dtree, dcodes - 1); /* send the distance tree */ Tracev((stderr, "\ndist tree: sent %ld", bits_sent)); } @@ -2856,13 +2176,10 @@ int lcodes, dcodes, blcodes; /* number of codes for each tree */ * trees or store, and output the encoded block to the zip file. This function * returns the total compressed length for the file so far. */ -ulg flush_block(buf, stored_len, eof) -char *buf; /* input block, or NULL if too old */ -ulg stored_len; /* length of input block */ -int eof; /* true if this is the last block for a file */ +static ulg flush_block(char *buf, ulg stored_len, int eof) { 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 */ + 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 */ @@ -2871,13 +2188,11 @@ int eof; /* true if this is the last block for a file */ set_file_type(); /* Construct the literal and distance trees */ - build_tree((tree_desc near *) (&l_desc)); + build_tree((tree_desc *) (&l_desc)); Tracev((stderr, "\nlit data: dyn %ld, stat %ld", opt_len, static_len)); - build_tree((tree_desc near *) (&d_desc)); - Tracev( - (stderr, "\ndist data: dyn %ld, stat %ld", opt_len, - static_len)); + build_tree((tree_desc *) (&d_desc)); + Tracev((stderr, "\ndist data: dyn %ld, stat %ld", opt_len, static_len)); /* At this point, opt_len and static_len are the total bit lengths of * the compressed block data, excluding the tree representations. */ @@ -2890,10 +2205,8 @@ int eof; /* true if this is the last block for a file */ /* Determine the best encoding. Compute first the block length in bytes */ opt_lenb = (opt_len + 3 + 7) >> 3; static_lenb = (static_len + 3 + 7) >> 3; - input_len += stored_len; /* for debugging only */ - Trace( - (stderr, + Trace((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u dist %u ", opt_lenb, opt_len, static_lenb, static_len, stored_len, last_lit, last_dist)); @@ -2905,24 +2218,17 @@ int eof; /* true if this is the last block for a file */ * and if the zip file can be seeked (to rewrite the local header), * the whole file is transformed into a stored file: */ -#ifdef FORCE_METHOD -#else - if (stored_len <= opt_lenb && eof && compressed_len == 0L - && seekable()) { -#endif + if (stored_len <= opt_lenb && eof && compressed_len == 0L && seekable()) { /* Since LIT_BUFSIZE <= 2*WSIZE, the input data must be there: */ if (buf == (char *) 0) - errorMsg("block vanished"); + bb_error_msg("block vanished"); copy_block(buf, (unsigned) stored_len, 0); /* without header */ compressed_len = stored_len << 3; *file_method = STORED; -#ifdef FORCE_METHOD -#else } else if (stored_len + 4 <= opt_lenb && buf != (char *) 0) { /* 4: two words for the lengths */ -#endif /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE. * Otherwise we can't have processed more than WSIZE input bytes since * the last block flush, because compression would have been @@ -2935,27 +2241,21 @@ int eof; /* true if this is the last block for a file */ copy_block(buf, (unsigned) stored_len, 1); /* with header */ -#ifdef FORCE_METHOD -#else } else if (static_lenb == opt_lenb) { -#endif send_bits((STATIC_TREES << 1) + eof, 3); - compress_block((ct_data near *) static_ltree, - (ct_data near *) static_dtree); + compress_block((ct_data *) static_ltree, (ct_data *) static_dtree); compressed_len += 3 + static_len; } else { send_bits((DYN_TREES << 1) + eof, 3); send_all_trees(l_desc.max_code + 1, d_desc.max_code + 1, max_blindex + 1); - compress_block((ct_data near *) dyn_ltree, - (ct_data near *) dyn_dtree); + compress_block((ct_data *) dyn_ltree, (ct_data *) dyn_dtree); compressed_len += 3 + opt_len; } Assert(compressed_len == bits_sent, "bad compressed size"); init_block(); if (eof) { - Assert(input_len == isize, "bad input size"); bi_windup(); compressed_len += 7; /* align on byte boundary */ } @@ -2969,9 +2269,7 @@ int eof; /* true if this is the last block for a file */ * Save the match info and tally the frequency counts. Return true if * the current block must be flushed. */ -int ct_tally(dist, lc) -int dist; /* distance of matched string */ -int lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */ +static int ct_tally(int dist, int lc) { l_buf[last_lit++] = (uch) lc; if (dist == 0) { @@ -2979,7 +2277,7 @@ int lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */ dyn_ltree[lc].Freq++; } else { /* Here, lc is the match length - MIN_MATCH */ - dist--; /* dist = match distance - 1 */ + dist--; /* dist = match distance - 1 */ Assert((ush) dist < (ush) MAX_DIST && (ush) lc <= (ush) (MAX_MATCH - MIN_MATCH) && (ush) d_code(dist) < (ush) D_CODES, "ct_tally: bad match"); @@ -3009,8 +2307,7 @@ int lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */ (ulg) dyn_dtree[dcode].Freq * (5L + extra_dbits[dcode]); } out_length >>= 3; - Trace( - (stderr, + Trace((stderr, "\nlast_lit %u, last_dist %u, in %ld, out ~%ld(%ld%%) ", last_lit, last_dist, in_length, out_length, 100L - out_length * 100L / in_length)); @@ -3027,18 +2324,16 @@ int lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */ /* =========================================================================== * Send the block data compressed using the given Huffman trees */ -local void compress_block(ltree, dtree) -ct_data near *ltree; /* literal tree */ -ct_data near *dtree; /* distance tree */ +static void compress_block(ct_data * ltree, ct_data * dtree) { - unsigned dist; /* distance of matched string */ - int lc; /* match length or unmatched char (if dist == 0) */ - unsigned lx = 0; /* running index in l_buf */ - unsigned dx = 0; /* running index in d_buf */ - unsigned fx = 0; /* running index in flag_buf */ - uch flag = 0; /* current flags */ - unsigned code; /* the code to send */ - int extra; /* number of extra bits to send */ + unsigned dist; /* distance of matched string */ + int lc; /* match length or unmatched char (if dist == 0) */ + unsigned lx = 0; /* running index in l_buf */ + unsigned dx = 0; /* running index in d_buf */ + unsigned fx = 0; /* running index in flag_buf */ + uch flag = 0; /* current flags */ + unsigned code; /* the code to send */ + int extra; /* number of extra bits to send */ if (last_lit != 0) do { @@ -3068,7 +2363,7 @@ ct_data near *dtree; /* distance tree */ dist -= base_dist[code]; send_bits(dist, extra); /* send the extra distance bits */ } - } /* literal or match pair ? */ + } /* literal or match pair ? */ flag >>= 1; } while (lx < last_lit); @@ -3081,7 +2376,7 @@ ct_data near *dtree; /* distance tree */ * 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). */ -local void set_file_type() +static void set_file_type(void) { int n = 0; unsigned ascii_freq = 0; @@ -3095,242 +2390,41 @@ local void set_file_type() bin_freq += dyn_ltree[n++].Freq; *file_type = bin_freq > (ascii_freq >> 2) ? BINARY : ASCII; if (*file_type == BINARY && translate_eol) { - errorMsg("-l used on binary file"); + bb_error_msg("-l used on binary file"); } } -/* util.c -- utility functions for gzip support +/* zip.c -- compress files to the gzip or pkzip format * Copyright (C) 1992-1993 Jean-loup Gailly * This is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License, see the file COPYING. */ -#include -#include -#include - -#ifdef HAVE_UNISTD_H -# include -#endif -#ifndef NO_FCNTL_H -# include -#endif - -#if defined(STDC_HEADERS) || !defined(NO_STDLIB_H) -# include -#else -extern int errno; -#endif - -/* =========================================================================== - * Copy input to output unchanged: zcat == cat with --force. - * IN assertion: insize bytes have already been read in inbuf. - */ -int copy(in, out) -int in, out; /* input and output file descriptors */ -{ - errno = 0; - while (insize != 0 && (int) insize != EOF) { - write_buf(out, (char *) inbuf, insize); - bytes_out += insize; - insize = read(in, (char *) inbuf, INBUFSIZ); - } - if ((int) insize == EOF && errno != 0) { - read_error_msg(); - } - bytes_in = bytes_out; - return OK; -} - -/* ======================================================================== - * Put string s in lower case, return s. - */ -char *strlwr(s) -char *s; -{ - char *t; - - for (t = s; *t; t++) - *t = tolow(*t); - return s; -} - -#if defined(NO_STRING_H) && !defined(STDC_HEADERS) - -/* Provide missing strspn and strcspn functions. */ - -int strspn (const char *s, const char *accept); -int strcspn (const char *s, const char *reject); - -/* ======================================================================== - * Return the length of the maximum initial segment - * of s which contains only characters in accept. - */ -int strspn(s, accept) -const char *s; -const char *accept; -{ - register const char *p; - register const char *a; - register int count = 0; - - for (p = s; *p != '\0'; ++p) { - for (a = accept; *a != '\0'; ++a) { - if (*p == *a) - break; - } - if (*a == '\0') - return count; - ++count; - } - return count; -} - -/* ======================================================================== - * Return the length of the maximum inital segment of s - * which contains no characters from reject. - */ -int strcspn(s, reject) -const char *s; -const char *reject; -{ - register int count = 0; - - while (*s != '\0') { - if (strchr(reject, *s++) != NULL) - return count; - ++count; - } - return count; -} - -#endif /* NO_STRING_H */ -/* ======================================================================== - * Add an environment variable (if any) before argv, and update argc. - * Return the expanded environment variable to be freed later, or NULL - * if no options were added to argv. - */ -#define SEPARATOR " \t" /* separators in env variable */ +static uint32_t crc; /* crc on uncompressed file data */ +static long header_bytes; /* number of bytes in gzip header */ -char *add_envopt(argcp, argvp, env) -int *argcp; /* pointer to argc */ -char ***argvp; /* pointer to argv */ -char *env; /* name of environment variable */ +static void put_long(ulg n) { - char *p; /* running pointer through env variable */ - char **oargv; /* runs through old argv array */ - char **nargv; /* runs through new argv array */ - int oargc = *argcp; /* old argc */ - int nargc = 0; /* number of arguments in env variable */ - - env = (char *) getenv(env); - if (env == NULL) - return NULL; - - p = (char *) xmalloc(strlen(env) + 1); - env = strcpy(p, env); /* keep env variable intact */ - - for (p = env; *p; nargc++) { /* move through env */ - p += strspn(p, SEPARATOR); /* skip leading separators */ - if (*p == '\0') - break; - - p += strcspn(p, SEPARATOR); /* find end of word */ - if (*p) - *p++ = '\0'; /* mark it */ - } - if (nargc == 0) { - free(env); - return NULL; - } - *argcp += nargc; - /* Allocate the new argv array, with an extra element just in case - * the original arg list did not end with a NULL. - */ - nargv = (char **) calloc(*argcp + 1, sizeof(char *)); - - if (nargv == NULL) - errorMsg(memory_exhausted, "gzip"); - oargv = *argvp; - *argvp = nargv; - - /* Copy the program name first */ - if (oargc-- < 0) - errorMsg("argc<=0"); - *(nargv++) = *(oargv++); - - /* Then copy the environment args */ - for (p = env; nargc > 0; nargc--) { - p += strspn(p, SEPARATOR); /* skip separators */ - *(nargv++) = p; /* store start */ - while (*p++); /* skip over word */ - } - - /* Finally copy the old args and add a NULL (usual convention) */ - while (oargc--) - *(nargv++) = *(oargv++); - *nargv = NULL; - return env; + put_short((n) & 0xffff); + put_short(((ulg) (n)) >> 16); } -/* ======================================================================== - * Display compression ratio on the given stream on 6 characters. +/* put_header_byte is used for the compressed output + * - for the initial 4 bytes that can't overflow the buffer. */ -void display_ratio(num, den, file) -long num; -long den; -FILE *file; -{ - long ratio; /* 1000 times the compression ratio */ - - if (den == 0) { - ratio = 0; /* no compression */ - } else if (den < 2147483L) { /* (2**31 -1)/1000 */ - ratio = 1000L * num / den; - } else { - ratio = num / (den / 1000L); - } - if (ratio < 0) { - putc('-', file); - ratio = -ratio; - } else { - putc(' ', file); - } - fprintf(file, "%2ld.%1ld%%", ratio / 10L, ratio % 10L); -} - - -/* zip.c -- compress files to the gzip or pkzip format - * Copyright (C) 1992-1993 Jean-loup Gailly - * This is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License, see the file COPYING. - */ - -#include -#include - -#ifdef HAVE_UNISTD_H -# include -#endif -#ifndef NO_FCNTL_H -# include -#endif - -local ulg crc; /* crc on uncompressed file data */ -long header_bytes; /* number of bytes in gzip header */ +#define put_header_byte(c) {outbuf[outcnt++]=(uch)(c);} /* =========================================================================== * Deflate in to out. * IN assertions: the input and output buffers are cleared. * The variables time_stamp and save_orig_name are initialized. */ -int zip(in, out) -int in, out; /* input and output file descriptors */ +static int zip(int in, int out) { - uch flags = 0; /* general purpose bit flags */ - ush attr = 0; /* ascii/binary flag */ - ush deflate_flags = 0; /* pkzip -es, -en or -ex equivalent */ + 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; ofd = out; @@ -3340,11 +2434,11 @@ int in, out; /* input and output file descriptors */ method = DEFLATED; - put_byte(GZIP_MAGIC[0]); /* magic header */ - put_byte(GZIP_MAGIC[1]); - put_byte(DEFLATED); /* compression method */ + put_header_byte(GZIP_MAGIC[0]); /* magic header */ + put_header_byte(GZIP_MAGIC[1]); + put_header_byte(DEFLATED); /* compression method */ - put_byte(flags); /* general flags */ + put_header_byte(my_flags); /* general flags */ put_long(time_stamp); /* Write deflated file to zip file */ @@ -3355,7 +2449,7 @@ int in, out; /* input and output file descriptors */ lm_init(&deflate_flags); put_byte((uch) deflate_flags); /* extra flags */ - put_byte(OS_CODE); /* OS identifier */ + put_byte(OS_CODE); /* OS identifier */ header_bytes = (long) outcnt; @@ -3376,9 +2470,7 @@ int in, out; /* input and output file descriptors */ * translation, and update the crc and input file size. * IN assertion: size >= 2 (for end-of-line translation) */ -int file_read(buf, size) -char *buf; -unsigned size; +static int file_read(char *buf, unsigned size) { unsigned len; @@ -3392,3 +2484,16 @@ unsigned size; isize += (ulg) len; return (int) len; } + +/* =========================================================================== + * Write the output buffer outbuf[0..outcnt-1] and update bytes_out. + * (used for the compressed data only) + */ +static void flush_outbuf(void) +{ + if (outcnt == 0) + return; + + write_buf(ofd, (char *) outbuf, outcnt); + outcnt = 0; +}