diff options
Diffstat (limited to 'gnu/usr.bin/gzip')
-rw-r--r-- | gnu/usr.bin/gzip/bits.c | 4 | ||||
-rw-r--r-- | gnu/usr.bin/gzip/deflate.c | 6 | ||||
-rw-r--r-- | gnu/usr.bin/gzip/gzip.c | 10 | ||||
-rw-r--r-- | gnu/usr.bin/gzip/gzip.h | 6 | ||||
-rw-r--r-- | gnu/usr.bin/gzip/inflate.c | 10 | ||||
-rw-r--r-- | gnu/usr.bin/gzip/tailor.h | 8 | ||||
-rw-r--r-- | gnu/usr.bin/gzip/trees.c | 4 | ||||
-rw-r--r-- | gnu/usr.bin/gzip/unlzw.c | 62 | ||||
-rw-r--r-- | gnu/usr.bin/gzip/util.c | 4 |
9 files changed, 57 insertions, 57 deletions
diff --git a/gnu/usr.bin/gzip/bits.c b/gnu/usr.bin/gzip/bits.c index 544d6da..fae1780 100644 --- a/gnu/usr.bin/gzip/bits.c +++ b/gnu/usr.bin/gzip/bits.c @@ -60,7 +60,7 @@ #endif #ifdef RCSID -static char rcsid[] = "$Id: bits.c,v 0.9 1993/06/11 10:16:58 jloup Exp $"; +static char rcsid[] = "$Id: bits.c,v 1.3 1993/10/14 00:32:24 nate Exp $"; #endif /* =========================================================================== @@ -186,7 +186,7 @@ void copy_block(buf, len, header) bi_windup(); /* align on byte boundary */ if (header) { - put_short((ush)len); + put_short((ush)len); put_short((ush)~len); #ifdef DEBUG bits_sent += 2*16; diff --git a/gnu/usr.bin/gzip/deflate.c b/gnu/usr.bin/gzip/deflate.c index 7f52b64..0bc0ed4 100644 --- a/gnu/usr.bin/gzip/deflate.c +++ b/gnu/usr.bin/gzip/deflate.c @@ -68,7 +68,7 @@ #include "lzw.h" /* just for consistency checking */ #ifdef RCSID -static char rcsid[] = "$Id: deflate.c,v 0.15 1993/06/24 10:53:53 jloup Exp $"; +static char rcsid[] = "$Id: deflate.c,v 1.3 1993/10/14 00:32:29 nate Exp $"; #endif /* =========================================================================== @@ -623,7 +623,7 @@ local ulg deflate_fast() * the next lookahead bytes will be emitted as literals. */ } while (--match_length != 0); - strstart++; + strstart++; } else { strstart += match_length; match_length = 0; @@ -638,7 +638,7 @@ local ulg deflate_fast() Tracevv((stderr,"%c",window[strstart])); flush = ct_tally (0, window[strstart]); lookahead--; - strstart++; + strstart++; } if (flush) FLUSH_BLOCK(0), block_start = strstart; diff --git a/gnu/usr.bin/gzip/gzip.c b/gnu/usr.bin/gzip/gzip.c index 09fe9a1..846b69e 100644 --- a/gnu/usr.bin/gzip/gzip.c +++ b/gnu/usr.bin/gzip/gzip.c @@ -39,13 +39,13 @@ static char *license_msg[] = { * 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. + * 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. */ #ifdef RCSID -static char rcsid[] = "$Id: gzip.c,v 0.24 1993/06/24 10:52:07 jloup Exp $"; +static char rcsid[] = "$Id: gzip.c,v 1.3 1993/10/14 00:32:48 nate Exp $"; #endif #include <ctype.h> @@ -804,7 +804,7 @@ local void treat_file(iname) if (!save_orig_name) save_orig_name = !no_name; if (verbose) { - fprintf(stderr, "%s:\t%s", ifname, (int)strlen(ifname) >= 15 ? + fprintf(stderr, "%s:\t%s", ifname, (int)strlen(ifname) >= 15 ? "" : ((int)strlen(ifname) >= 7 ? "\t" : "\t\t")); } @@ -1654,7 +1654,7 @@ local void treat_dir(dir) int len; dirp = opendir(dir); - + if (dirp == NULL) { fprintf(stderr, "%s: %s unreadable\n", progname, dir); exit_code = ERROR; @@ -1675,7 +1675,7 @@ local void treat_dir(dir) ** think it's worth it. -- Dave Mack ** (An other alternative might be two passes to avoid depth-first.) */ - + while ((dp = readdir(dirp)) != NULL) { if (strequ(dp->d_name,".") || strequ(dp->d_name,"..")) { diff --git a/gnu/usr.bin/gzip/gzip.h b/gnu/usr.bin/gzip/gzip.h index 88b0710..1ec96cb 100644 --- a/gnu/usr.bin/gzip/gzip.h +++ b/gnu/usr.bin/gzip/gzip.h @@ -28,10 +28,10 @@ # define memzero(s, n) memset ((voidp)(s), 0, (n)) #else # include <strings.h> -# define strchr index +# define strchr index # define strrchr rindex -# define memcpy(d, s, n) bcopy((s), (d), (n)) -# define memcmp(s1, s2, n) bcmp((s1), (s2), (n)) +# define memcpy(d, s, n) bcopy((s), (d), (n)) +# define memcmp(s1, s2, n) bcmp((s1), (s2), (n)) # define memzero(s, n) bzero((s), (n)) #endif diff --git a/gnu/usr.bin/gzip/inflate.c b/gnu/usr.bin/gzip/inflate.c index ede3656..a53d013 100644 --- a/gnu/usr.bin/gzip/inflate.c +++ b/gnu/usr.bin/gzip/inflate.c @@ -43,7 +43,7 @@ chunks), otherwise the dynamic method is used. In the latter case, the codes are customized to the probabilities in the current block, and so can code it much better than the pre-determined fixed codes. - + The Huffman codes themselves are decoded using a mutli-level table lookup, in order to maximize the speed of decoding plus the speed of building the decoding tables. See the comments below that precede the @@ -97,7 +97,7 @@ */ #ifdef RCSID -static char rcsid[] = "$Id: inflate.c,v 0.14 1993/06/10 13:27:04 jloup Exp $"; +static char rcsid[] = "$Id: inflate.c,v 1.3 1993/10/14 00:32:55 nate Exp $"; #endif #include <sys/types.h> @@ -175,7 +175,7 @@ static ush cpdext[] = { /* Extra bits for distance codes */ /* Macros for inflate() bit peeking and grabbing. The usage is: - + NEEDBITS(j) x = b & mask_bits[j]; DUMPBITS(j) @@ -307,7 +307,7 @@ int *m; /* maximum lookup bits, returns actual */ memzero(c, sizeof(c)); p = b; i = n; do { - Tracecv(*p, (stderr, (n-i >= ' ' && n-i <= '~' ? "%c %d\n" : "0x%x %d\n"), + Tracecv(*p, (stderr, (n-i >= ' ' && n-i <= '~' ? "%c %d\n" : "0x%x %d\n"), n-i, *p)); c[*p]++; /* assume all entries <= BMAX */ p++; /* Can't combine with above line (Solaris bug) */ @@ -482,7 +482,7 @@ struct huft *t; /* table to free */ q = (--p)->v.t; free((char*)p); p = q; - } + } return 0; } diff --git a/gnu/usr.bin/gzip/tailor.h b/gnu/usr.bin/gzip/tailor.h index a97d8be..840733a 100644 --- a/gnu/usr.bin/gzip/tailor.h +++ b/gnu/usr.bin/gzip/tailor.h @@ -8,7 +8,7 @@ * The target dependent functions should be defined in tailor.c. */ -/* $Id: tailor.h,v 0.18 1993/06/14 19:32:20 jloup Exp $ */ +/* $Id: tailor.h,v 1.3 1993/10/14 00:33:08 nate Exp $ */ #if defined(__MSDOS__) && !defined(MSDOS) # define MSDOS @@ -235,9 +235,9 @@ # define NO_MEMORY_H # define NO_UTIME_H # define NO_UTIME -# define NO_CHOWN -# define NO_STDIN_FSTAT -# define NO_SIZE_CHECK +# 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 */ diff --git a/gnu/usr.bin/gzip/trees.c b/gnu/usr.bin/gzip/trees.c index db3b4b7..d5b41c8 100644 --- a/gnu/usr.bin/gzip/trees.c +++ b/gnu/usr.bin/gzip/trees.c @@ -59,7 +59,7 @@ #include "gzip.h" #ifdef RCSID -static char rcsid[] = "$Id: trees.c,v 0.12 1993/06/10 13:27:54 jloup Exp $"; +static char rcsid[] = "$Id: trees.c,v 1.3 1993/10/14 00:33:11 nate Exp $"; #endif /* =========================================================================== @@ -342,7 +342,7 @@ void ct_init(attr, methodp) file_type = attr; file_method = methodp; compressed_len = input_len = 0L; - + if (static_dtree[0].Len != 0) return; /* ct_init already called */ /* Initialize the mapping length (0..255) -> length code (0..28) */ diff --git a/gnu/usr.bin/gzip/unlzw.c b/gnu/usr.bin/gzip/unlzw.c index 15d2a31..fe2110f 100644 --- a/gnu/usr.bin/gzip/unlzw.c +++ b/gnu/usr.bin/gzip/unlzw.c @@ -8,7 +8,7 @@ */ #ifdef RCSID -static char rcsid[] = "$Id: unlzw.c,v 0.15 1993/06/10 13:28:35 jloup Exp $"; +static char rcsid[] = "$Id: unlzw.c,v 1.3 1993/10/14 00:33:17 nate Exp $"; #endif #include <sys/types.h> @@ -32,22 +32,22 @@ typedef unsigned short count_short; typedef unsigned long cmp_code_int; #define MAXCODE(n) (1L << (n)) - + #ifndef REGISTERS # define REGISTERS 2 #endif -#define REG1 -#define REG2 -#define REG3 -#define REG4 -#define REG5 -#define REG6 -#define REG7 -#define REG8 -#define REG9 +#define REG1 +#define REG2 +#define REG3 +#define REG4 +#define REG5 +#define REG6 +#define REG7 +#define REG8 +#define REG9 #define REG10 -#define REG11 -#define REG12 +#define REG11 +#define REG12 #define REG13 #define REG14 #define REG15 @@ -116,11 +116,11 @@ typedef unsigned long cmp_code_int; # undef REG16 # define REG16 register #endif - + #ifndef BYTEORDER # define BYTEORDER 0000 #endif - + #ifndef NOALLIGN # define NOALLIGN 0 #endif @@ -189,7 +189,7 @@ int block_mode = BLOCK_MODE; /* block compress mode -C compatible with 2.0 */ * The magic header has already been checked and skipped. * bytes_in and bytes_out have been initialized. */ -int unlzw(in, out) +int unlzw(in, out) int in, out; /* input and output file descriptors */ { REG2 char_type *stackp; @@ -207,7 +207,7 @@ int unlzw(in, out) REG14 code_int maxmaxcode; REG15 int n_bits; REG16 int rsize; - + #ifdef MAXSEG_64K tab_prefix[0] = tab_prefix0; tab_prefix[1] = tab_prefix1; @@ -220,7 +220,7 @@ int unlzw(in, out) } maxbits &= BIT_MASK; maxmaxcode = MAXCODE(maxbits); - + if (maxbits > BITS) { fprintf(stderr, "\n%s: %s: compressed with %d bits, can only handle %d bits\n", @@ -237,9 +237,9 @@ int unlzw(in, out) posbits = inptr<<3; free_ent = ((block_mode) ? FIRST : 256); - + clear_tab_prefixof(); /* Initialize the first 256 entries in the table. */ - + for (code = 255 ; code >= 0 ; --code) { tab_suffixof(code) = (char_type)code; } @@ -247,16 +247,16 @@ int unlzw(in, out) REG1 int i; int e; int o; - + resetbuf: e = insize-(o = (posbits>>3)); - + for (i = 0 ; i < e ; ++i) { inbuf[i] = inbuf[i+o]; } insize = e; posbits = 0; - + if (insize < INBUF_EXTRA) { if ((rsize = read(in, (char*)inbuf+insize, INBUFSIZ)) == EOF) { read_error(); @@ -264,9 +264,9 @@ int unlzw(in, out) insize += rsize; bytes_in += (ulg)rsize; } - inbits = ((rsize != 0) ? ((long)insize - insize%n_bits)<<3 : + inbits = ((rsize != 0) ? ((long)insize - insize%n_bits)<<3 : ((long)insize<<3)-(n_bits-1)); - + while (inbits > posbits) { if (free_ent > maxcode) { posbits = ((posbits-1) + @@ -299,10 +299,10 @@ int unlzw(in, out) } incode = code; stackp = de_stack; - + if (code >= free_ent) { /* Special case for KwKwK string. */ if (code > free_ent) { -#ifdef DEBUG +#ifdef DEBUG char_type *p; posbits -= n_bits; @@ -331,11 +331,11 @@ int unlzw(in, out) code = tab_prefixof(code); } *--stackp = (char_type)(finchar = tab_suffixof(code)); - + /* And put them out in forward order */ { REG1 int i; - + if (outpos+(i = (de_stack-stackp)) >= OUTBUFSIZ) { do { if (i > OUTBUFSIZ-outpos) i = OUTBUFSIZ-outpos; @@ -364,11 +364,11 @@ int unlzw(in, out) tab_prefixof(code) = (unsigned short)oldcode; tab_suffixof(code) = (char_type)finchar; free_ent = code+1; - } + } oldcode = incode; /* Remember previous code. */ } } while (rsize != 0); - + if (!test && outpos > 0) { write_buf(out, (char*)outbuf, outpos); bytes_out += (ulg)outpos; diff --git a/gnu/usr.bin/gzip/util.c b/gnu/usr.bin/gzip/util.c index 70375d8..2cddf92 100644 --- a/gnu/usr.bin/gzip/util.c +++ b/gnu/usr.bin/gzip/util.c @@ -5,7 +5,7 @@ */ #ifdef RCSID -static char rcsid[] = "$Id: util.c,v 0.15 1993/06/15 09:04:13 jloup Exp $"; +static char rcsid[] = "$Id: util.c,v 1.3 1993/10/14 00:33:26 nate Exp $"; #endif #include <ctype.h> @@ -271,7 +271,7 @@ int strcspn(s, reject) /* ======================================================================== * Add an environment variable (if any) before argv, and update argc. - * Return the expanded environment variable to be freed later, or NULL + * 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 */ |