3 files changed, 3835 insertions, 3674 deletions

diff --git a/archival/gunzip.c b/archival/gunzip.c
index db7fa1dfe..2bc490e3e 100644
--- a/archival/gunzip.c
+++ b/archival/gunzip.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* zcat : stripped version based on gzip sources
    Sven Rudolph <sr1@inf.tu-dresden.de>
    */
@@ -8,11 +9,12 @@
 #include "messages.c"
 
 static const char gunzip_usage[] =
-    "gunzip [OPTION]... FILE\n\n"
-    "Uncompress FILE (or standard input if FILE is '-').\n\n"
-    "Options:\n"
-    "\t-c\tWrite output to standard output\n"
-    "\t-t\tTest compressed file integrity\n";
+        "gunzip [OPTION]... FILE\n\n"
+        "Uncompress FILE (or standard input if FILE is '-').\n\n"
+        "Options:\n"
+
+        "\t-c\tWrite output to standard output\n"
+        "\t-t\tTest compressed file integrity\n";
 
 /* gzip (GNU zip) -- compress files with zip algorithm and 'compress' interface
  * Copyright (C) 1992-1993 Jean-loup Gailly
@@ -26,22 +28,23 @@ static const char gunzip_usage[] =
  */
 
 #if 0
-static char  *license_msg[] = {
-"   Copyright (C) 1992-1993 Jean-loup Gailly",
-"   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, 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., 675 Mass Ave, Cambridge, MA 02139, USA.",
-0};
+static char *license_msg[] = {
+        "   Copyright (C) 1992-1993 Jean-loup Gailly",
+        "   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, 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., 675 Mass Ave, Cambridge, MA 02139, USA.",
+        0
+};
 #endif
 
 /* Compress files with zip algorithm and 'compress' interface.
@@ -67,7 +70,7 @@ static char  *license_msg[] = {
 #include <signal.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <sys/param.h>          /* for PATH_MAX */
+#include <sys/param.h>                  /* for PATH_MAX */
 
 /* #include "tailor.h" */
 
@@ -101,9 +104,9 @@ static char  *license_msg[] = {
 #endif
 
 #ifdef __STDC__
-   typedef void *voidp;
+typedef void *voidp;
 #else
-   typedef char *voidp;
+typedef char *voidp;
 #endif
 
 /* I don't like nested includes, but the string and io functions are used
@@ -118,10 +121,10 @@ static char  *license_msg[] = {
 #  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
 
@@ -131,9 +134,9 @@ static char  *license_msg[] = {
 
 #define local static
 
-typedef unsigned char  uch;
+typedef unsigned char uch;
 typedef unsigned short ush;
-typedef unsigned long  ulg;
+typedef unsigned long ulg;
 
 /* Return codes from gzip */
 #define OK      0
@@ -143,7 +146,7 @@ typedef unsigned long  ulg;
 /* Compression methods (see algorithm.doc) */
 #define DEFLATED    8
 
-extern int method;         /* compression method */
+extern int method;                              /* compression method */
 
 /* To save memory for 16 bit systems, some arrays are overlaid between
  * the various modules:
@@ -158,29 +161,29 @@ extern int method;         /* compression method */
 
 #ifndef INBUFSIZ
 #  ifdef SMALL_MEM
-#    define INBUFSIZ  0x2000  /* input buffer size */
+#    define INBUFSIZ  0x2000    /* input buffer size */
 #  else
-#    define INBUFSIZ  0x8000  /* input buffer size */
+#    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
-#    define OUTBUFSIZ   8192  /* output buffer size */
+#    define OUTBUFSIZ   8192    /* output buffer size */
 #  else
-#    define OUTBUFSIZ  16384  /* output buffer size */
+#    define OUTBUFSIZ  16384    /* output buffer size */
 #  endif
 #endif
-#define OUTBUF_EXTRA 2048   /* required by unlzw() */
+#define OUTBUF_EXTRA 2048               /* required by unlzw() */
 
 #define SMALL_MEM
 
 #ifndef DIST_BUFSIZE
 #  ifdef SMALL_MEM
-#    define DIST_BUFSIZE 0x2000 /* buffer for distances, see trees.c */
+#    define DIST_BUFSIZE 0x2000 /* buffer for distances, see trees.c */
 #  else
-#    define DIST_BUFSIZE 0x8000 /* buffer for distances, see trees.c */
+#    define DIST_BUFSIZE 0x8000 /* buffer for distances, see trees.c */
 #  endif
 #endif
 
@@ -201,50 +204,51 @@ extern int method;         /* compression method */
 #  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) */
+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) */
+#  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 */
+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 */
+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 */
+
+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 */
 
-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 */
+extern long ifile_size;                 /* input file size, -1 for devices (debug only) */
 
-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 GZIP_MAGIC     "\037\213" /* Magic header for gzip files, 1F 8B */
+#define GZIP_MAGIC     "\037\213"       /* Magic header for gzip files, 1F 8B */
 
 /* 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 ENCRYPTED    0x20               /* bit 5 set: file is encrypted */
+#define RESERVED     0xC0               /* bit 6,7:   reserved */
 
 #ifndef WSIZE
-#  define WSIZE 0x8000     /* window size--must be a power of two, and */
-#endif                     /*  at least 32K for zip's deflate method */
+#  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
 #define MAX_MATCH  258
@@ -260,11 +264,11 @@ typedef int file_t;     /* Do not use stdio */
  * distances are limited to MAX_DIST instead of WSIZE.
  */
 
-extern int exit_code;      /* program exit code */
-extern int verbose;        /* be verbose (-v) */
-extern int level;          /* compression level */
-extern int test;           /* check .z file integrity */
-extern int save_orig_name; /* set if original name must be saved */
+extern int exit_code;                   /* program exit code */
+extern int verbose;                             /* be verbose (-v) */
+extern int level;                               /* compression level */
+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))
@@ -296,10 +300,10 @@ extern int save_orig_name; /* set if original name must be saved */
     put_short(((ulg)(n)) >> 16); \
 }
 
-#define seekable()    0  /* force sequential output */
-#define translate_eol 0  /* no option -a yet */
+#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 */
+#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))
@@ -329,43 +333,44 @@ extern int save_orig_name; /* set if original name must be saved */
 
 
         /* in unzip.c */
-extern int unzip      OF((int in, int out));
+extern int unzip OF((int in, int out));
 
         /* in gzip.c */
 RETSIGTYPE abort_gzip OF((void));
 
-        /* in deflate.c */
-void lm_init OF((int pack_level, ush *flags));
-ulg  deflate OF((void));
+                /* in deflate.c */
+void lm_init OF((int pack_level, ush * flags));
+ulg deflate OF((void));
 
-        /* in trees.c */
-void ct_init     OF((ush *attr, int *method));
-int  ct_tally    OF((int dist, int lc));
-ulg  flush_block OF((char *buf, ulg stored_len, int eof));
+                /* in trees.c */
+void ct_init OF((ush * attr, int *method));
+int ct_tally OF((int dist, int lc));
+ulg flush_block OF((char *buf, ulg stored_len, int eof));
 
-        /* in bits.c */
-void     bi_init    OF((file_t zipfile));
-void     send_bits  OF((int value, int length));
+                /* in bits.c */
+void bi_init OF((file_t zipfile));
+void send_bits OF((int value, int length));
 unsigned bi_reverse OF((unsigned value, int length));
-void     bi_windup  OF((void));
-void     copy_block OF((char *buf, unsigned len, int header));
-extern   int (*read_buf) OF((char *buf, unsigned size));
+void bi_windup OF((void));
+void copy_block OF((char *buf, unsigned len, int header));
+extern int (*read_buf) OF((char *buf, unsigned size));
 
         /* in util.c: */
-extern int copy           OF((int in, int out));
-extern ulg  updcrc        OF((uch *s, unsigned n));
-extern void clear_bufs    OF((void));
-extern int  fill_inbuf    OF((int eof_ok));
-extern void flush_outbuf  OF((void));
-extern void flush_window  OF((void));
-extern void write_buf     OF((int fd, voidp buf, unsigned cnt));
+extern int copy OF((int in, int out));
+extern ulg updcrc OF((uch * s, unsigned n));
+extern void clear_bufs OF((void));
+extern int fill_inbuf OF((int eof_ok));
+extern void flush_outbuf OF((void));
+extern void flush_window OF((void));
+extern void write_buf OF((int fd, voidp buf, unsigned cnt));
+
 #ifndef __linux__
-extern char *basename     OF((char *fname));
-#endif  /* not __linux__ */
-extern void error         OF((char *m));
-extern void warn          OF((char *a, char *b));
-extern void read_error    OF((void));
-extern void write_error   OF((void));
+extern char *basename OF((char *fname));
+#endif                                                  /* not __linux__ */
+extern void error OF((char *m));
+extern void warn OF((char *a, char *b));
+extern void read_error OF((void));
+extern void write_error OF((void));
 
         /* in inflate.c */
 extern int inflate OF((void));
@@ -385,11 +390,11 @@ extern int inflate OF((void));
 #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 LZW_MAGIC  "\037\235"   /* Magic header for lzw files, 1F 9D */
+#define LZW_MAGIC  "\037\235"   /* Magic header for lzw files, 1F 9D */
 
-#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
@@ -404,16 +409,16 @@ extern int inflate OF((void));
  * clear the dictionary.
  */
 
-#define LZW_RESERVED 0x60 /* reserved bits */
+#define LZW_RESERVED 0x60               /* reserved bits */
 
-#define CLEAR  256       /* flush the dictionary */
-#define FIRST  (CLEAR+1) /* first free entry */
+#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 */
+extern int maxbits;                             /* max bits per code for LZW */
+extern int block_mode;                  /* block compress mode -C compatible with 2.0 */
 
-extern int lzw    OF((int in, int out));
-extern int unlzw  OF((int in, int out));
+extern int lzw OF((int in, int out));
+extern int unlzw OF((int in, int out));
 
 
 /* #include "revision.h" */
@@ -458,14 +463,12 @@ extern int unlzw  OF((int in, int out));
 #ifdef  __cplusplus
 extern "C" {
 #endif
-
 /* For communication from `getopt' to the caller.
    When `getopt' finds an option that takes an argument,
    the argument value is returned here.
    Also, when `ordering' is RETURN_IN_ORDER,
    each non-option ARGV-element is returned here.  */
-
-extern char *optarg;
+                extern char *optarg;
 
 /* Index in ARGV of the next element to be scanned.
    This is used for communication to and from the caller
@@ -479,16 +482,16 @@ extern char *optarg;
    Otherwise, `optind' communicates from one call to the next
    how much of ARGV has been scanned so far.  */
 
-extern int optind;
+        extern int optind;
 
 /* Callers store zero here to inhibit the error message `getopt' prints
    for unrecognized options.  */
 
-extern int opterr;
+        extern int opterr;
 
 /* Set to an option character which was unrecognized.  */
 
-extern int optopt;
+        extern int optopt;
 
 /* Describe the long-named options requested by the application.
    The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
@@ -511,19 +514,18 @@ extern int optopt;
    one).  For long options that have a zero `flag' field, `getopt'
    returns the contents of the `val' field.  */
 
-struct option
-{
+        struct option {
 #if     __STDC__
-  const char *name;
+                const char *name;
 #else
-  char *name;
+                char *name;
 #endif
-  /* has_arg can't be an enum because some compilers complain about
-     type mismatches in all the code that assumes it is an int.  */
-  int has_arg;
-  int *flag;
-  int val;
-};
+                /* has_arg can't be an enum because some compilers complain about
+                   type mismatches in all the code that assumes it is an int.  */
+                int has_arg;
+                int *flag;
+                int val;
+        };
 
 /* Names for the values of the `has_arg' field of `struct option'.  */
 
@@ -536,60 +538,61 @@ struct option
 /* Many other libraries have conflicting prototypes for getopt, with
    differences in the consts, in stdlib.h.  To avoid compilation
    errors, only prototype getopt for the GNU C library.  */
-extern int getopt (int argc, char *const *argv, const char *shortopts);
-#endif /* not __GNU_LIBRARY__ */
-extern int getopt_long (int argc, char *const *argv, const char *shortopts,
-                        const struct option *longopts, int *longind);
-extern int getopt_long_only (int argc, char *const *argv,
-                             const char *shortopts,
-                             const struct option *longopts, int *longind);
+        extern int getopt(int argc, char *const *argv, const char *shortopts);
+#endif                                                  /* not __GNU_LIBRARY__ */
+        extern int getopt_long(int argc, char *const *argv,
+                                                   const char *shortopts,
+                                                   const struct option *longopts, int *longind);
+        extern int getopt_long_only(int argc, char *const *argv,
+                                                                const char *shortopts,
+                                                                const struct option *longopts,
+                                                                int *longind);
 
 /* Internal only.  Users should not call this directly.  */
-extern int _getopt_internal (int argc, char *const *argv,
-                             const char *shortopts,
-                             const struct option *longopts, int *longind,
-                             int long_only);
-#else /* not __STDC__ */
-extern int getopt ();
-extern int getopt_long ();
-extern int getopt_long_only ();
-
-extern int _getopt_internal ();
-#endif /* not __STDC__ */
+        extern int _getopt_internal(int argc, char *const *argv,
+                                                                const char *shortopts,
+                                                                const struct option *longopts,
+                                                                int *longind, int long_only);
+#else                                                   /* not __STDC__ */
+        extern int getopt();
+        extern int getopt_long();
+        extern int getopt_long_only();
+
+        extern int _getopt_internal();
+#endif                                                  /* not __STDC__ */
 
 #ifdef  __cplusplus
 }
 #endif
-
-#endif /* _GETOPT_H */
-
-
+#endif                                                  /* _GETOPT_H */
 #include <time.h>
 #include <fcntl.h>
 #include <unistd.h>
-
 #include <stdlib.h>
-
 #if defined(DIRENT)
 #  include <dirent.h>
-   typedef struct dirent dir_type;
+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 <sys/dir.h>
-     typedef struct direct dir_type;
+typedef struct direct dir_type;
+
 #    define DIR_OPT "SYSDIR"
 #  else
 #    ifdef SYSNDIR
 #      include <sys/ndir.h>
-       typedef struct direct dir_type;
+typedef struct direct dir_type;
+
 #      define DIR_OPT "SYSNDIR"
 #    else
 #      ifdef NDIR
 #        include <ndir.h>
-         typedef struct direct dir_type;
+typedef struct direct dir_type;
+
 #        define DIR_OPT "NDIR"
 #      else
 #        define NO_DIR
@@ -598,18 +601,16 @@ extern int _getopt_internal ();
 #    endif
 #  endif
 #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) OF((int));
+typedef RETSIGTYPE(*sig_type) OF((int));
 
 #ifndef O_BINARY
-#  define  O_BINARY  0  /* creation mode for open() */
+#  define  O_BINARY  0                  /* creation mode for open() */
 #endif
 
 #ifndef O_CREAT
@@ -629,9 +630,9 @@ typedef RETSIGTYPE (*sig_type) OF((int));
 #ifndef S_IWUSR
 #  define S_IWUSR 0200
 #endif
-#define RW_USER (S_IRUSR | S_IWUSR)  /* creation mode for open() */
+#define RW_USER (S_IRUSR | S_IWUSR)     /* creation mode for open() */
 
-#ifndef MAX_PATH_LEN /* max pathname length */
+#ifndef MAX_PATH_LEN                    /* max pathname length */
 #  ifdef PATH_MAX
 #    define MAX_PATH_LEN   PATH_MAX
 #  else
@@ -644,224 +645,224 @@ typedef RETSIGTYPE (*sig_type) OF((int));
 #endif
 
 #ifdef NO_OFF_T
-  typedef long off_t;
-  off_t lseek OF((int fd, off_t offset, int whence));
+typedef long off_t;
+off_t lseek OF((int fd, off_t offset, int whence));
 #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);
+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);
+DECLARE(ush, tab_prefix, 1L << BITS);
 #else
-    DECLARE(ush, tab_prefix0, 1L<<(BITS-1));
-    DECLARE(ush, tab_prefix1, 1L<<(BITS-1));
+DECLARE(ush, tab_prefix0, 1L << (BITS - 1));
+DECLARE(ush, tab_prefix1, 1L << (BITS - 1));
 #endif
 
                 /* local variables */
 
-int test_mode = 0;    /* check file integrity option */
-int foreground;       /* set if program run in foreground */
-int maxbits = BITS;   /* max bits per code for LZW */
-int method = DEFLATED;/* compression method */
-int exit_code = OK;   /* program exit code */
-int last_member;      /* set for .zip and .Z files */
-int part_nb;          /* number of parts in .gz file */
-long ifile_size;      /* input file size, -1 for devices (debug only) */
-
-long bytes_in;             /* number of input bytes */
-long bytes_out;            /* number of output bytes */
-long total_in = 0;         /* input bytes for all files */
-long total_out = 0;        /* output bytes for all files */
-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 */
-
-long header_bytes;   /* number of bytes in gzip header */
+int test_mode = 0;                              /* check file integrity option */
+int foreground;                                 /* set if program run in foreground */
+int maxbits = BITS;                             /* max bits per code for LZW */
+int method = DEFLATED;                  /* compression method */
+int exit_code = OK;                             /* program exit code */
+int last_member;                                /* set for .zip and .Z files */
+int part_nb;                                    /* number of parts in .gz file */
+long ifile_size;                                /* input file size, -1 for devices (debug only) */
+
+long bytes_in;                                  /* number of input bytes */
+long bytes_out;                                 /* number of output bytes */
+long total_in = 0;                              /* input bytes for all files */
+long total_out = 0;                             /* output bytes for all files */
+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 */
+
+long header_bytes;                              /* number of bytes in gzip header */
 
 /* local functions */
 
-local int  get_method   OF((int in));
+local int get_method OF((int in));
 
 #define strequ(s1, s2) (strcmp((s1),(s2)) == 0)
 
 /* ======================================================================== */
-int gunzip_main (int argc, char** argv)
+int gunzip_main(int argc, char **argv)
 {
-    int file_count;     /* number of files to precess */
-    int to_stdout = 0;
-    int fromstdin = 0;
-    int result;
-    int inFileNum;
-    int outFileNum;
-    int delInputFile=0;
-    struct stat statBuf;
-    char* delFileName; 
-    char ifname[MAX_PATH_LEN + 1]; /* input file name */
-    char ofname[MAX_PATH_LEN + 1]; /* output file name */
-
-    if (argc==1)
-        usage(gunzip_usage);
-    
-    if (strcmp(*argv, "zcat")==0)
-        to_stdout = 1;
-
-    /* Parse any options */
-    while (--argc > 0 && **(++argv) == '-') {
-        if (*((*argv)+1) == '\0') {
-            fromstdin = 1;
-            to_stdout = 1;
-        }
-        while (*(++(*argv))) {
-            switch (**argv) {
-            case 'c':
+        int file_count;                         /* number of files to precess */
+        int to_stdout = 0;
+        int fromstdin = 0;
+        int result;
+        int inFileNum;
+        int outFileNum;
+        int delInputFile = 0;
+        struct stat statBuf;
+        char *delFileName;
+        char ifname[MAX_PATH_LEN + 1];  /* input file name */
+        char ofname[MAX_PATH_LEN + 1];  /* output file name */
+
+        if (argc == 1)
+                usage(gunzip_usage);
+
+        if (strcmp(*argv, "zcat") == 0)
                 to_stdout = 1;
-                break;
-            case 't':
-                test_mode = 1;
-                break;
 
-            default:
-                usage(gunzip_usage);
-            }
+        /* Parse any options */
+        while (--argc > 0 && **(++argv) == '-') {
+                if (*((*argv) + 1) == '\0') {
+                        fromstdin = 1;
+                        to_stdout = 1;
+                }
+                while (*(++(*argv))) {
+                        switch (**argv) {
+                        case 'c':
+                                to_stdout = 1;
+                                break;
+                        case 't':
+                                test_mode = 1;
+                                break;
+
+                        default:
+                                usage(gunzip_usage);
+                        }
+                }
         }
-    }
 
-    foreground = signal(SIGINT, SIG_IGN) != SIG_IGN;
-    if (foreground) {
-        (void) signal (SIGINT, (sig_type)abort_gzip);
-    }
+        foreground = signal(SIGINT, SIG_IGN) != SIG_IGN;
+        if (foreground) {
+                (void) signal(SIGINT, (sig_type) abort_gzip);
+        }
 #ifdef SIGTERM
-    if (signal(SIGTERM, SIG_IGN) != SIG_IGN) {
-        (void) signal(SIGTERM, (sig_type)abort_gzip);
-    }
+        if (signal(SIGTERM, SIG_IGN) != SIG_IGN) {
+                (void) signal(SIGTERM, (sig_type) abort_gzip);
+        }
 #endif
 #ifdef SIGHUP
-    if (signal(SIGHUP, SIG_IGN) != SIG_IGN) {
-        (void) signal(SIGHUP,  (sig_type)abort_gzip);
-    }
+        if (signal(SIGHUP, SIG_IGN) != SIG_IGN) {
+                (void) signal(SIGHUP, (sig_type) abort_gzip);
+        }
 #endif
 
-    file_count = argc - optind;
+        file_count = argc - optind;
 
-    /* Allocate all global buffers (for DYN_ALLOC option) */
-    ALLOC(uch, inbuf,  INBUFSIZ +INBUF_EXTRA);
-    ALLOC(uch, outbuf, OUTBUFSIZ+OUTBUF_EXTRA);
-    ALLOC(ush, d_buf,  DIST_BUFSIZE);
-    ALLOC(uch, window, 2L*WSIZE);
+        /* Allocate all global buffers (for DYN_ALLOC option) */
+        ALLOC(uch, inbuf, INBUFSIZ + INBUF_EXTRA);
+        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);
+        ALLOC(ush, tab_prefix, 1L << BITS);
 #else
-    ALLOC(ush, tab_prefix0, 1L<<(BITS-1));
-    ALLOC(ush, tab_prefix1, 1L<<(BITS-1));
+        ALLOC(ush, tab_prefix0, 1L << (BITS - 1));
+        ALLOC(ush, tab_prefix1, 1L << (BITS - 1));
 #endif
 
-    if (fromstdin==1) {
-        strcpy(ofname, "stdin");
-
-        inFileNum=fileno(stdin);
-        ifile_size = -1L; /* convention for unknown size */
-    } else {
-        /* Open up the input file */
-        if (*argv=='\0')
-            usage(gunzip_usage);
-        if (strlen(*argv) > MAX_PATH_LEN) {
-            fprintf(stderr, name_too_long, "gunzip");
-            do_exit(WARNING);
-        }
-        strcpy(ifname, *argv);
+        if (fromstdin == 1) {
+                strcpy(ofname, "stdin");
 
-        /* Open input fille */
-        inFileNum=open( ifname, O_RDONLY);
-        if (inFileNum < 0) {
-            perror(ifname);
-            do_exit(WARNING);
-        }
-        /* Get the time stamp on the input file. */
-        result = stat(ifname, &statBuf);
-        if (result < 0) {
-            perror(ifname);
-            do_exit(WARNING);
-        }
-        ifile_size = statBuf.st_size;
-    }
-
-    if (to_stdout==1) {
-        /* And get to work */
-        strcpy(ofname, "stdout");
-        outFileNum=fileno(stdout);
-
-        clear_bufs(); /* clear input and output buffers */
-        part_nb = 0;
-
-        /* Actually do the compression/decompression. */
-        unzip(inFileNum, outFileNum);
-
-    } else if (test_mode) {
-        /* Actually do the compression/decompression. */
-        unzip(inFileNum, 2);
-    } else {
-        char* pos;
-
-        /* And get to work */
-        if (strlen(ifname) > MAX_PATH_LEN - 4) {
-            fprintf(stderr, name_too_long, "gunzip");
-            do_exit(WARNING);
-        }
-        strcpy(ofname, ifname);
-        pos=strstr(ofname, ".gz");
-        if (pos != NULL) {
-            *pos='\0';
-            delInputFile=1;
+                inFileNum = fileno(stdin);
+                ifile_size = -1L;               /* convention for unknown size */
         } else {
-            pos=strstr(ofname, ".tgz");
-            if (pos != NULL) {
-                *pos='\0';
-                strcat( pos, ".tar");
-                delInputFile=1;
-            }
+                /* Open up the input file */
+                if (*argv == '\0')
+                        usage(gunzip_usage);
+                if (strlen(*argv) > MAX_PATH_LEN) {
+                        fprintf(stderr, name_too_long, "gunzip");
+                        do_exit(WARNING);
+                }
+                strcpy(ifname, *argv);
+
+                /* Open input fille */
+                inFileNum = open(ifname, O_RDONLY);
+                if (inFileNum < 0) {
+                        perror(ifname);
+                        do_exit(WARNING);
+                }
+                /* Get the time stamp on the input file. */
+                result = stat(ifname, &statBuf);
+                if (result < 0) {
+                        perror(ifname);
+                        do_exit(WARNING);
+                }
+                ifile_size = statBuf.st_size;
         }
 
-        /* Open output fille */
+        if (to_stdout == 1) {
+                /* And get to work */
+                strcpy(ofname, "stdout");
+                outFileNum = fileno(stdout);
+
+                clear_bufs();                   /* clear input and output buffers */
+                part_nb = 0;
+
+                /* Actually do the compression/decompression. */
+                unzip(inFileNum, outFileNum);
+
+        } else if (test_mode) {
+                /* Actually do the compression/decompression. */
+                unzip(inFileNum, 2);
+        } else {
+                char *pos;
+
+                /* And get to work */
+                if (strlen(ifname) > MAX_PATH_LEN - 4) {
+                        fprintf(stderr, name_too_long, "gunzip");
+                        do_exit(WARNING);
+                }
+                strcpy(ofname, ifname);
+                pos = strstr(ofname, ".gz");
+                if (pos != NULL) {
+                        *pos = '\0';
+                        delInputFile = 1;
+                } else {
+                        pos = strstr(ofname, ".tgz");
+                        if (pos != NULL) {
+                                *pos = '\0';
+                                strcat(pos, ".tar");
+                                delInputFile = 1;
+                        }
+                }
+
+                /* Open output fille */
 #if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)
-        outFileNum=open( ofname, O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW);
+                outFileNum = open(ofname, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW);
 #else
-        outFileNum=open( ofname, O_RDWR|O_CREAT|O_EXCL);
+                outFileNum = open(ofname, O_RDWR | O_CREAT | O_EXCL);
 #endif
-        if (outFileNum < 0) {
-            perror(ofname);
-            do_exit(WARNING);
-        }
-        /* 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=unzip(inFileNum, outFileNum);
-        
-        close( outFileNum);
-        close( inFileNum);
-        /* Delete the original file */
-        if (result == OK)
-            delFileName=ifname;
-        else
-            delFileName=ofname;
-
-        if (delInputFile == 1 && unlink (delFileName) < 0) {
-            perror (delFileName);
-            exit( FALSE);
+                if (outFileNum < 0) {
+                        perror(ofname);
+                        do_exit(WARNING);
+                }
+                /* 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 = unzip(inFileNum, outFileNum);
+
+                close(outFileNum);
+                close(inFileNum);
+                /* Delete the original file */
+                if (result == OK)
+                        delFileName = ifname;
+                else
+                        delFileName = ofname;
+
+                if (delInputFile == 1 && unlink(delFileName) < 0) {
+                        perror(delFileName);
+                        exit(FALSE);
+                }
         }
-    }
-    do_exit(exit_code);
+        do_exit(exit_code);
 }
 
 
@@ -877,71 +878,76 @@ int gunzip_main (int argc, char** argv)
  *   If the member is a zip file, it must be the only one.
  */
 local int get_method(in)
-    int in;        /* input file descriptor */
+int in;                                                 /* input file descriptor */
 {
-    uch flags;     /* compression flags */
-    char magic[2]; /* magic header */
-
-    magic[0] = (char)get_byte();
-    magic[1] = (char)get_byte();
-    method = -1;                 /* unknown yet */
-    part_nb++;                   /* number of parts in gzip file */
-    header_bytes = 0;
-    last_member = RECORD_IO;
-    /* assume multiple members in gzip file except for record oriented I/O */
-
-    if (memcmp(magic, GZIP_MAGIC, 2) == 0) {
-
-        method = (int)get_byte();
-        if (method != DEFLATED) {
-            fprintf(stderr,
-                    "unknown method %d -- get newer version of gzip\n",
-                    method);
-            exit_code = ERROR;
-            return -1;
-        }
-        flags  = (uch)get_byte();
-
-        (ulg)get_byte(); /* Ignore time stamp */
-        (ulg)get_byte();
-        (ulg)get_byte();
-        (ulg)get_byte();
+        uch flags;                                      /* compression flags */
+        char magic[2];                          /* magic header */
+
+        magic[0] = (char) get_byte();
+        magic[1] = (char) get_byte();
+        method = -1;                            /* unknown yet */
+        part_nb++;                                      /* number of parts in gzip file */
+        header_bytes = 0;
+        last_member = RECORD_IO;
+        /* assume multiple members in gzip file except for record oriented I/O */
+
+        if (memcmp(magic, GZIP_MAGIC, 2) == 0) {
+
+                method = (int) get_byte();
+                if (method != DEFLATED) {
+                        fprintf(stderr,
+                                        "unknown method %d -- get newer version of gzip\n",
+                                        method);
+                        exit_code = ERROR;
+                        return -1;
+                }
+                flags = (uch) get_byte();
+
+                (ulg) get_byte();               /* Ignore time stamp */
+                (ulg) get_byte();
+                (ulg) get_byte();
+                (ulg) get_byte();
+
+                (void) get_byte();              /* Ignore extra flags for the moment */
+                (void) get_byte();              /* Ignore OS type for the moment */
+
+                if ((flags & EXTRA_FIELD) != 0) {
+                        unsigned len = (unsigned) get_byte();
+
+                        len |= ((unsigned) get_byte()) << 8;
+
+                        while (len--)
+                                (void) get_byte();
+                }
+
+                /* Discard original name if any */
+                if ((flags & ORIG_NAME) != 0) {
+                        while (get_char() != 0) /* null */
+                                ;
+                }
+
+                /* Discard file comment if any */
+                if ((flags & COMMENT) != 0) {
+                        while (get_char() != 0) /* null */
+                                ;
+                }
+                if (part_nb == 1) {
+                        header_bytes = inptr + 2 * sizeof(long);        /* include crc and size */
+                }
 
-        (void)get_byte();  /* Ignore extra flags for the moment */
-        (void)get_byte();  /* Ignore OS type for the moment */
-
-        if ((flags & EXTRA_FIELD) != 0) {
-            unsigned len = (unsigned)get_byte();
-            len |= ((unsigned)get_byte())<<8;
-
-            while (len--) (void)get_byte();
         }
 
-        /* Discard original name if any */
-        if ((flags & ORIG_NAME) != 0) {
-            while (get_char() != 0) /* null */ ;
-        }
+        if (method >= 0)
+                return method;
 
-        /* Discard file comment if any */
-        if ((flags & COMMENT) != 0) {
-            while (get_char() != 0) /* null */ ;
-        }
         if (part_nb == 1) {
-            header_bytes = inptr + 2*sizeof(long); /* include crc and size */
+                fprintf(stderr, "\nnot in gzip format\n");
+                exit_code = ERROR;
+                return -1;
+        } else {
+                WARN((stderr, "\ndecompression OK, trailing garbage ignored\n"));
+                return -2;
         }
-
-    }
-
-    if (method >= 0) return method;
-
-    if (part_nb == 1) {
-        fprintf(stderr, "\nnot in gzip format\n");
-        exit_code = ERROR;
-        return -1;
-    } else {
-        WARN((stderr, "\ndecompression OK, trailing garbage ignored\n"));
-        return -2;
-    }
 }
 
 /* ========================================================================
@@ -949,8 +955,9 @@ local int get_method(in)
  */
 RETSIGTYPE abort_gzip()
 {
-   do_exit(ERROR);
+        do_exit(ERROR);
 }
+
 /* unzip.c -- decompress files in 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
@@ -973,35 +980,35 @@ RETSIGTYPE abort_gzip()
  */
 
 #ifdef CRYPT
-#  undef CRYPT      /* dummy version */
+#  undef CRYPT                                  /* dummy version */
 #endif
 
-#define RAND_HEAD_LEN  12  /* length of encryption random header */
+#define RAND_HEAD_LEN  12               /* length of encryption random header */
 
 #define zencode
 #define zdecode
 
 /* PKZIP header definitions */
-#define LOCSIG 0x04034b50L      /* four-byte lead-in (lsb first) */
-#define LOCFLG 6                /* offset of bit flag */
-#define  CRPFLG 1               /*  bit for encrypted entry */
-#define  EXTFLG 8               /*  bit for extended local header */
-#define LOCHOW 8                /* offset of compression method */
-#define LOCTIM 10               /* file mod time (for decryption) */
-#define LOCCRC 14               /* offset of crc */
-#define LOCSIZ 18               /* offset of compressed size */
-#define LOCLEN 22               /* offset of uncompressed length */
-#define LOCFIL 26               /* offset of file name field length */
-#define LOCEXT 28               /* offset of extra field length */
-#define LOCHDR 30               /* size of local header, including sig */
-#define EXTHDR 16               /* size of extended local header, inc sig */
+#define LOCSIG 0x04034b50L              /* four-byte lead-in (lsb first) */
+#define LOCFLG 6                                /* offset of bit flag */
+#define  CRPFLG 1                               /*  bit for encrypted entry */
+#define  EXTFLG 8                               /*  bit for extended local header */
+#define LOCHOW 8                                /* offset of compression method */
+#define LOCTIM 10                               /* file mod time (for decryption) */
+#define LOCCRC 14                               /* offset of crc */
+#define LOCSIZ 18                               /* offset of compressed size */
+#define LOCLEN 22                               /* offset of uncompressed length */
+#define LOCFIL 26                               /* offset of file name field length */
+#define LOCEXT 28                               /* offset of extra field length */
+#define LOCHDR 30                               /* size of local header, including sig */
+#define EXTHDR 16                               /* size of extended local header, inc sig */
 
 
 /* Globals */
 
-char *key;          /* not used--needed to link crypt.c */
-int pkzip = 0;      /* set for a pkzip file */
-int ext_header = 0; /* set if extended local header */
+char *key;                                              /* not used--needed to link crypt.c */
+int pkzip = 0;                                  /* set for a pkzip file */
+int ext_header = 0;                             /* set if extended local header */
 
 /* ===========================================================================
  * Unzip in to out.  This routine works on both gzip and pkzip files.
@@ -1011,81 +1018,82 @@ int ext_header = 0; /* set if extended local header */
  *   The magic header has already been checked. The output buffer is cleared.
  */
 int unzip(in, out)
-    int in, out;   /* input and output file descriptors */
+int in, out;                                    /* input and output file descriptors */
 {
-    ulg orig_crc = 0;       /* original crc */
-    ulg orig_len = 0;       /* original uncompressed length */
-    int n;
-    uch buf[EXTHDR];        /* extended local header */
-
-    ifd = in;
-    ofd = out;
-    method = get_method(ifd);
-    if (method < 0) {
-      do_exit(exit_code); /* error message already emitted */
-    }
-
-    updcrc(NULL, 0);           /* initialize crc */
-
-    if (pkzip && !ext_header) {  /* crc and length at the end otherwise */
-        orig_crc = LG(inbuf + LOCCRC);
-        orig_len = LG(inbuf + LOCLEN);
-    }
-
-    /* Decompress */
-    if (method == DEFLATED)  {
-
-        int res = inflate();
-
-        if (res == 3) {
-            error("out of memory");
-        } else if (res != 0) {
-            error("invalid compressed data--format violated");
+        ulg orig_crc = 0;                       /* original crc */
+        ulg orig_len = 0;                       /* original uncompressed length */
+        int n;
+        uch buf[EXTHDR];                        /* extended local header */
+
+        ifd = in;
+        ofd = out;
+        method = get_method(ifd);
+        if (method < 0) {
+                do_exit(exit_code);             /* error message already emitted */
         }
 
-    } else {
-        error("internal error, invalid method");
-    }
-
-    /* Get the crc and original length */
-    if (!pkzip) {
-        /* crc32  (see algorithm.doc)
-         * uncompressed input size modulo 2^32
-         */
-        for (n = 0; n < 8; n++) {
-            buf[n] = (uch)get_byte(); /* may cause an error if EOF */
+        updcrc(NULL, 0);                        /* initialize crc */
+
+        if (pkzip && !ext_header) {     /* crc and length at the end otherwise */
+                orig_crc = LG(inbuf + LOCCRC);
+                orig_len = LG(inbuf + LOCLEN);
         }
-        orig_crc = LG(buf);
-        orig_len = LG(buf+4);
-
-    } else if (ext_header) {  /* If extended header, check it */
-        /* signature - 4bytes: 0x50 0x4b 0x07 0x08
-         * CRC-32 value
-         * compressed size 4-bytes
-         * uncompressed size 4-bytes
-         */
-        for (n = 0; n < EXTHDR; n++) {
-            buf[n] = (uch)get_byte(); /* may cause an error if EOF */
+
+        /* Decompress */
+        if (method == DEFLATED) {
+
+                int res = inflate();
+
+                if (res == 3) {
+                        error("out of memory");
+                } else if (res != 0) {
+                        error("invalid compressed data--format violated");
+                }
+
+        } else {
+                error("internal error, invalid method");
+        }
+
+        /* Get the crc and original length */
+        if (!pkzip) {
+                /* crc32  (see algorithm.doc)
+                   * uncompressed input size modulo 2^32
+                 */
+                for (n = 0; n < 8; n++) {
+                        buf[n] = (uch) get_byte();      /* may cause an error if EOF */
+                }
+                orig_crc = LG(buf);
+                orig_len = LG(buf + 4);
+
+        } else if (ext_header) {        /* If extended header, check it */
+                /* signature - 4bytes: 0x50 0x4b 0x07 0x08
+                 * CRC-32 value
+                 * compressed size 4-bytes
+                 * uncompressed size 4-bytes
+                 */
+                for (n = 0; n < EXTHDR; n++) {
+                        buf[n] = (uch) get_byte();      /* may cause an error if EOF */
+                }
+                orig_crc = LG(buf + 4);
+                orig_len = LG(buf + 12);
+        }
+
+        /* Validate decompression */
+        if (orig_crc != updcrc(outbuf, 0)) {
+                error("invalid compressed data--crc error");
         }
-        orig_crc = LG(buf+4);
-        orig_len = LG(buf+12);
-    }
-
-    /* Validate decompression */
-    if (orig_crc != updcrc(outbuf, 0)) {
-        error("invalid compressed data--crc error");
-    }
-    if (orig_len != (ulg)bytes_out) {
-        error("invalid compressed data--length error");
-    }
-
-    /* Check if there are more entries in a pkzip file */
-    if (pkzip && inptr + 4 < insize && LG(inbuf+inptr) == LOCSIG) {
-      WARN((stderr,"has more than one entry--rest ignored\n"));
-    }
-    ext_header = pkzip = 0; /* for next file */
-    return OK;
+        if (orig_len != (ulg) bytes_out) {
+                error("invalid compressed data--length error");
+        }
+
+        /* Check if there are more entries in a pkzip file */
+        if (pkzip && inptr + 4 < insize && LG(inbuf + inptr) == LOCSIG) {
+                WARN((stderr, "has more than one entry--rest ignored\n"));
+        }
+        ext_header = pkzip = 0;         /* for next file */
+        return OK;
 }
+
 /* util.c -- utility functions for gzip support
  * Copyright (C) 1992-1993 Jean-loup Gailly
  * This is free software; you can redistribute it and/or modify it under the
@@ -1106,10 +1114,10 @@ int unzip(in, out)
 #if defined(STDC_HEADERS) || !defined(NO_STDLIB_H)
 #  include <stdlib.h>
 #else
-   extern int errno;
+extern int errno;
 #endif
 
-static const ulg crc_32_tab[];   /* crc table, defined below */
+static const ulg crc_32_tab[];  /* crc table, defined below */
 
 /* ===========================================================================
  * Run a set of bytes through the crc shift register.  If s is a NULL
@@ -1117,23 +1125,24 @@ static const ulg crc_32_tab[];   /* crc table, defined below */
  * Return the current crc in either case.
  */
 ulg updcrc(s, n)
-    uch *s;                 /* pointer to bytes to pump through */
-    unsigned n;             /* number of bytes in s[] */
+uch *s;                                                 /* pointer to bytes to pump through */
+unsigned n;                                             /* number of bytes in s[] */
 {
-    register ulg c;         /* temporary variable */
-
-    static ulg crc = (ulg)0xffffffffL; /* shift register contents */
-
-    if (s == NULL) {
-        c = 0xffffffffL;
-    } else {
-        c = crc;
-        if (n) do {
-            c = crc_32_tab[((int)c ^ (*s++)) & 0xff] ^ (c >> 8);
-        } while (--n);
-    }
-    crc = c;
-    return c ^ 0xffffffffL;       /* (instead of ~c for 64-bit machines) */
+        register ulg c;                         /* temporary variable */
+
+        static ulg crc = (ulg) 0xffffffffL;     /* shift register contents */
+
+        if (s == NULL) {
+                c = 0xffffffffL;
+        } else {
+                c = crc;
+                if (n)
+                        do {
+                                c = crc_32_tab[((int) c ^ (*s++)) & 0xff] ^ (c >> 8);
+                        } while (--n);
+        }
+        crc = c;
+        return c ^ 0xffffffffL;         /* (instead of ~c for 64-bit machines) */
 }
 
 /* ===========================================================================
@@ -1141,35 +1150,37 @@ ulg updcrc(s, n)
  */
 void clear_bufs()
 {
-    outcnt = 0;
-    insize = inptr = 0;
-    bytes_in = bytes_out = 0L;
+        outcnt = 0;
+        insize = inptr = 0;
+        bytes_in = bytes_out = 0L;
 }
 
 /* ===========================================================================
  * Fill the input buffer. This is called only when the buffer is empty.
  */
 int fill_inbuf(eof_ok)
-    int eof_ok;          /* set if EOF acceptable as a result */
+int eof_ok;                                             /* set if EOF acceptable as a result */
 {
-    int len;
-
-    /* Read as much as possible */
-    insize = 0;
-    errno = 0;
-    do {
-        len = read(ifd, (char*)inbuf+insize, INBUFSIZ-insize);
-        if (len == 0 || len == EOF) break;
-        insize += len;
-    } while (insize < INBUFSIZ);
-
-    if (insize == 0) {
-        if (eof_ok) return EOF;
-        read_error();
-    }
-    bytes_in += (ulg)insize;
-    inptr = 1;
-    return inbuf[0];
+        int len;
+
+        /* Read as much as possible */
+        insize = 0;
+        errno = 0;
+        do {
+                len = read(ifd, (char *) inbuf + insize, INBUFSIZ - insize);
+                if (len == 0 || len == EOF)
+                        break;
+                insize += len;
+        } while (insize < INBUFSIZ);
+
+        if (insize == 0) {
+                if (eof_ok)
+                        return EOF;
+                read_error();
+        }
+        bytes_in += (ulg) insize;
+        inptr = 1;
+        return inbuf[0];
 }
 
 /* ===========================================================================
@@ -1178,12 +1189,13 @@ int fill_inbuf(eof_ok)
  */
 void flush_outbuf()
 {
-    if (outcnt == 0) return;
+        if (outcnt == 0)
+                return;
 
-    if (!test_mode)
-        write_buf(ofd, (char *)outbuf, outcnt);
-    bytes_out += (ulg)outcnt;
-    outcnt = 0;
+        if (!test_mode)
+                write_buf(ofd, (char *) outbuf, outcnt);
+        bytes_out += (ulg) outcnt;
+        outcnt = 0;
 }
 
 /* ===========================================================================
@@ -1192,13 +1204,14 @@ void flush_outbuf()
  */
 void flush_window()
 {
-    if (outcnt == 0) return;
-    updcrc(window, outcnt);
-
-    if (!test_mode)
-        write_buf(ofd, (char *)window, outcnt);
-    bytes_out += (ulg)outcnt;
-    outcnt = 0;
+        if (outcnt == 0)
+                return;
+        updcrc(window, outcnt);
+
+        if (!test_mode)
+                write_buf(ofd, (char *) window, outcnt);
+        bytes_out += (ulg) outcnt;
+        outcnt = 0;
 }
 
 /* ===========================================================================
@@ -1206,19 +1219,19 @@ void flush_window()
  * for error return.
  */
 void write_buf(fd, buf, cnt)
-    int       fd;
-    voidp     buf;
-    unsigned  cnt;
+int fd;
+voidp buf;
+unsigned cnt;
 {
-    unsigned  n;
-
-    while ((n = write(fd, buf, cnt)) != cnt) {
-        if (n == (unsigned)(-1)) {
-            write_error();
+        unsigned n;
+
+        while ((n = write(fd, buf, cnt)) != cnt) {
+                if (n == (unsigned) (-1)) {
+                        write_error();
+                }
+                cnt -= n;
+                buf = (voidp) ((char *) buf + n);
         }
-        cnt -= n;
-        buf = (voidp)((char*)buf+n);
-    }
 }
 
 #if defined(NO_STRING_H) && !defined(STDC_HEADERS)
@@ -1229,7 +1242,7 @@ void write_buf(fd, buf, cnt)
 #    define const
 #  endif
 
-int strspn  OF((const char *s, const char *accept));
+int strspn OF((const char *s, const char *accept));
 int strcspn OF((const char *s, const char *reject));
 
 /* ========================================================================
@@ -1237,21 +1250,23 @@ int strcspn OF((const char *s, const char *reject));
  * of s which contains only characters in accept.
  */
 int strspn(s, accept)
-    const char *s;
-    const char *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;
+        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;
         }
-        if (*a == '\0') return count;
-        ++count;
-    }
-    return count;
+        return count;
 }
 
 /* ========================================================================
@@ -1259,46 +1274,47 @@ int strspn(s, accept)
  * which contains no characters from reject.
  */
 int strcspn(s, reject)
-    const char *s;
-    const char *reject;
+const char *s;
+const char *reject;
 {
-    register int count = 0;
+        register int count = 0;
 
-    while (*s != '\0') {
-        if (strchr(reject, *s++) != NULL) return count;
-        ++count;
-    }
-    return count;
+        while (*s != '\0') {
+                if (strchr(reject, *s++) != NULL)
+                        return count;
+                ++count;
+        }
+        return count;
 }
 
-#endif /* NO_STRING_H */
+#endif                                                  /* NO_STRING_H */
 
 
 /* ========================================================================
  * Error handlers.
  */
 void warn(a, b)
-    char *a, *b;            /* message strings juxtaposed in output */
+char *a, *b;                                    /* message strings juxtaposed in output */
 {
-    WARN((stderr, "warning: %s%s\n", a, b));
+        WARN((stderr, "warning: %s%s\n", a, b));
 }
 
 void read_error()
 {
-    fprintf(stderr, "\n");
-    if (errno != 0) {
-        perror("");
-    } else {
-        fprintf(stderr, "unexpected end of file\n");
-    }
-    abort_gzip();
+        fprintf(stderr, "\n");
+        if (errno != 0) {
+                perror("");
+        } else {
+                fprintf(stderr, "unexpected end of file\n");
+        }
+        abort_gzip();
 }
 
 void write_error()
 {
-    fprintf(stderr, "\n");
-    perror("");
-    abort_gzip();
+        fprintf(stderr, "\n");
+        perror("");
+        abort_gzip();
 }
 
 
@@ -1306,59 +1322,60 @@ void write_error()
  * Table of CRC-32's of all single-byte values (made by makecrc.c)
  */
 static const ulg crc_32_tab[] = {
-  0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
-  0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
-  0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
-  0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
-  0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
-  0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
-  0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
-  0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
-  0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
-  0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
-  0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
-  0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
-  0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
-  0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
-  0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
-  0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
-  0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
-  0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
-  0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
-  0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
-  0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
-  0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
-  0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
-  0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
-  0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
-  0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
-  0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
-  0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
-  0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
-  0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
-  0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
-  0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
-  0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
-  0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
-  0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
-  0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
-  0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
-  0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
-  0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
-  0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
-  0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
-  0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
-  0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
-  0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
-  0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
-  0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
-  0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
-  0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
-  0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
-  0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
-  0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
-  0x2d02ef8dL
+        0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
+        0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
+        0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
+        0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
+        0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
+        0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
+        0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
+        0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
+        0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
+        0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
+        0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
+        0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
+        0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
+        0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
+        0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
+        0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
+        0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
+        0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
+        0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
+        0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
+        0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
+        0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
+        0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
+        0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
+        0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
+        0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
+        0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
+        0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
+        0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
+        0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
+        0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
+        0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
+        0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
+        0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
+        0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
+        0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
+        0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
+        0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
+        0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
+        0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
+        0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
+        0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
+        0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
+        0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
+        0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
+        0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
+        0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
+        0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
+        0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
+        0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
+        0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
+        0x2d02ef8dL
 };
+
 /* inflate.c -- Not copyrighted 1992 by Mark Adler
    version c10p1, 10 January 1993 */
 
@@ -1474,18 +1491,18 @@ static const ulg crc_32_tab[] = {
    an unused code.  If a code with e == 99 is looked up, this implies an
    error in the data. */
 struct huft {
-  uch e;                /* number of extra bits or operation */
-  uch b;                /* number of bits in this code or subcode */
-  union {
-    ush n;              /* literal, length base, or distance base */
-    struct huft *t;     /* pointer to next level of table */
-  } v;
+        uch e;                                          /* number of extra bits or operation */
+        uch b;                                          /* number of bits in this code or subcode */
+        union {
+                ush n;                                  /* literal, length base, or distance base */
+                struct huft *t;                 /* pointer to next level of table */
+        } v;
 };
 
 
 /* Function prototypes */
 int huft_build OF((unsigned *, unsigned, unsigned, ush *, ush *,
-                   struct huft **, int *));
+                                   struct huft **, int *));
 int huft_free OF((struct huft *));
 int inflate_codes OF((struct huft *, struct huft *, int, int));
 int inflate_stored OF((void));
@@ -1508,23 +1525,29 @@ int inflate OF((void));
 #define flush_output(w) (wp=(w),flush_window())
 
 /* Tables for deflate from PKZIP's appnote.txt. */
-static unsigned border[] = {    /* Order of the bit length code lengths */
-        16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-static ush cplens[] = {         /* Copy lengths for literal codes 257..285 */
-        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
-        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
-        /* note: see note #13 above about the 258 in this list. */
-static ush cplext[] = {         /* Extra bits for literal codes 257..285 */
-        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, 99, 99}; /* 99==invalid */
-static ush cpdist[] = {         /* Copy offsets for distance codes 0..29 */
-        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
-        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
-        8193, 12289, 16385, 24577};
-static ush cpdext[] = {         /* Extra bits for distance 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};
+static unsigned border[] = {    /* Order of the bit length code lengths */
+        16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
+};
+static ush cplens[] = {                 /* Copy lengths for literal codes 257..285 */
+        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
+        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0
+};
+
+                /* note: see note #13 above about the 258 in this list. */
+static ush cplext[] = {                 /* Extra bits for literal codes 257..285 */
+        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, 99, 99
+};                                                              /* 99==invalid */
+static ush cpdist[] = {                 /* Copy offsets for distance codes 0..29 */
+        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
+        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
+        8193, 12289, 16385, 24577
+};
+static ush cpdext[] = {                 /* Extra bits for distance 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
+};
 
 
 
@@ -1558,17 +1581,18 @@ static ush cpdext[] = {         /* Extra bits for distance codes */
    the stream.
  */
 
-ulg bb;                         /* bit buffer */
-unsigned bk;                    /* bits in bit buffer */
+ulg bb;                                                 /* bit buffer */
+unsigned bk;                                    /* bits in bit buffer */
 
 ush mask_bits[] = {
-    0x0000,
-    0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff,
-    0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff
+        0x0000,
+        0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff,
+        0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff
 };
 
 #ifdef CRYPT
-  uch cc;
+uch cc;
+
 #  define NEXTBYTE() (cc = get_byte(), zdecode(cc), cc)
 #else
 #  define NEXTBYTE()  (uch)get_byte()
@@ -1610,342 +1634,342 @@ ush mask_bits[] = {
  */
 
 
-int lbits = 9;          /* bits in base literal/length lookup table */
-int dbits = 6;          /* bits in base distance lookup table */
+int lbits = 9;                                  /* bits in base literal/length lookup table */
+int dbits = 6;                                  /* bits in base distance lookup table */
 
 
 /* If BMAX needs to be larger than 16, then h and x[] should be ulg. */
-#define BMAX 16         /* maximum bit length of any code (16 for explode) */
-#define N_MAX 288       /* maximum number of codes in any set */
+#define BMAX 16                                 /* maximum bit length of any code (16 for explode) */
+#define N_MAX 288                               /* maximum number of codes in any set */
 
 
-unsigned hufts;         /* track memory usage */
+unsigned hufts;                                 /* track memory usage */
 
 
 int huft_build(b, n, s, d, e, t, m)
-unsigned *b;            /* code lengths in bits (all assumed <= BMAX) */
-unsigned n;             /* number of codes (assumed <= N_MAX) */
-unsigned s;             /* number of simple-valued codes (0..s-1) */
-ush *d;                 /* list of base values for non-simple codes */
-ush *e;                 /* list of extra bits for non-simple codes */
-struct huft **t;        /* result: starting table */
-int *m;                 /* maximum lookup bits, returns actual */
+unsigned *b;                                    /* code lengths in bits (all assumed <= BMAX) */
+unsigned n;                                             /* number of codes (assumed <= N_MAX) */
+unsigned s;                                             /* number of simple-valued codes (0..s-1) */
+ush *d;                                                 /* list of base values for non-simple codes */
+ush *e;                                                 /* list of extra bits for non-simple codes */
+struct huft **t;                                /* result: starting table */
+int *m;                                                 /* maximum lookup bits, returns actual */
+
 /* Given a list of code lengths and a maximum table size, make a set of
    tables to decode that set of codes.  Return zero on success, one if
    the given code set is incomplete (the tables are still built in this
    case), two if the input is invalid (all zero length codes or an
    oversubscribed set of lengths), and three if not enough memory. */
 {
-  unsigned a;                   /* counter for codes of length k */
-  unsigned c[BMAX+1];           /* bit length count table */
-  unsigned f;                   /* i repeats in table every f entries */
-  int g;                        /* maximum code length */
-  int h;                        /* table level */
-  register unsigned i;          /* counter, current code */
-  register unsigned j;          /* counter */
-  register int k;               /* number of bits in current code */
-  int l;                        /* bits per table (returned in m) */
-  register unsigned *p;         /* pointer into c[], b[], or v[] */
-  register struct huft *q;      /* points to current table */
-  struct huft r;                /* table entry for structure assignment */
-  struct huft *u[BMAX];         /* table stack */
-  unsigned v[N_MAX];            /* values in order of bit length */
-  register int w;               /* bits before this table == (l * h) */
-  unsigned x[BMAX+1];           /* bit offsets, then code stack */
-  unsigned *xp;                 /* pointer into x */
-  int y;                        /* number of dummy codes added */
-  unsigned z;                   /* number of entries in current table */
-
-
-  /* Generate counts for each bit length */
-  memzero(c, sizeof(c));
-  p = b;  i = n;
-  do {
-    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) */
-  } while (--i);
-  if (c[0] == n)                /* null input--all zero length codes */
-  {
-    *t = (struct huft *)NULL;
-    *m = 0;
-    return 0;
-  }
-
-
-  /* Find minimum and maximum length, bound *m by those */
-  l = *m;
-  for (j = 1; j <= BMAX; j++)
-    if (c[j])
-      break;
-  k = j;                        /* minimum code length */
-  if ((unsigned)l < j)
-    l = j;
-  for (i = BMAX; i; i--)
-    if (c[i])
-      break;
-  g = i;                        /* maximum code length */
-  if ((unsigned)l > i)
-    l = i;
-  *m = l;
-
-
-  /* Adjust last length count to fill out codes, if needed */
-  for (y = 1 << j; j < i; j++, y <<= 1)
-    if ((y -= c[j]) < 0)
-      return 2;                 /* bad input: more codes than bits */
-  if ((y -= c[i]) < 0)
-    return 2;
-  c[i] += y;
-
-
-  /* Generate starting offsets into the value table for each length */
-  x[1] = j = 0;
-  p = c + 1;  xp = x + 2;
-  while (--i) {                 /* note that i == g from above */
-    *xp++ = (j += *p++);
-  }
-
-
-  /* Make a table of values in order of bit lengths */
-  p = b;  i = 0;
-  do {
-    if ((j = *p++) != 0)
-      v[x[j]++] = i;
-  } while (++i < n);
-
-
-  /* Generate the Huffman codes and for each, make the table entries */
-  x[0] = i = 0;                 /* first Huffman code is zero */
-  p = v;                        /* grab values in bit order */
-  h = -1;                       /* no tables yet--level -1 */
-  w = -l;                       /* bits decoded == (l * h) */
-  u[0] = (struct huft *)NULL;   /* just to keep compilers happy */
-  q = (struct huft *)NULL;      /* ditto */
-  z = 0;                        /* ditto */
-
-  /* go through the bit lengths (k already is bits in shortest code) */
-  for (; k <= g; k++)
-  {
-    a = c[k];
-    while (a--)
-    {
-      /* here i is the Huffman code of length k bits for value *p */
-      /* make tables up to required level */
-      while (k > w + l)
-      {
-        h++;
-        w += l;                 /* previous table always l bits */
-
-        /* compute minimum size table less than or equal to l bits */
-        z = (z = g - w) > (unsigned)l ? l : z;  /* upper limit on table size */
-        if ((f = 1 << (j = k - w)) > a + 1)     /* try a k-w bit table */
-        {                       /* too few codes for k-w bit table */
-          f -= a + 1;           /* deduct codes from patterns left */
-          xp = c + k;
-          while (++j < z)       /* try smaller tables up to z bits */
-          {
-            if ((f <<= 1) <= *++xp)
-              break;            /* enough codes to use up j bits */
-            f -= *xp;           /* else deduct codes from patterns */
-          }
-        }
-        z = 1 << j;             /* table entries for j-bit table */
-
-        /* allocate and link in new table */
-        if ((q = (struct huft *)malloc((z + 1)*sizeof(struct huft))) ==
-            (struct huft *)NULL)
-        {
-          if (h)
-            huft_free(u[0]);
-          return 3;             /* not enough memory */
-        }
-        hufts += z + 1;         /* track memory usage */
-        *t = q + 1;             /* link to list for huft_free() */
-        *(t = &(q->v.t)) = (struct huft *)NULL;
-        u[h] = ++q;             /* table starts after link */
-
-        /* connect to last table, if there is one */
-        if (h)
-        {
-          x[h] = i;             /* save pattern for backing up */
-          r.b = (uch)l;         /* bits to dump before this table */
-          r.e = (uch)(16 + j);  /* bits in this table */
-          r.v.t = q;            /* pointer to this table */
-          j = i >> (w - l);     /* (get around Turbo C bug) */
-          u[h-1][j] = r;        /* connect to last table */
-        }
-      }
-
-      /* set up table entry in r */
-      r.b = (uch)(k - w);
-      if (p >= v + n)
-        r.e = 99;               /* out of values--invalid code */
-      else if (*p < s)
-      {
-        r.e = (uch)(*p < 256 ? 16 : 15);    /* 256 is end-of-block code */
-        r.v.n = (ush)(*p);             /* simple code is just the value */
-        p++;                           /* one compiler does not like *p++ */
-      }
-      else
-      {
-        r.e = (uch)e[*p - s];   /* non-simple--look up in lists */
-        r.v.n = d[*p++ - s];
-      }
-
-      /* fill code-like entries with r */
-      f = 1 << (k - w);
-      for (j = i >> w; j < z; j += f)
-        q[j] = r;
-
-      /* backwards increment the k-bit code i */
-      for (j = 1 << (k - 1); i & j; j >>= 1)
-        i ^= j;
-      i ^= j;
-
-      /* backup over finished tables */
-      while ((i & ((1 << w) - 1)) != x[h])
-      {
-        h--;                    /* don't need to update q */
-        w -= l;
-      }
-    }
-  }
-
-
-  /* Return true (1) if we were given an incomplete table */
-  return y != 0 && g != 1;
+        unsigned a;                                     /* counter for codes of length k */
+        unsigned c[BMAX + 1];           /* bit length count table */
+        unsigned f;                                     /* i repeats in table every f entries */
+        int g;                                          /* maximum code length */
+        int h;                                          /* table level */
+        register unsigned i;            /* counter, current code */
+        register unsigned j;            /* counter */
+        register int k;                         /* number of bits in current code */
+        int l;                                          /* bits per table (returned in m) */
+        register unsigned *p;           /* pointer into c[], b[], or v[] */
+        register struct huft *q;        /* points to current table */
+        struct huft r;                          /* table entry for structure assignment */
+        struct huft *u[BMAX];           /* table stack */
+        unsigned v[N_MAX];                      /* values in order of bit length */
+        register int w;                         /* bits before this table == (l * h) */
+        unsigned x[BMAX + 1];           /* bit offsets, then code stack */
+        unsigned *xp;                           /* pointer into x */
+        int y;                                          /* number of dummy codes added */
+        unsigned z;                                     /* number of entries in current table */
+
+
+        /* Generate counts for each bit length */
+        memzero(c, sizeof(c));
+        p = b;
+        i = n;
+        do {
+                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) */
+        } while (--i);
+        if (c[0] == n) {                        /* null input--all zero length codes */
+                *t = (struct huft *) NULL;
+                *m = 0;
+                return 0;
+        }
+
+
+        /* Find minimum and maximum length, bound *m by those */
+        l = *m;
+        for (j = 1; j <= BMAX; j++)
+                if (c[j])
+                        break;
+        k = j;                                          /* minimum code length */
+        if ((unsigned) l < j)
+                l = j;
+        for (i = BMAX; i; i--)
+                if (c[i])
+                        break;
+        g = i;                                          /* maximum code length */
+        if ((unsigned) l > i)
+                l = i;
+        *m = l;
+
+
+        /* Adjust last length count to fill out codes, if needed */
+        for (y = 1 << j; j < i; j++, y <<= 1)
+                if ((y -= c[j]) < 0)
+                        return 2;                       /* bad input: more codes than bits */
+        if ((y -= c[i]) < 0)
+                return 2;
+        c[i] += y;
+
+
+        /* Generate starting offsets into the value table for each length */
+        x[1] = j = 0;
+        p = c + 1;
+        xp = x + 2;
+        while (--i) {                           /* note that i == g from above */
+                *xp++ = (j += *p++);
+        }
+
+
+        /* Make a table of values in order of bit lengths */
+        p = b;
+        i = 0;
+        do {
+                if ((j = *p++) != 0)
+                        v[x[j]++] = i;
+        } while (++i < n);
+
+
+        /* Generate the Huffman codes and for each, make the table entries */
+        x[0] = i = 0;                           /* first Huffman code is zero */
+        p = v;                                          /* grab values in bit order */
+        h = -1;                                         /* no tables yet--level -1 */
+        w = -l;                                         /* bits decoded == (l * h) */
+        u[0] = (struct huft *) NULL;    /* just to keep compilers happy */
+        q = (struct huft *) NULL;       /* ditto */
+        z = 0;                                          /* ditto */
+
+        /* go through the bit lengths (k already is bits in shortest code) */
+        for (; k <= g; k++) {
+                a = c[k];
+                while (a--) {
+                        /* here i is the Huffman code of length k bits for value *p */
+                        /* make tables up to required level */
+                        while (k > w + l) {
+                                h++;
+                                w += l;                 /* previous table always l bits */
+
+                                /* compute minimum size table less than or equal to l bits */
+                                z = (z = g - w) > (unsigned) l ? l : z; /* upper limit on table size */
+                                if ((f = 1 << (j = k - w)) > a + 1) {   /* try a k-w bit table *//* too few codes for k-w bit table */
+                                        f -= a + 1;     /* deduct codes from patterns left */
+                                        xp = c + k;
+                                        while (++j < z) {       /* try smaller tables up to z bits */
+                                                if ((f <<= 1) <= *++xp)
+                                                        break;  /* enough codes to use up j bits */
+                                                f -= *xp;       /* else deduct codes from patterns */
+                                        }
+                                }
+                                z = 1 << j;             /* table entries for j-bit table */
+
+                                /* allocate and link in new table */
+                                if (
+                                        (q =
+                                         (struct huft *) malloc((z + 1) *
+                                                                                        sizeof(struct huft))) ==
+                                        (struct huft *) NULL) {
+                                        if (h)
+                                                huft_free(u[0]);
+                                        return 3;       /* not enough memory */
+                                }
+                                hufts += z + 1; /* track memory usage */
+                                *t = q + 1;             /* link to list for huft_free() */
+                                *(t = &(q->v.t)) = (struct huft *) NULL;
+                                u[h] = ++q;             /* table starts after link */
+
+                                /* connect to last table, if there is one */
+                                if (h) {
+                                        x[h] = i;       /* save pattern for backing up */
+                                        r.b = (uch) l;  /* bits to dump before this table */
+                                        r.e = (uch) (16 + j);   /* bits in this table */
+                                        r.v.t = q;      /* pointer to this table */
+                                        j = i >> (w - l);       /* (get around Turbo C bug) */
+                                        u[h - 1][j] = r;        /* connect to last table */
+                                }
+                        }
+
+                        /* set up table entry in r */
+                        r.b = (uch) (k - w);
+                        if (p >= v + n)
+                                r.e = 99;               /* out of values--invalid code */
+                        else if (*p < s) {
+                                r.e = (uch) (*p < 256 ? 16 : 15);       /* 256 is end-of-block code */
+                                r.v.n = (ush) (*p);     /* simple code is just the value */
+                                p++;                    /* one compiler does not like *p++ */
+                        } else {
+                                r.e = (uch) e[*p - s];  /* non-simple--look up in lists */
+                                r.v.n = d[*p++ - s];
+                        }
+
+                        /* fill code-like entries with r */
+                        f = 1 << (k - w);
+                        for (j = i >> w; j < z; j += f)
+                                q[j] = r;
+
+                        /* backwards increment the k-bit code i */
+                        for (j = 1 << (k - 1); i & j; j >>= 1)
+                                i ^= j;
+                        i ^= j;
+
+                        /* backup over finished tables */
+                        while ((i & ((1 << w) - 1)) != x[h]) {
+                                h--;                    /* don't need to update q */
+                                w -= l;
+                        }
+                }
+        }
+
+
+        /* Return true (1) if we were given an incomplete table */
+        return y != 0 && g != 1;
 }
 
 
 
 int huft_free(t)
-struct huft *t;         /* table to free */
+struct huft *t;                                 /* table to free */
+
 /* Free the malloc'ed tables built by huft_build(), which makes a linked
    list of the tables it made, with the links in a dummy first entry of
    each table. */
 {
-  register struct huft *p, *q;
-
-
-  /* Go through linked list, freeing from the malloced (t[-1]) address. */
-  p = t;
-  while (p != (struct huft *)NULL)
-  {
-    q = (--p)->v.t;
-    free((char*)p);
-    p = q;
-  } 
-  return 0;
+        register struct huft *p, *q;
+
+
+        /* Go through linked list, freeing from the malloced (t[-1]) address. */
+        p = t;
+        while (p != (struct huft *) NULL) {
+                q = (--p)->v.t;
+                free((char *) p);
+                p = q;
+        }
+        return 0;
 }
 
 
 int inflate_codes(tl, td, bl, bd)
-struct huft *tl, *td;   /* literal/length and distance decoder tables */
-int bl, bd;             /* number of bits decoded by tl[] and td[] */
+struct huft *tl, *td;                   /* literal/length and distance decoder tables */
+int bl, bd;                                             /* number of bits decoded by tl[] and td[] */
+
 /* inflate (decompress) the codes in a deflated (compressed) block.
    Return an error code or zero if it all goes ok. */
 {
-  register unsigned e;  /* table entry flag/number of extra bits */
-  unsigned n, d;        /* length and index for copy */
-  unsigned w;           /* current window position */
-  struct huft *t;       /* pointer to table entry */
-  unsigned ml, md;      /* masks for bl and bd bits */
-  register ulg b;       /* bit buffer */
-  register unsigned k;  /* number of bits in bit buffer */
-
-
-  /* make local copies of globals */
-  b = bb;                       /* initialize bit buffer */
-  k = bk;
-  w = wp;                       /* initialize window position */
-
-  /* inflate the coded data */
-  ml = mask_bits[bl];           /* precompute masks for speed */
-  md = mask_bits[bd];
-  for (;;)                      /* do until end of block */
-  {
-    NEEDBITS((unsigned)bl)
-    if ((e = (t = tl + ((unsigned)b & ml))->e) > 16)
-      do {
-        if (e == 99)
-          return 1;
-        DUMPBITS(t->b)
-        e -= 16;
-        NEEDBITS(e)
-      } while ((e = (t = t->v.t + ((unsigned)b & mask_bits[e]))->e) > 16);
-    DUMPBITS(t->b)
-    if (e == 16)                /* then it's a literal */
-    {
-      slide[w++] = (uch)t->v.n;
-      Tracevv((stderr, "%c", slide[w-1]));
-      if (w == WSIZE)
-      {
-        flush_output(w);
-        w = 0;
-      }
-    }
-    else                        /* it's an EOB or a length */
-    {
-      /* exit if end of block */
-      if (e == 15)
-        break;
-
-      /* get length of block to copy */
-      NEEDBITS(e)
-      n = t->v.n + ((unsigned)b & mask_bits[e]);
-      DUMPBITS(e);
-
-      /* decode distance of block to copy */
-      NEEDBITS((unsigned)bd)
-      if ((e = (t = td + ((unsigned)b & md))->e) > 16)
-        do {
-          if (e == 99)
-            return 1;
-          DUMPBITS(t->b)
-          e -= 16;
-          NEEDBITS(e)
-        } while ((e = (t = t->v.t + ((unsigned)b & mask_bits[e]))->e) > 16);
-      DUMPBITS(t->b)
-      NEEDBITS(e)
-      d = w - t->v.n - ((unsigned)b & mask_bits[e]);
-      DUMPBITS(e)
-      Tracevv((stderr,"\\[%d,%d]", w-d, n));
-
-      /* do the copy */
-      do {
-        n -= (e = (e = WSIZE - ((d &= WSIZE-1) > w ? d : w)) > n ? n : e);
+        register unsigned e;            /* table entry flag/number of extra bits */
+        unsigned n, d;                          /* length and index for copy */
+        unsigned w;                                     /* current window position */
+        struct huft *t;                         /* pointer to table entry */
+        unsigned ml, md;                        /* masks for bl and bd bits */
+        register ulg b;                         /* bit buffer */
+        register unsigned k;            /* number of bits in bit buffer */
+
+
+        /* make local copies of globals */
+        b = bb;                                         /* initialize bit buffer */
+        k = bk;
+        w = wp;                                         /* initialize window position */
+
+        /* inflate the coded data */
+        ml = mask_bits[bl];                     /* precompute masks for speed */
+        md = mask_bits[bd];
+        for (;;) {                                      /* do until end of block */
+                NEEDBITS((unsigned) bl)
+                        if ((e = (t = tl + ((unsigned) b & ml))->e) > 16)
+                        do {
+                                if (e == 99)
+                                        return 1;
+                                DUMPBITS(t->b)
+                                        e -= 16;
+                                NEEDBITS(e)
+                        } while ((e = (t = t->v.t + ((unsigned) b & mask_bits[e]))->e)
+                                         > 16);
+                DUMPBITS(t->b)
+                        if (e == 16) {          /* then it's a literal */
+                        slide[w++] = (uch) t->v.n;
+                        Tracevv((stderr, "%c", slide[w - 1]));
+                        if (w == WSIZE) {
+                                flush_output(w);
+                                w = 0;
+                        }
+                } else {                                /* it's an EOB or a length */
+
+                        /* exit if end of block */
+                        if (e == 15)
+                                break;
+
+                        /* get length of block to copy */
+                        NEEDBITS(e)
+                                n = t->v.n + ((unsigned) b & mask_bits[e]);
+                        DUMPBITS(e);
+
+                        /* decode distance of block to copy */
+                        NEEDBITS((unsigned) bd)
+                                if ((e = (t = td + ((unsigned) b & md))->e) > 16)
+                                do {
+                                        if (e == 99)
+                                                return 1;
+                                        DUMPBITS(t->b)
+                                                e -= 16;
+                                        NEEDBITS(e)
+                                }
+                                        while (
+                                                   (e =
+                                                        (t =
+                                                         t->v.t + ((unsigned) b & mask_bits[e]))->e) >
+                                                   16);
+                        DUMPBITS(t->b)
+                                NEEDBITS(e)
+                                d = w - t->v.n - ((unsigned) b & mask_bits[e]);
+                        DUMPBITS(e)
+                                Tracevv((stderr, "\\[%d,%d]", w - d, n));
+
+                        /* do the copy */
+                        do {
+                                n -= (e =
+                                          (e =
+                                           WSIZE - ((d &= WSIZE - 1) > w ? d : w)) >
+                                          n ? n : e);
 #if !defined(NOMEMCPY) && !defined(DEBUG)
-        if (w - d >= e)         /* (this test assumes unsigned comparison) */
-        {
-          memcpy(slide + w, slide + d, e);
-          w += e;
-          d += e;
-        }
-        else                      /* do it slow to avoid memcpy() overlap */
-#endif /* !NOMEMCPY */
-          do {
-            slide[w++] = slide[d++];
-            Tracevv((stderr, "%c", slide[w-1]));
-          } while (--e);
-        if (w == WSIZE)
-        {
-          flush_output(w);
-          w = 0;
-        }
-      } while (n);
-    }
-  }
-
-
-  /* restore the globals from the locals */
-  wp = w;                       /* restore global window pointer */
-  bb = b;                       /* restore global bit buffer */
-  bk = k;
-
-  /* done */
-  return 0;
+                                if (w - d >= e) {       /* (this test assumes unsigned comparison) */
+                                        memcpy(slide + w, slide + d, e);
+                                        w += e;
+                                        d += e;
+                                } else                  /* do it slow to avoid memcpy() overlap */
+#endif                                                  /* !NOMEMCPY */
+                                        do {
+                                                slide[w++] = slide[d++];
+                                                Tracevv((stderr, "%c", slide[w - 1]));
+                                        } while (--e);
+                                if (w == WSIZE) {
+                                        flush_output(w);
+                                        w = 0;
+                                }
+                        } while (n);
+                }
+        }
+
+
+        /* restore the globals from the locals */
+        wp = w;                                         /* restore global window pointer */
+        bb = b;                                         /* restore global bit buffer */
+        bk = k;
+
+        /* done */
+        return 0;
 }
 
 
@@ -1953,52 +1977,50 @@ int bl, bd;             /* number of bits decoded by tl[] and td[] */
 int inflate_stored()
 /* "decompress" an inflated type 0 (stored) block. */
 {
-  unsigned n;           /* number of bytes in block */
-  unsigned w;           /* current window position */
-  register ulg b;       /* bit buffer */
-  register unsigned k;  /* number of bits in bit buffer */
-
-
-  /* make local copies of globals */
-  b = bb;                       /* initialize bit buffer */
-  k = bk;
-  w = wp;                       /* initialize window position */
-
-
-  /* go to byte boundary */
-  n = k & 7;
-  DUMPBITS(n);
-
-
-  /* get the length and its complement */
-  NEEDBITS(16)
-  n = ((unsigned)b & 0xffff);
-  DUMPBITS(16)
-  NEEDBITS(16)
-  if (n != (unsigned)((~b) & 0xffff))
-    return 1;                   /* error in compressed data */
-  DUMPBITS(16)
-
-
-  /* read and output the compressed data */
-  while (n--)
-  {
-    NEEDBITS(8)
-    slide[w++] = (uch)b;
-    if (w == WSIZE)
-    {
-      flush_output(w);
-      w = 0;
-    }
-    DUMPBITS(8)
-  }
-
-
-  /* restore the globals from the locals */
-  wp = w;                       /* restore global window pointer */
-  bb = b;                       /* restore global bit buffer */
-  bk = k;
-  return 0;
+        unsigned n;                                     /* number of bytes in block */
+        unsigned w;                                     /* current window position */
+        register ulg b;                         /* bit buffer */
+        register unsigned k;            /* number of bits in bit buffer */
+
+
+        /* make local copies of globals */
+        b = bb;                                         /* initialize bit buffer */
+        k = bk;
+        w = wp;                                         /* initialize window position */
+
+
+        /* go to byte boundary */
+        n = k & 7;
+        DUMPBITS(n);
+
+
+        /* get the length and its complement */
+        NEEDBITS(16)
+                n = ((unsigned) b & 0xffff);
+        DUMPBITS(16)
+                NEEDBITS(16)
+                if (n != (unsigned) ((~b) & 0xffff))
+                return 1;                               /* error in compressed data */
+        DUMPBITS(16)
+
+
+                /* read and output the compressed data */
+                while (n--) {
+                NEEDBITS(8)
+                        slide[w++] = (uch) b;
+                if (w == WSIZE) {
+                        flush_output(w);
+                        w = 0;
+                }
+                DUMPBITS(8)
+        }
+
+
+        /* restore the globals from the locals */
+        wp = w;                                         /* restore global window pointer */
+        bb = b;                                         /* restore global bit buffer */
+        bk = k;
+        return 0;
 }
 
 
@@ -2008,48 +2030,47 @@ int inflate_fixed()
    either replace this with a custom decoder, or at least precompute the
    Huffman tables. */
 {
-  int i;                /* temporary variable */
-  struct huft *tl;      /* literal/length code table */
-  struct huft *td;      /* distance code table */
-  int bl;               /* lookup bits for tl */
-  int bd;               /* lookup bits for td */
-  unsigned l[288];      /* length list for huft_build */
-
-
-  /* set up literal table */
-  for (i = 0; i < 144; i++)
-    l[i] = 8;
-  for (; i < 256; i++)
-    l[i] = 9;
-  for (; i < 280; i++)
-    l[i] = 7;
-  for (; i < 288; i++)          /* make a complete, but wrong code set */
-    l[i] = 8;
-  bl = 7;
-  if ((i = huft_build(l, 288, 257, cplens, cplext, &tl, &bl)) != 0)
-    return i;
-
-
-  /* set up distance table */
-  for (i = 0; i < 30; i++)      /* make an incomplete code set */
-    l[i] = 5;
-  bd = 5;
-  if ((i = huft_build(l, 30, 0, cpdist, cpdext, &td, &bd)) > 1)
-  {
-    huft_free(tl);
-    return i;
-  }
-
-
-  /* decompress until an end-of-block code */
-  if (inflate_codes(tl, td, bl, bd))
-    return 1;
-
-
-  /* free the decoding tables, return */
-  huft_free(tl);
-  huft_free(td);
-  return 0;
+        int i;                                          /* temporary variable */
+        struct huft *tl;                        /* literal/length code table */
+        struct huft *td;                        /* distance code table */
+        int bl;                                         /* lookup bits for tl */
+        int bd;                                         /* lookup bits for td */
+        unsigned l[288];                        /* length list for huft_build */
+
+
+        /* set up literal table */
+        for (i = 0; i < 144; i++)
+                l[i] = 8;
+        for (; i < 256; i++)
+                l[i] = 9;
+        for (; i < 280; i++)
+                l[i] = 7;
+        for (; i < 288; i++)            /* make a complete, but wrong code set */
+                l[i] = 8;
+        bl = 7;
+        if ((i = huft_build(l, 288, 257, cplens, cplext, &tl, &bl)) != 0)
+                return i;
+
+
+        /* set up distance table */
+        for (i = 0; i < 30; i++)        /* make an incomplete code set */
+                l[i] = 5;
+        bd = 5;
+        if ((i = huft_build(l, 30, 0, cpdist, cpdext, &td, &bd)) > 1) {
+                huft_free(tl);
+                return i;
+        }
+
+
+        /* decompress until an end-of-block code */
+        if (inflate_codes(tl, td, bl, bd))
+                return 1;
+
+
+        /* free the decoding tables, return */
+        huft_free(tl);
+        huft_free(td);
+        return 0;
 }
 
 
@@ -2057,209 +2078,202 @@ int inflate_fixed()
 int inflate_dynamic()
 /* decompress an inflated type 2 (dynamic Huffman codes) block. */
 {
-  int i;                /* temporary variables */
-  unsigned j;
-  unsigned l;           /* last length */
-  unsigned m;           /* mask for bit lengths table */
-  unsigned n;           /* number of lengths to get */
-  struct huft *tl;      /* literal/length code table */
-  struct huft *td;      /* distance code table */
-  int bl;               /* lookup bits for tl */
-  int bd;               /* lookup bits for td */
-  unsigned nb;          /* number of bit length codes */
-  unsigned nl;          /* number of literal/length codes */
-  unsigned nd;          /* number of distance codes */
+        int i;                                          /* temporary variables */
+        unsigned j;
+        unsigned l;                                     /* last length */
+        unsigned m;                                     /* mask for bit lengths table */
+        unsigned n;                                     /* number of lengths to get */
+        struct huft *tl;                        /* literal/length code table */
+        struct huft *td;                        /* distance code table */
+        int bl;                                         /* lookup bits for tl */
+        int bd;                                         /* lookup bits for td */
+        unsigned nb;                            /* number of bit length codes */
+        unsigned nl;                            /* number of literal/length codes */
+        unsigned nd;                            /* number of distance codes */
+
 #ifdef PKZIP_BUG_WORKAROUND
-  unsigned ll[288+32];  /* literal/length and distance code lengths */
+        unsigned ll[288 + 32];          /* literal/length and distance code lengths */
 #else
-  unsigned ll[286+30];  /* literal/length and distance code lengths */
+        unsigned ll[286 + 30];          /* literal/length and distance code lengths */
 #endif
-  register ulg b;       /* bit buffer */
-  register unsigned k;  /* number of bits in bit buffer */
+        register ulg b;                         /* bit buffer */
+        register unsigned k;            /* number of bits in bit buffer */
 
 
-  /* make local bit buffer */
-  b = bb;
-  k = bk;
+        /* make local bit buffer */
+        b = bb;
+        k = bk;
 
 
-  /* read in table lengths */
-  NEEDBITS(5)
-  nl = 257 + ((unsigned)b & 0x1f);      /* number of literal/length codes */
-  DUMPBITS(5)
-  NEEDBITS(5)
-  nd = 1 + ((unsigned)b & 0x1f);        /* number of distance codes */
-  DUMPBITS(5)
-  NEEDBITS(4)
-  nb = 4 + ((unsigned)b & 0xf);         /* number of bit length codes */
-  DUMPBITS(4)
+        /* read in table lengths */
+        NEEDBITS(5)
+                nl = 257 + ((unsigned) b & 0x1f);       /* number of literal/length codes */
+        DUMPBITS(5)
+                NEEDBITS(5)
+                nd = 1 + ((unsigned) b & 0x1f); /* number of distance codes */
+        DUMPBITS(5)
+                NEEDBITS(4)
+                nb = 4 + ((unsigned) b & 0xf);  /* number of bit length codes */
+        DUMPBITS(4)
 #ifdef PKZIP_BUG_WORKAROUND
-  if (nl > 288 || nd > 32)
+                if (nl > 288 || nd > 32)
 #else
-  if (nl > 286 || nd > 30)
+                if (nl > 286 || nd > 30)
 #endif
-    return 1;                   /* bad lengths */
-
-
-  /* read in bit-length-code lengths */
-  for (j = 0; j < nb; j++)
-  {
-    NEEDBITS(3)
-    ll[border[j]] = (unsigned)b & 7;
-    DUMPBITS(3)
-  }
-  for (; j < 19; j++)
-    ll[border[j]] = 0;
-
-
-  /* build decoding table for trees--single level, 7 bit lookup */
-  bl = 7;
-  if ((i = huft_build(ll, 19, 19, NULL, NULL, &tl, &bl)) != 0)
-  {
-    if (i == 1)
-      huft_free(tl);
-    return i;                   /* incomplete code set */
-  }
-
-
-  /* read in literal and distance code lengths */
-  n = nl + nd;
-  m = mask_bits[bl];
-  i = l = 0;
-  while ((unsigned)i < n)
-  {
-    NEEDBITS((unsigned)bl)
-    j = (td = tl + ((unsigned)b & m))->b;
-    DUMPBITS(j)
-    j = td->v.n;
-    if (j < 16)                 /* length of code in bits (0..15) */
-      ll[i++] = l = j;          /* save last length in l */
-    else if (j == 16)           /* repeat last length 3 to 6 times */
-    {
-      NEEDBITS(2)
-      j = 3 + ((unsigned)b & 3);
-      DUMPBITS(2)
-      if ((unsigned)i + j > n)
-        return 1;
-      while (j--)
-        ll[i++] = l;
-    }
-    else if (j == 17)           /* 3 to 10 zero length codes */
-    {
-      NEEDBITS(3)
-      j = 3 + ((unsigned)b & 7);
-      DUMPBITS(3)
-      if ((unsigned)i + j > n)
-        return 1;
-      while (j--)
-        ll[i++] = 0;
-      l = 0;
-    }
-    else                        /* j == 18: 11 to 138 zero length codes */
-    {
-      NEEDBITS(7)
-      j = 11 + ((unsigned)b & 0x7f);
-      DUMPBITS(7)
-      if ((unsigned)i + j > n)
-        return 1;
-      while (j--)
-        ll[i++] = 0;
-      l = 0;
-    }
-  }
-
-
-  /* free decoding table for trees */
-  huft_free(tl);
-
-
-  /* restore the global bit buffer */
-  bb = b;
-  bk = k;
-
-
-  /* build the decoding tables for literal/length and distance codes */
-  bl = lbits;
-  if ((i = huft_build(ll, nl, 257, cplens, cplext, &tl, &bl)) != 0)
-  {
-    if (i == 1) {
-      fprintf(stderr, " incomplete literal tree\n");
-      huft_free(tl);
-    }
-    return i;                   /* incomplete code set */
-  }
-  bd = dbits;
-  if ((i = huft_build(ll + nl, nd, 0, cpdist, cpdext, &td, &bd)) != 0)
-  {
-    if (i == 1) {
-      fprintf(stderr, " incomplete distance tree\n");
+                return 1;                               /* bad lengths */
+
+
+        /* read in bit-length-code lengths */
+        for (j = 0; j < nb; j++) {
+                NEEDBITS(3)
+                        ll[border[j]] = (unsigned) b & 7;
+                DUMPBITS(3)
+        }
+        for (; j < 19; j++)
+                ll[border[j]] = 0;
+
+
+        /* build decoding table for trees--single level, 7 bit lookup */
+        bl = 7;
+        if ((i = huft_build(ll, 19, 19, NULL, NULL, &tl, &bl)) != 0) {
+                if (i == 1)
+                        huft_free(tl);
+                return i;                               /* incomplete code set */
+        }
+
+
+        /* read in literal and distance code lengths */
+        n = nl + nd;
+        m = mask_bits[bl];
+        i = l = 0;
+        while ((unsigned) i < n) {
+                NEEDBITS((unsigned) bl)
+                        j = (td = tl + ((unsigned) b & m))->b;
+                DUMPBITS(j)
+                        j = td->v.n;
+                if (j < 16)                             /* length of code in bits (0..15) */
+                        ll[i++] = l = j;        /* save last length in l */
+                else if (j == 16) {             /* repeat last length 3 to 6 times */
+                        NEEDBITS(2)
+                                j = 3 + ((unsigned) b & 3);
+                        DUMPBITS(2)
+                                if ((unsigned) i + j > n)
+                                return 1;
+                        while (j--)
+                                ll[i++] = l;
+                } else if (j == 17) {   /* 3 to 10 zero length codes */
+                        NEEDBITS(3)
+                                j = 3 + ((unsigned) b & 7);
+                        DUMPBITS(3)
+                                if ((unsigned) i + j > n)
+                                return 1;
+                        while (j--)
+                                ll[i++] = 0;
+                        l = 0;
+                } else {                                /* j == 18: 11 to 138 zero length codes */
+
+                        NEEDBITS(7)
+                                j = 11 + ((unsigned) b & 0x7f);
+                        DUMPBITS(7)
+                                if ((unsigned) i + j > n)
+                                return 1;
+                        while (j--)
+                                ll[i++] = 0;
+                        l = 0;
+                }
+        }
+
+
+        /* free decoding table for trees */
+        huft_free(tl);
+
+
+        /* restore the global bit buffer */
+        bb = b;
+        bk = k;
+
+
+        /* build the decoding tables for literal/length and distance codes */
+        bl = lbits;
+        if ((i = huft_build(ll, nl, 257, cplens, cplext, &tl, &bl)) != 0) {
+                if (i == 1) {
+                        fprintf(stderr, " incomplete literal tree\n");
+                        huft_free(tl);
+                }
+                return i;                               /* incomplete code set */
+        }
+        bd = dbits;
+        if ((i = huft_build(ll + nl, nd, 0, cpdist, cpdext, &td, &bd)) != 0) {
+                if (i == 1) {
+                        fprintf(stderr, " incomplete distance tree\n");
 #ifdef PKZIP_BUG_WORKAROUND
-      i = 0;
-    }
+                        i = 0;
+                }
 #else
-      huft_free(td);
-    }
-    huft_free(tl);
-    return i;                   /* incomplete code set */
+                        huft_free(td);
+                }
+                huft_free(tl);
+                return i;                               /* incomplete code set */
 #endif
-  }
+        }
 
 
-  /* decompress until an end-of-block code */
-  if (inflate_codes(tl, td, bl, bd))
-    return 1;
+        /* decompress until an end-of-block code */
+        if (inflate_codes(tl, td, bl, bd))
+                return 1;
 
 
-  /* free the decoding tables, return */
-  huft_free(tl);
-  huft_free(td);
-  return 0;
+        /* free the decoding tables, return */
+        huft_free(tl);
+        huft_free(td);
+        return 0;
 }
 
 
 
 int inflate_block(e)
-int *e;                 /* last block flag */
+int *e;                                                 /* last block flag */
+
 /* decompress an inflated block */
 {
-  unsigned t;           /* block type */
-  register ulg b;       /* bit buffer */
-  register unsigned k;  /* number of bits in bit buffer */
+        unsigned t;                                     /* block type */
+        register ulg b;                         /* bit buffer */
+        register unsigned k;            /* number of bits in bit buffer */
 
 
-  /* make local bit buffer */
-  b = bb;
-  k = bk;
+        /* make local bit buffer */
+        b = bb;
+        k = bk;
 
 
-  /* read in last block bit */
-  NEEDBITS(1)
-  *e = (int)b & 1;
-  DUMPBITS(1)
+        /* read in last block bit */
+        NEEDBITS(1)
+                * e = (int) b & 1;
+        DUMPBITS(1)
 
 
-  /* read in block type */
-  NEEDBITS(2)
-  t = (unsigned)b & 3;
-  DUMPBITS(2)
+                /* read in block type */
+                NEEDBITS(2)
+                t = (unsigned) b & 3;
+        DUMPBITS(2)
 
 
-  /* restore the global bit buffer */
-  bb = b;
-  bk = k;
+                /* restore the global bit buffer */
+                bb = b;
+        bk = k;
 
 
-  /* inflate that block type */
-  if (t == 2)
-    return inflate_dynamic();
-  if (t == 0)
-    return inflate_stored();
-  if (t == 1)
-    return inflate_fixed();
+        /* inflate that block type */
+        if (t == 2)
+                return inflate_dynamic();
+        if (t == 0)
+                return inflate_stored();
+        if (t == 1)
+                return inflate_fixed();
 
 
-  /* bad block type */
-  return 2;
+        /* bad block type */
+        return 2;
 }
 
 
@@ -2267,42 +2281,42 @@ int *e;                 /* last block flag */
 int inflate()
 /* decompress an inflated entry */
 {
-  int e;                /* last block flag */
-  int r;                /* result code */
-  unsigned h;           /* maximum struct huft's malloc'ed */
+        int e;                                          /* last block flag */
+        int r;                                          /* result code */
+        unsigned h;                                     /* maximum struct huft's malloc'ed */
 
 
-  /* initialize window, bit buffer */
-  wp = 0;
-  bk = 0;
-  bb = 0;
+        /* initialize window, bit buffer */
+        wp = 0;
+        bk = 0;
+        bb = 0;
 
 
-  /* decompress until the last block */
-  h = 0;
-  do {
-    hufts = 0;
-    if ((r = inflate_block(&e)) != 0)
-      return r;
-    if (hufts > h)
-      h = hufts;
-  } while (!e);
+        /* decompress until the last block */
+        h = 0;
+        do {
+                hufts = 0;
+                if ((r = inflate_block(&e)) != 0)
+                        return r;
+                if (hufts > h)
+                        h = hufts;
+        } while (!e);
 
-  /* Undo too much lookahead. The next read will be byte aligned so we
-   * can discard unused bits in the last meaningful byte.
-   */
-  while (bk >= 8) {
-    bk -= 8;
-    inptr--;
-  }
+        /* Undo too much lookahead. The next read will be byte aligned so we
+         * can discard unused bits in the last meaningful byte.
+         */
+        while (bk >= 8) {
+                bk -= 8;
+                inptr--;
+        }
 
-  /* flush out slide */
-  flush_output(wp);
+        /* flush out slide */
+        flush_output(wp);
 
 
-  /* return success */
+        /* return success */
 #ifdef DEBUG
-  fprintf(stderr, "<%u> ", h);
-#endif /* DEBUG */
-  return 0;
+        fprintf(stderr, "<%u> ", h);
+#endif                                                  /* DEBUG */
+        return 0;
 }
diff --git a/archival/gzip.c b/archival/gzip.c
index 3438ee42f..f132679f7 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* gzip.c -- this is a stripped down version of gzip I put into busybox, it does
  * only standard in to standard out with -9 compression.  It also requires the
  * zcat module for some important functions.  
@@ -12,11 +13,12 @@
 //#endif
 
 static const char gzip_usage[] =
-    "gzip [OPTION]... FILE\n\n"
-    "Compress 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";
+        "gzip [OPTION]... FILE\n\n"
+        "Compress 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";
 
 
 /* gzip.h -- common declarations for all gzip modules
@@ -32,9 +34,9 @@ static const char gzip_usage[] =
 #endif
 
 #ifdef __STDC__
-   typedef void *voidp;
+typedef void *voidp;
 #else
-   typedef char *voidp;
+typedef char *voidp;
 #endif
 
 /* I don't like nested includes, but the string and io functions are used
@@ -49,10 +51,10 @@ static const char gzip_usage[] =
 #  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
 
@@ -62,9 +64,9 @@ static const char gzip_usage[] =
 
 #define local static
 
-typedef unsigned char  uch;
+typedef unsigned char uch;
 typedef unsigned short ush;
-typedef unsigned long  ulg;
+typedef unsigned long ulg;
 
 /* Return codes from gzip */
 #define OK      0
@@ -79,7 +81,7 @@ typedef unsigned long  ulg;
 /* methods 4 to 7 reserved */
 #define DEFLATED    8
 #define MAX_METHODS 9
-extern int method;         /* compression method */
+extern int method;                              /* compression method */
 
 /* To save memory for 16 bit systems, some arrays are overlaid between
  * the various modules:
@@ -94,27 +96,27 @@ extern int method;         /* compression method */
 
 #ifndef INBUFSIZ
 #  ifdef SMALL_MEM
-#    define INBUFSIZ  0x2000  /* input buffer size */
+#    define INBUFSIZ  0x2000    /* input buffer size */
 #  else
-#    define INBUFSIZ  0x8000  /* input buffer size */
+#    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
-#    define OUTBUFSIZ   8192  /* output buffer size */
+#    define OUTBUFSIZ   8192    /* output buffer size */
 #  else
-#    define OUTBUFSIZ  16384  /* output buffer size */
+#    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
-#    define DIST_BUFSIZE 0x2000 /* buffer for distances, see trees.c */
+#    define DIST_BUFSIZE 0x2000 /* buffer for distances, see trees.c */
 #  else
-#    define DIST_BUFSIZE 0x8000 /* buffer for distances, see trees.c */
+#    define DIST_BUFSIZE 0x8000 /* buffer for distances, see trees.c */
 #  endif
 #endif
 
@@ -133,60 +135,61 @@ extern int method;         /* compression method */
 #  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) */
+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) */
+#  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 */
+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 */
+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 */
 
-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 */
+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 */
 
 #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 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) */
 
-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 */
-#define GZIP_MAGIC     "\037\213" /* Magic header for gzip files, 1F 8B */
-#define OLD_GZIP_MAGIC "\037\236" /* Magic header for gzip 0.5 = freeze 1.x */
-#define LZH_MAGIC      "\037\240" /* Magic header for SCO LZH Compress files*/
-#define PKZIP_MAGIC    "\120\113\003\004" /* Magic header for pkzip files */
+#define PACK_MAGIC     "\037\036"       /* Magic header for packed files */
+#define GZIP_MAGIC     "\037\213"       /* Magic header for gzip files, 1F 8B */
+#define OLD_GZIP_MAGIC "\037\236"       /* Magic header for gzip 0.5 = freeze 1.x */
+#define LZH_MAGIC      "\037\240"       /* Magic header for SCO LZH Compress files */
+#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 ENCRYPTED    0x20               /* bit 5 set: file is encrypted */
+#define RESERVED     0xC0               /* bit 6,7:   reserved */
 
 /* internal file attribute */
 #define UNKNOWN 0xffff
@@ -194,8 +197,8 @@ 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 */
-#endif                     /*  at least 32K for zip's deflate method */
+#  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
 #define MAX_MATCH  258
@@ -211,12 +214,12 @@ 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 */
+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))
@@ -248,10 +251,10 @@ extern int save_orig_name; /* set if original name must be saved */
     put_short(((ulg)(n)) >> 16); \
 }
 
-#define seekable()    0  /* force sequential output */
-#define translate_eol 0  /* no option -a yet */
+#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 */
+#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))
@@ -281,57 +284,58 @@ extern int save_orig_name; /* set if original name must be saved */
 
 
         /* in zip.c: */
-extern int zip        OF((int in, int out));
-extern int file_read  OF((char *buf,  unsigned size));
+extern int zip OF((int in, int out));
+extern int file_read OF((char *buf, unsigned size));
 
         /* in unzip.c */
-extern int unzip      OF((int in, int out));
+extern int unzip OF((int in, int out));
 extern int check_zipfile OF((int in));
 
         /* in unpack.c */
-extern int unpack     OF((int in, int out));
+extern int unpack OF((int in, int out));
 
         /* in unlzh.c */
-extern int unlzh      OF((int in, int out));
+extern int unlzh OF((int in, int out));
 
         /* in gzip.c */
 RETSIGTYPE abort_gzip OF((void));
 
-        /* in deflate.c */
-void lm_init OF((ush *flags));
-ulg  deflate OF((void));
+                /* in deflate.c */
+void lm_init OF((ush * flags));
+ulg deflate OF((void));
 
-        /* in trees.c */
-void ct_init     OF((ush *attr, int *method));
-int  ct_tally    OF((int dist, int lc));
-ulg  flush_block OF((char *buf, ulg stored_len, int eof));
+                /* in trees.c */
+void ct_init OF((ush * attr, int *method));
+int ct_tally OF((int dist, int lc));
+ulg flush_block OF((char *buf, ulg stored_len, int eof));
 
-        /* in bits.c */
-void     bi_init    OF((file_t zipfile));
-void     send_bits  OF((int value, int length));
+                /* in bits.c */
+void bi_init OF((file_t zipfile));
+void send_bits OF((int value, int length));
 unsigned bi_reverse OF((unsigned value, int length));
-void     bi_windup  OF((void));
-void     copy_block OF((char *buf, unsigned len, int header));
-extern   int (*read_buf) OF((char *buf, unsigned size));
+void bi_windup OF((void));
+void copy_block OF((char *buf, unsigned len, int header));
+extern int (*read_buf) OF((char *buf, unsigned size));
 
         /* in util.c: */
-extern int copy           OF((int in, int out));
-extern ulg  updcrc        OF((uch *s, unsigned n));
-extern void clear_bufs    OF((void));
-extern int  fill_inbuf    OF((int eof_ok));
-extern void flush_outbuf  OF((void));
-extern void flush_window  OF((void));
-extern void write_buf     OF((int fd, voidp buf, unsigned cnt));
-extern char *strlwr       OF((char *s));
-extern char *add_envopt   OF((int *argcp, char ***argvp, char *env));
-extern void error         OF((char *m));
-extern void warn          OF((char *a, char *b));
-extern void read_error    OF((void));
-extern void write_error   OF((void));
-extern void display_ratio OF((long num, long den, FILE *file));
+extern int copy OF((int in, int out));
+extern ulg updcrc OF((uch * s, unsigned n));
+extern void clear_bufs OF((void));
+extern int fill_inbuf OF((int eof_ok));
+extern void flush_outbuf OF((void));
+extern void flush_window OF((void));
+extern void write_buf OF((int fd, voidp buf, unsigned cnt));
+extern char *strlwr OF((char *s));
+extern char *add_envopt OF((int *argcp, char ***argvp, char *env));
+extern void error OF((char *m));
+extern void warn OF((char *a, char *b));
+extern void read_error OF((void));
+extern void write_error OF((void));
+extern void display_ratio OF((long num, long den, FILE * file));
 
         /* in inflate.c */
 extern int inflate OF((void));
+
 /* lzw.h -- define the lzw functions.
  * Copyright (C) 1992-1993 Jean-loup Gailly.
  * This is free software; you can redistribute it and/or modify it under the
@@ -345,9 +349,9 @@ extern int inflate OF((void));
 #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
@@ -362,13 +366,13 @@ extern int inflate OF((void));
  * clear the dictionary.
  */
 
-#define LZW_RESERVED 0x60 /* reserved bits */
+#define LZW_RESERVED 0x60               /* reserved bits */
 
-#define CLEAR  256       /* flush the dictionary */
-#define FIRST  (CLEAR+1) /* first free entry */
+#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 */
+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.
@@ -404,18 +408,18 @@ extern int block_mode;   /* block compress mode -C compatible with 2.0 */
 #  define OS2
 #endif
 
-#if defined(OS2) && defined(MSDOS) /* MS C under OS/2 */
+#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 <unistd.h> defines POSIX_SOURCE which
-      * implies DIRENT.
-      */
+         /* 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 <unistd.h> defines POSIX_SOURCE which
+          * implies DIRENT.
+          */
 #    define near
 #  else
 #    define MAXSEG_64K
@@ -426,7 +430,7 @@ extern int block_mode;   /* block compress mode -C compatible with 2.0 */
 #      else
 #        define NO_UTIME
 #      endif
-#    else /* MSC */
+#    else                                               /* MSC */
 #      define HAVE_SYS_UTIME_H
 #      define NO_UTIME_H
 #    endif
@@ -441,7 +445,7 @@ extern int block_mode;   /* block compress mode -C compatible with 2.0 */
 #  define PROTO
 #  define STDC_HEADERS
 #  define NO_SIZE_CHECK
-#  define casemap(c) tolow(c) /* Force file names to lower case */
+#  define casemap(c) tolow(c)   /* Force file names to lower case */
 #  include <io.h>
 #  define OS_CODE  0x00
 #  define SET_BINARY_MODE(fd) setmode(fd, O_BINARY)
@@ -494,7 +498,7 @@ extern int block_mode;   /* block compress mode -C compatible with 2.0 */
 #  endif
 #endif
 
-#ifdef WIN32 /* Windows NT */
+#ifdef WIN32                                    /* Windows NT */
 #  define HAVE_SYS_UTIME_H
 #  define NO_UTIME_H
 #  define PATH_SEP2 '\\'
@@ -510,7 +514,7 @@ extern int block_mode;   /* block compress mode -C compatible with 2.0 */
 #    define NO_MULTIPLE_DOTS
 #    define MAX_EXT_CHARS 3
 #    define Z_SUFFIX "z"
-#    define casemap(c) tolow(c) /* Force file names to lower case */
+#    define casemap(c) tolow(c) /* Force file names to lower case */
 #  endif
 #  define OS_CODE  0x0b
 #endif
@@ -519,10 +523,10 @@ extern int block_mode;   /* block compress mode -C compatible with 2.0 */
 #  ifdef __TURBOC__
 #    include <alloc.h>
 #    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 */
+         /* 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 <malloc.h>
 #    define fcalloc(nitems,itemsize) halloc((long)(nitems),(itemsize))
 #    define fcfree(ptr) hfree(ptr)
@@ -565,17 +569,18 @@ extern int block_mode;   /* block compress mode -C compatible with 2.0 */
 #  ifdef __GNUC__
 #    define DIRENT
 #    define HAVE_UNISTD_H
-#  else /* SASC */
+#  else                                                 /* SASC */
 #    define NO_STDIN_FSTAT
 #    define SYSDIR
 #    define NO_SYMLINK
 #    define NO_CHOWN
 #    define NO_FCNTL_H
-#    include <fcntl.h> /* for read() and write() */
+#    include <fcntl.h>                  /* for read() and write() */
 #    define direct dirent
-     extern void _expand_args(int *argc, char ***argv);
+extern void _expand_args(int *argc, char ***argv);
+
 #    define EXPAND(argc,argv) _expand_args(&argc,&argv);
-#    undef  O_BINARY /* disable useless --ascii option */
+#    undef  O_BINARY                    /* disable useless --ascii option */
 #  endif
 #endif
 
@@ -595,7 +600,7 @@ extern int block_mode;   /* block compress mode -C compatible with 2.0 */
 #    define MAX_EXT_CHARS 3
 #    define Z_SUFFIX "z"
 #    define NO_CHOWN
-#    define casemap(c) tolow(c) /* Force file names to lower case */
+#    define casemap(c) tolow(c) /* Force file names to lower case */
 #    define NO_SYMLINK
 #  endif
 #endif
@@ -615,28 +620,28 @@ extern int block_mode;   /* block compress mode -C compatible with 2.0 */
 #  endif
 #endif
 
-#ifdef __50SERIES /* Prime/PRIMOS */
+#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_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 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 */
+#  define OS_CODE  0x0F                 /* temporary, subject to change */
 #  ifdef SIGTERM
-#    undef SIGTERM         /* We don't want a signal handler for 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 */
+#if defined(pyr) && !defined(NOMEMCPY)  /* Pyramid */
+#  define NOMEMCPY                              /* problem with overlapping copies */
 #endif
 
 #ifdef TOPS20
@@ -644,14 +649,14 @@ extern int block_mode;   /* block compress mode -C compatible with 2.0 */
 #endif
 
 #ifndef unix
-#  define NO_ST_INO /* don't rely on inode numbers */
+#  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
@@ -773,9 +778,10 @@ extern int block_mode;   /* block compress mode -C compatible with 2.0 */
  * Local data used by the "bit string" routines.
  */
 
-local file_t zfile; /* output gzip file */
+local file_t zfile;                             /* output gzip file */
 
 local unsigned short bi_buf;
+
 /* Output buffer. bits are inserted starting at the bottom (least significant
  * bits).
  */
@@ -786,36 +792,38 @@ local unsigned short bi_buf;
  */
 
 local int bi_valid;
+
 /* Number of valid bits in bi_buf.  All bits above the last valid bit
  * are always zero.
  */
 
 int (*read_buf) OF((char *buf, unsigned size));
+
 /* 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 */
+void bi_init(zipfile)
+file_t zipfile;                                 /* output zip file, NO_FILE for in-memory compression */
 {
-    zfile  = zipfile;
-    bi_buf = 0;
-    bi_valid = 0;
+        zfile = zipfile;
+        bi_buf = 0;
+        bi_valid = 0;
 #ifdef DEBUG
-    bits_sent = 0L;
+        bits_sent = 0L;
 #endif
 
-    /* Set the defaults for file compression. They are set by memcompress
-     * for in-memory compression.
-     */
-    if (zfile != NO_FILE) {
-        read_buf  = file_read;
-    }
+        /* Set the defaults for file compression. They are set by memcompress
+         * for in-memory compression.
+         */
+        if (zfile != NO_FILE) {
+                read_buf = file_read;
+        }
 }
 
 /* ===========================================================================
@@ -823,27 +831,27 @@ void bi_init (zipfile)
  * 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 */
+int value;                                              /* value to send */
+int length;                                             /* number of bits */
 {
 #ifdef DEBUG
-    Tracev((stderr," l %2d v %4x ", length, value));
-    Assert(length > 0 && length <= 15, "invalid length");
-    bits_sent += (ulg)length;
-#endif
-    /* If not enough room in bi_buf, use (valid) bits from bi_buf and
-     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
-     * unused bits in value.
-     */
-    if (bi_valid > (int)Buf_size - length) {
-        bi_buf |= (value << bi_valid);
-        put_short(bi_buf);
-        bi_buf = (ush)value >> (Buf_size - bi_valid);
-        bi_valid += length - Buf_size;
-    } else {
-        bi_buf |= value << bi_valid;
-        bi_valid += length;
-    }
+        Tracev((stderr, " l %2d v %4x ", length, value));
+        Assert(length > 0 && length <= 15, "invalid length");
+        bits_sent += (ulg) length;
+#endif
+        /* If not enough room in bi_buf, use (valid) bits from bi_buf and
+         * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
+         * unused bits in value.
+         */
+        if (bi_valid > (int) Buf_size - length) {
+                bi_buf |= (value << bi_valid);
+                put_short(bi_buf);
+                bi_buf = (ush) value >> (Buf_size - bi_valid);
+                bi_valid += length - Buf_size;
+        } else {
+                bi_buf |= value << bi_valid;
+                bi_valid += length;
+        }
 }
 
 /* ===========================================================================
@@ -852,15 +860,16 @@ void send_bits(value, length)
  * IN assertion: 1 <= len <= 15
  */
 unsigned bi_reverse(code, len)
-    unsigned code; /* the value to invert */
-    int len;       /* its bit length */
+unsigned code;                                  /* the value to invert */
+int len;                                                /* its bit length */
 {
-    register unsigned res = 0;
-    do {
-        res |= code & 1;
-        code >>= 1, res <<= 1;
-    } while (--len > 0);
-    return res >> 1;
+        register unsigned res = 0;
+
+        do {
+                res |= code & 1;
+                code >>= 1, res <<= 1;
+        } while (--len > 0);
+        return res >> 1;
 }
 
 /* ===========================================================================
@@ -868,15 +877,15 @@ unsigned bi_reverse(code, len)
  */
 void bi_windup()
 {
-    if (bi_valid > 8) {
-        put_short(bi_buf);
-    } else if (bi_valid > 0) {
-        put_byte(bi_buf);
-    }
-    bi_buf = 0;
-    bi_valid = 0;
+        if (bi_valid > 8) {
+                put_short(bi_buf);
+        } else if (bi_valid > 0) {
+                put_byte(bi_buf);
+        }
+        bi_buf = 0;
+        bi_valid = 0;
 #ifdef DEBUG
-    bits_sent = (bits_sent+7) & ~7;
+        bits_sent = (bits_sent + 7) & ~7;
 #endif
 }
 
@@ -885,30 +894,33 @@ void bi_windup()
  * 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 */
+char *buf;                                              /* the input data */
+unsigned len;                                   /* its length */
+int header;                                             /* true if block header must be written */
 {
-    bi_windup();              /* align on byte boundary */
+        bi_windup();                            /* align on byte boundary */
 
-    if (header) {
-        put_short((ush)len);   
-        put_short((ush)~len);
+        if (header) {
+                put_short((ush) len);
+                put_short((ush) ~ len);
 #ifdef DEBUG
-        bits_sent += 2*16;
+                bits_sent += 2 * 16;
 #endif
-    }
+        }
 #ifdef DEBUG
-    bits_sent += (ulg)len<<3;
+        bits_sent += (ulg) len << 3;
 #endif
-    while (len--) {
+        while (len--) {
 #ifdef CRYPT
-        int t;
-        if (key) zencode(*buf, t);
+                int t;
+
+                if (key)
+                        zencode(*buf, t);
 #endif
-        put_byte(*buf++);
-    }
+                put_byte(*buf++);
+        }
 }
+
 /* deflate.c -- compress data using the deflation algorithm
  * Copyright (C) 1992-1993 Jean-loup Gailly
  * This is free software; you can redistribute it and/or modify it under the
@@ -987,7 +999,7 @@ void copy_block(buf, len, header)
  */
 
 #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
@@ -1001,35 +1013,30 @@ void copy_block(buf, len, header)
  * window with tab_suffix. Check that we can do this:
  */
 #if (WSIZE<<1) > (1<<BITS)
-   error: cannot overlay window with tab_suffix and prev with tab_prefix0
+error:cannot overlay window with tab_suffix and prev with tab_prefix0
 #endif
 #if HASH_BITS > BITS-1
-   error: cannot overlay head with tab_prefix1
+error:cannot overlay head with tab_prefix1
 #endif
-
 #define HASH_SIZE (unsigned)(1<<HASH_BITS)
 #define HASH_MASK (HASH_SIZE-1)
 #define WMASK     (WSIZE-1)
 /* HASH_SIZE and WSIZE must be powers of two */
-
 #define NIL 0
 /* Tail of hash chains */
-
 #define FAST 4
 #define SLOW 2
 /* speed options for the general purpose bit flag */
-
 #ifndef TOO_FAR
 #  define TOO_FAR 4096
 #endif
 /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
-
 /* ===========================================================================
  * Local data used by the "longest match" routines.
  */
-
 typedef ush Pos;
 typedef unsigned IPos;
+
 /* A Pos is an index in the character window. We use short instead of int to
  * save space in the various tables. IPos is used only for parameter passing.
  */
@@ -1054,17 +1061,19 @@ typedef unsigned IPos;
 /* DECLARE(Pos, head, 1<<HASH_BITS); */
 /* Heads of the hash chains or NIL. */
 
-ulg window_size = (ulg)2*WSIZE;
+ulg window_size = (ulg) 2 * WSIZE;
+
 /* window size, 2*WSIZE except for MMAP or BIG_MEM, where it is the
  * input file length plus MIN_LOOKAHEAD.
  */
 
 long block_start;
+
 /* window position at the beginning of the current output block. Gets
  * negative when the window is moved backwards.
  */
 
-local unsigned ins_h;  /* hash index of string to be inserted */
+local unsigned ins_h;                   /* hash index of string to be inserted */
 
 #define H_SHIFT  ((HASH_BITS+MIN_MATCH-1)/MIN_MATCH)
 /* Number of bits by which ins_h and del_h must be shifted at each
@@ -1074,21 +1083,24 @@ local unsigned ins_h;  /* hash index of string to be inserted */
  */
 
 unsigned int near 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 */
+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 */
 
 unsigned near max_chain_length;
+
 /* 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;
+
 /* 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.
@@ -1100,6 +1112,7 @@ local unsigned int max_lazy_match;
  */
 
 unsigned near good_match;
+
 /* Use a faster search when the previous match is longer than this */
 
 
@@ -1110,20 +1123,21 @@ unsigned near good_match;
  */
 
 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;
+        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 */
+int near nice_match;                    /* Stop searching when current match exceeds this */
 #endif
 
-local config configuration_table = 
-/* 9 */ {32, 258, 258, 4096}; /* maximum compression */
+local config configuration_table =
+                                                                /* 9 */ { 32, 258, 258, 4096 };
+                                                                /* maximum compression */
 
 /* 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
@@ -1136,15 +1150,16 @@ local config configuration_table =
 /* ===========================================================================
  *  Prototypes for local functions.
  */
-local void fill_window   OF((void));
+local void fill_window OF((void));
+
+int longest_match OF((IPos cur_match));
 
-      int  longest_match OF((IPos cur_match));
 #ifdef ASMV
-      void match_init OF((void)); /* asm code initialization */
+void match_init OF((void));             /* asm code initialization */
 #endif
 
 #ifdef DEBUG
-local  void check_match OF((IPos start, IPos match, int length));
+local void check_match OF((IPos start, IPos match, int length));
 #endif
 
 /* ===========================================================================
@@ -1171,54 +1186,57 @@ local  void check_match OF((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 */
+void lm_init(flags)
+ush *flags;                                             /* general purpose bit flag */
 {
-    register unsigned j;
+        register unsigned j;
 
-    /* Initialize the hash table. */
+        /* Initialize the hash table. */
 #if defined(MAXSEG_64K) && HASH_BITS == 15
-    for (j = 0;  j < HASH_SIZE; j++) head[j] = NIL;
+        for (j = 0; j < HASH_SIZE; j++)
+                head[j] = NIL;
 #else
-    memzero((char*)head, HASH_SIZE*sizeof(*head));
+        memzero((char *) head, HASH_SIZE * sizeof(*head));
 #endif
-    /* prev will be initialized on the fly */
+        /* 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;
+        /* 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;
+        nice_match = configuration_table.nice_length;
 #endif
-    max_chain_length = configuration_table.max_chain;
-    *flags |= SLOW;
-    /* ??? reduce max_chain_length for binary files */
+        max_chain_length = configuration_table.max_chain;
+        *flags |= SLOW;
+        /* ??? reduce max_chain_length for binary files */
 
-    strstart = 0;
-    block_start = 0L;
+        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);
-
-    if (lookahead == 0 || lookahead == (unsigned)EOF) {
-       eofile = 1, lookahead = 0;
-       return;
-    }
-    eofile = 0;
-    /* Make sure that we always have enough lookahead. This is important
-     * if input comes from a device such as a tty.
-     */
-    while (lookahead < MIN_LOOKAHEAD && !eofile) fill_window();
-
-    ins_h = 0;
-    for (j=0; j<MIN_MATCH-1; j++) UPDATE_HASH(ins_h, window[j]);
-    /* If lookahead < MIN_MATCH, ins_h is garbage, but this is
-     * not important since only literal bytes will be emitted.
-     */
+        match_init();                           /* initialize the asm code */
+#endif
+
+        lookahead = read_buf((char *) window,
+                                                 sizeof(int) <= 2 ? (unsigned) WSIZE : 2 * WSIZE);
+
+        if (lookahead == 0 || lookahead == (unsigned) EOF) {
+                eofile = 1, lookahead = 0;
+                return;
+        }
+        eofile = 0;
+        /* Make sure that we always have enough lookahead. This is important
+         * if input comes from a device such as a tty.
+         */
+        while (lookahead < MIN_LOOKAHEAD && !eofile)
+                fill_window();
+
+        ins_h = 0;
+        for (j = 0; j < MIN_MATCH - 1; j++)
+                UPDATE_HASH(ins_h, window[j]);
+        /* If lookahead < MIN_MATCH, ins_h is garbage, but this is
+         * not important since only literal bytes will be emitted.
+         */
 }
 
 /* ===========================================================================
@@ -1235,151 +1253,157 @@ void lm_init (flags)
  * if desired.
  */
 int longest_match(cur_match)
-    IPos cur_match;                             /* current match */
+IPos cur_match;                                 /* current 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 */
-    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.
-     */
+        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 */
+        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.
+         */
 
 /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
  * 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);
+                /* 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];
+        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");
+        /* 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");
 
-    do {
-        Assert(cur_match < strstart, "no future");
-        match = window + cur_match;
+        do {
+                Assert(cur_match < strstart, "no future");
+                match = window + cur_match;
 
-        /* Skip to next match if the match length cannot increase
-         * or if the match length is less than 2:
-         */
+                /* 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])      continue;
-
-        /* The check at best_len-1 can be removed because it will be made
-         * again later. (This heuristic is not always a win.)
-         * 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.
-         */
-        scan += 2, match++;
-
-        /* We check for insufficient lookahead only every 8th comparison;
-         * the 256th check will be made at strstart+258.
-         */
-        do {
-        } while (*++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 *++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;
+                /* 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])
+                        continue;
+
+                /* The check at best_len-1 can be removed because it will be made
+                 * again later. (This heuristic is not always a win.)
+                 * 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.
+                 */
+                scan += 2, match++;
+
+                /* We check for insufficient lookahead only every 8th comparison;
+                 * the 256th check will be made at strstart+258.
+                 */
+                do {
+                } while (*++scan == *++match && *++scan == *++match &&
+                                 *++scan == *++match && *++scan == *++match &&
+                                 *++scan == *++match && *++scan == *++match &&
+                                 *++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);
+                        scan_end = *(ush *) (scan + best_len - 1);
 #else
-            scan_end1  = scan[best_len-1];
-            scan_end   = scan[best_len];
+                        scan_end1 = scan[best_len - 1];
+                        scan_end = scan[best_len];
 #endif
-        }
-    } while ((cur_match = prev[cur_match & WMASK]) > limit
-             && --chain_length != 0);
+                }
+        } while ((cur_match = prev[cur_match & WMASK]) > limit
+                         && --chain_length != 0);
 
-    return best_len;
+        return best_len;
 }
-#endif /* ASMV */
+#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;
+IPos start, 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);
-        error("invalid match");
-    }
-    if (verbose > 1) {
-        fprintf(stderr,"\\[%d,%d]", start-match, length);
-        do { putc(window[start++], stderr); } while (--length != 0);
-    }
+        /* 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);
+                error("invalid match");
+        }
+        if (verbose > 1) {
+                fprintf(stderr, "\\[%d,%d]", start - match, length);
+                do {
+                        putc(window[start++], stderr);
+                } while (--length != 0);
+        }
 }
 #else
 #  define check_match(start, match, length)
@@ -1395,52 +1419,54 @@ local void check_match(start, match, length)
  */
 local void fill_window()
 {
-    register unsigned n, m;
-    unsigned more = (unsigned)(window_size - (ulg)lookahead - (ulg)strstart);
-    /* Amount of free space at the end of the window. */
-
-    /* If the window is almost full and there is insufficient lookahead,
-     * move the upper half to the lower one to make room in the upper half.
-     */
-    if (more == (unsigned)EOF) {
-        /* Very unlikely, but possible on 16 bit machine if strstart == 0
-         * and lookahead == 1 (input done one byte at time)
-         */
-        more--;
-    } else if (strstart >= WSIZE+MAX_DIST) {
-        /* By the IN assertion, the window is not empty so we can't confuse
-         * more == 0 with more == 64K on a 16 bit machine.
-         */
-        Assert(window_size == (ulg)2*WSIZE, "no sliding with BIG_MEM");
-
-        memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE);
-        match_start -= WSIZE;
-        strstart    -= WSIZE; /* we now have strstart >= MAX_DIST: */
-
-        block_start -= (long) WSIZE;
-
-        for (n = 0; n < HASH_SIZE; n++) {
-            m = head[n];
-            head[n] = (Pos)(m >= WSIZE ? m-WSIZE : NIL);
-        }
-        for (n = 0; n < WSIZE; n++) {
-            m = prev[n];
-            prev[n] = (Pos)(m >= WSIZE ? m-WSIZE : NIL);
-            /* If n is not on any hash chain, prev[n] is garbage but
-             * its value will never be used.
-             */
-        }
-        more += WSIZE;
-    }
-    /* At this point, more >= 2 */
-    if (!eofile) {
-        n = read_buf((char*)window+strstart+lookahead, more);
-        if (n == 0 || n == (unsigned)EOF) {
-            eofile = 1;
-        } else {
-            lookahead += n;
-        }
-    }
+        register unsigned n, m;
+        unsigned more =
+
+                (unsigned) (window_size - (ulg) lookahead - (ulg) strstart);
+        /* Amount of free space at the end of the window. */
+
+        /* If the window is almost full and there is insufficient lookahead,
+         * move the upper half to the lower one to make room in the upper half.
+         */
+        if (more == (unsigned) EOF) {
+                /* Very unlikely, but possible on 16 bit machine if strstart == 0
+                 * and lookahead == 1 (input done one byte at time)
+                 */
+                more--;
+        } else if (strstart >= WSIZE + MAX_DIST) {
+                /* By the IN assertion, the window is not empty so we can't confuse
+                 * more == 0 with more == 64K on a 16 bit machine.
+                 */
+                Assert(window_size == (ulg) 2 * WSIZE, "no sliding with BIG_MEM");
+
+                memcpy((char *) window, (char *) window + WSIZE, (unsigned) WSIZE);
+                match_start -= WSIZE;
+                strstart -= WSIZE;              /* we now have strstart >= MAX_DIST: */
+
+                block_start -= (long) WSIZE;
+
+                for (n = 0; n < HASH_SIZE; n++) {
+                        m = head[n];
+                        head[n] = (Pos) (m >= WSIZE ? m - WSIZE : NIL);
+                }
+                for (n = 0; n < WSIZE; n++) {
+                        m = prev[n];
+                        prev[n] = (Pos) (m >= WSIZE ? m - WSIZE : NIL);
+                        /* If n is not on any hash chain, prev[n] is garbage but
+                         * its value will never be used.
+                         */
+                }
+                more += WSIZE;
+        }
+        /* At this point, more >= 2 */
+        if (!eofile) {
+                n = read_buf((char *) window + strstart + lookahead, more);
+                if (n == 0 || n == (unsigned) EOF) {
+                        eofile = 1;
+                } else {
+                        lookahead += n;
+                }
+        }
 }
 
 /* ===========================================================================
@@ -1458,105 +1484,114 @@ local void fill_window()
  */
 ulg deflate()
 {
-    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 */
+        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
-         * dictionary, and set hash_head to the head of the hash chain:
-         */
-        INSERT_STRING(strstart, hash_head);
-
-        /* Find the longest match, discarding those <= prev_length.
-         */
-        prev_length = match_length, prev_match = match_start;
-        match_length = MIN_MATCH-1;
-
-        if (hash_head != NIL && prev_length < max_lazy_match &&
-            strstart - hash_head <= MAX_DIST) {
-            /* To simplify the code, we prevent matches with the string
-             * of window index 0 (in particular we have to avoid a match
-             * of the string with itself at the start of the input file).
-             */
-            match_length = longest_match (hash_head);
-            /* longest_match() sets match_start */
-            if (match_length > lookahead) match_length = lookahead;
-
-            /* Ignore a length 3 match if it is too distant: */
-            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.
-                 */
-                match_length--;
-            }
-        }
-        /* If there was a match at the previous step and the current
-         * match is not better, output the previous match:
-         */
-        if (prev_length >= MIN_MATCH && match_length <= prev_length) {
-
-            check_match(strstart-1, prev_match, prev_length);
-
-            flush = 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.
-             */
-            lookahead -= prev_length-1;
-            prev_length -= 2;
-            do {
-                strstart++;
-                INSERT_STRING(strstart, hash_head);
-                /* strstart never exceeds WSIZE-MAX_MATCH, so there are
-                 * always MIN_MATCH bytes ahead. If lookahead < MIN_MATCH
-                 * these bytes are garbage, but it does not matter since the
-                 * next lookahead bytes will always be emitted as literals.
-                 */
-            } while (--prev_length != 0);
-            match_available = 0;
-            match_length = MIN_MATCH-1;
-            strstart++;
-            if (flush) FLUSH_BLOCK(0), block_start = strstart;
-
-        } else if (match_available) {
-            /* If there was no match at the previous position, output a
-             * single literal. If there was a match but the current match
-             * is longer, truncate the previous match to a single literal.
-             */
-            Tracevv((stderr,"%c",window[strstart-1]));
-            if (ct_tally (0, window[strstart-1])) {
-                FLUSH_BLOCK(0), block_start = strstart;
-            }
-            strstart++;
-            lookahead--;
-        } else {
-            /* There is no previous match to compare with, wait for
-             * the next step to decide.
-             */
-            match_available = 1;
-            strstart++;
-            lookahead--;
-        }
-        Assert (strstart <= isize && lookahead <= isize, "a bit too far");
-
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the next match, plus MIN_MATCH bytes to insert the
-         * string following the next match.
-         */
-        while (lookahead < MIN_LOOKAHEAD && !eofile) fill_window();
-    }
-    if (match_available) ct_tally (0, window[strstart-1]);
-
-    return FLUSH_BLOCK(1); /* eof */
+        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
+                 * dictionary, and set hash_head to the head of the hash chain:
+                 */
+                INSERT_STRING(strstart, hash_head);
+
+                /* Find the longest match, discarding those <= prev_length.
+                 */
+                prev_length = match_length, prev_match = match_start;
+                match_length = MIN_MATCH - 1;
+
+                if (hash_head != NIL && prev_length < max_lazy_match &&
+                        strstart - hash_head <= MAX_DIST) {
+                        /* To simplify the code, we prevent matches with the string
+                         * of window index 0 (in particular we have to avoid a match
+                         * of the string with itself at the start of the input file).
+                         */
+                        match_length = longest_match(hash_head);
+                        /* longest_match() sets match_start */
+                        if (match_length > lookahead)
+                                match_length = lookahead;
+
+                        /* Ignore a length 3 match if it is too distant: */
+                        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.
+                                 */
+                                match_length--;
+                        }
+                }
+                /* If there was a match at the previous step and the current
+                 * match is not better, output the previous match:
+                 */
+                if (prev_length >= MIN_MATCH && match_length <= prev_length) {
+
+                        check_match(strstart - 1, prev_match, prev_length);
+
+                        flush =
+                                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.
+                         */
+                        lookahead -= prev_length - 1;
+                        prev_length -= 2;
+                        do {
+                                strstart++;
+                                INSERT_STRING(strstart, hash_head);
+                                /* strstart never exceeds WSIZE-MAX_MATCH, so there are
+                                 * always MIN_MATCH bytes ahead. If lookahead < MIN_MATCH
+                                 * these bytes are garbage, but it does not matter since the
+                                 * next lookahead bytes will always be emitted as literals.
+                                 */
+                        } while (--prev_length != 0);
+                        match_available = 0;
+                        match_length = MIN_MATCH - 1;
+                        strstart++;
+                        if (flush)
+                                FLUSH_BLOCK(0), block_start = strstart;
+
+                } else if (match_available) {
+                        /* If there was no match at the previous position, output a
+                         * single literal. If there was a match but the current match
+                         * is longer, truncate the previous match to a single literal.
+                         */
+                        Tracevv((stderr, "%c", window[strstart - 1]));
+                        if (ct_tally(0, window[strstart - 1])) {
+                                FLUSH_BLOCK(0), block_start = strstart;
+                        }
+                        strstart++;
+                        lookahead--;
+                } else {
+                        /* There is no previous match to compare with, wait for
+                         * the next step to decide.
+                         */
+                        match_available = 1;
+                        strstart++;
+                        lookahead--;
+                }
+                Assert(strstart <= isize && lookahead <= isize, "a bit too far");
+
+                /* Make sure that we always have enough lookahead, except
+                 * at the end of the input file. We need MAX_MATCH bytes
+                 * for the next match, plus MIN_MATCH bytes to insert the
+                 * string following the next match.
+                 */
+                while (lookahead < MIN_LOOKAHEAD && !eofile)
+                        fill_window();
+        }
+        if (match_available)
+                ct_tally(0, window[strstart - 1]);
+
+        return FLUSH_BLOCK(1);          /* eof */
 }
+
 /* gzip (GNU zip) -- compress files with zip algorithm and 'compress' interface
  * Copyright (C) 1992-1993 Jean-loup Gailly
  * The unzip code was written and put in the public domain by Mark Adler.
@@ -1611,29 +1646,33 @@ ulg deflate()
 #if defined(STDC_HEADERS) || !defined(NO_STDLIB_H)
 #  include <stdlib.h>
 #else
-   extern int errno;
+extern int errno;
 #endif
 
 #if defined(DIRENT)
 #  include <dirent.h>
-   typedef struct dirent dir_type;
+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 <sys/dir.h>
-     typedef struct direct dir_type;
+typedef struct direct dir_type;
+
 #    define DIR_OPT "SYSDIR"
 #  else
 #    ifdef SYSNDIR
 #      include <sys/ndir.h>
-       typedef struct direct dir_type;
+typedef struct direct dir_type;
+
 #      define DIR_OPT "SYSNDIR"
 #    else
 #      ifdef NDIR
 #        include <ndir.h>
-         typedef struct direct dir_type;
+typedef struct direct dir_type;
+
 #        define DIR_OPT "NDIR"
 #      else
 #        define NO_DIR
@@ -1652,10 +1691,11 @@ ulg deflate()
 #      include <sys/utime.h>
 #      define TIME_OPT "SYS_UTIME"
 #    else
-       struct utimbuf {
-         time_t actime;
-         time_t modtime;
-       };
+struct utimbuf {
+        time_t actime;
+        time_t modtime;
+};
+
 #      define TIME_OPT ""
 #    endif
 #  endif
@@ -1670,10 +1710,10 @@ ulg deflate()
 #  define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
 #endif
 
-typedef RETSIGTYPE (*sig_type) OF((int));
+typedef RETSIGTYPE(*sig_type) OF((int));
 
 #ifndef O_BINARY
-#  define  O_BINARY  0  /* creation mode for open() */
+#  define  O_BINARY  0                  /* creation mode for open() */
 #endif
 
 #ifndef O_CREAT
@@ -1693,10 +1733,10 @@ typedef RETSIGTYPE (*sig_type) OF((int));
 #ifndef S_IWUSR
 #  define S_IWUSR 0200
 #endif
-#define RW_USER (S_IRUSR | S_IWUSR)  /* creation mode for open() */
+#define RW_USER (S_IRUSR | S_IWUSR)     /* creation mode for open() */
 
 #ifndef MAX_PATH_LEN
-#  define MAX_PATH_LEN   1024 /* max pathname length */
+#  define MAX_PATH_LEN   1024   /* max pathname length */
 #endif
 
 #ifndef SEEK_END
@@ -1704,8 +1744,8 @@ typedef RETSIGTYPE (*sig_type) OF((int));
 #endif
 
 #ifdef NO_OFF_T
-  typedef long off_t;
-  off_t lseek OF((int fd, off_t offset, int whence));
+typedef long off_t;
+off_t lseek OF((int fd, off_t offset, int whence));
 #endif
 
 /* Separator for file name parts (see shorten_name()) */
@@ -1717,48 +1757,48 @@ typedef RETSIGTYPE (*sig_type) OF((int));
 
                 /* 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);
+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);
+DECLARE(ush, tab_prefix, 1L << BITS);
 #else
-    DECLARE(ush, tab_prefix0, 1L<<(BITS-1));
-    DECLARE(ush, tab_prefix1, 1L<<(BITS-1));
+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 **args = NULL;   /* argv pointer if GZIP env variable defined */
-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 */
+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 **args = NULL;                             /* argv pointer if GZIP env variable defined */
+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 */
 
@@ -1768,148 +1808,148 @@ unsigned outcnt;           /* bytes in output buffer */
 // int main (argc, argv)
 //    int argc;
 //    char **argv;
-int gzip_main(int argc, char ** argv)
+int gzip_main(int argc, char **argv)
 {
-    int result;
-    int inFileNum;
-    int outFileNum;
-    struct stat statBuf;
-    char* delFileName; 
-    int tostdout = 0;
-    int fromstdin = 0;
-
-    if (argc==1)
-        usage(gzip_usage);
-
-    /* Parse any options */
-    while (--argc > 0 && **(++argv) == '-') {
-        if (*((*argv)+1) == '\0') {
-            fromstdin = 1;
-            tostdout = 1;
-        }
-        while (*(++(*argv))) {
-            switch (**argv) {
-            case 'c':
-                tostdout = 1;
-                break;
-            default:
+        int result;
+        int inFileNum;
+        int outFileNum;
+        struct stat statBuf;
+        char *delFileName;
+        int tostdout = 0;
+        int fromstdin = 0;
+
+        if (argc == 1)
                 usage(gzip_usage);
-            }
+
+        /* Parse any options */
+        while (--argc > 0 && **(++argv) == '-') {
+                if (*((*argv) + 1) == '\0') {
+                        fromstdin = 1;
+                        tostdout = 1;
+                }
+                while (*(++(*argv))) {
+                        switch (**argv) {
+                        case 'c':
+                                tostdout = 1;
+                                break;
+                        default:
+                                usage(gzip_usage);
+                        }
+                }
         }
-    }
 
-    foreground = signal(SIGINT, SIG_IGN) != SIG_IGN;
-    if (foreground) {
-        (void) signal (SIGINT, (sig_type)abort_gzip);
-    }
+        foreground = signal(SIGINT, SIG_IGN) != SIG_IGN;
+        if (foreground) {
+                (void) signal(SIGINT, (sig_type) abort_gzip);
+        }
 #ifdef SIGTERM
-    if (signal(SIGTERM, SIG_IGN) != SIG_IGN) {
-        (void) signal(SIGTERM, (sig_type)abort_gzip);
-    }
+        if (signal(SIGTERM, SIG_IGN) != SIG_IGN) {
+                (void) signal(SIGTERM, (sig_type) abort_gzip);
+        }
 #endif
 #ifdef SIGHUP
-    if (signal(SIGHUP, SIG_IGN) != SIG_IGN) {
-        (void) signal(SIGHUP,  (sig_type)abort_gzip);
-    }
+        if (signal(SIGHUP, SIG_IGN) != SIG_IGN) {
+                (void) signal(SIGHUP, (sig_type) abort_gzip);
+        }
 #endif
 
-    strncpy(z_suffix, Z_SUFFIX, sizeof(z_suffix)-1);
-    z_len = strlen(z_suffix);
+        strncpy(z_suffix, Z_SUFFIX, sizeof(z_suffix) - 1);
+        z_len = strlen(z_suffix);
 
-    /* Allocate all global buffers (for DYN_ALLOC option) */
-    ALLOC(uch, inbuf,  INBUFSIZ +INBUF_EXTRA);
-    ALLOC(uch, outbuf, OUTBUFSIZ+OUTBUF_EXTRA);
-    ALLOC(ush, d_buf,  DIST_BUFSIZE);
-    ALLOC(uch, window, 2L*WSIZE);
+        /* Allocate all global buffers (for DYN_ALLOC option) */
+        ALLOC(uch, inbuf, INBUFSIZ + INBUF_EXTRA);
+        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);
+        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");
-
-        inFileNum=fileno(stdin);
-        time_stamp = 0; /* time unknown by default */
-        ifile_size = -1L; /* convention for unknown size */
-    } 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);
-            do_exit(WARNING);
-        }
-        /* Get the time stamp on the input file. */
-        result = stat(ifname, &statBuf);
-        if (result < 0) {
-            perror(ifname);
-            do_exit(WARNING);
+        ALLOC(ush, tab_prefix0, 1L << (BITS - 1));
+        ALLOC(ush, tab_prefix1, 1L << (BITS - 1));
+#endif
+
+        if (fromstdin == 1) {
+                strcpy(ofname, "stdin");
+
+                inFileNum = fileno(stdin);
+                time_stamp = 0;                 /* time unknown by default */
+                ifile_size = -1L;               /* convention for unknown size */
+        } 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);
+                        do_exit(WARNING);
+                }
+                /* Get the time stamp on the input file. */
+                result = stat(ifname, &statBuf);
+                if (result < 0) {
+                        perror(ifname);
+                        do_exit(WARNING);
+                }
+                time_stamp = statBuf.st_ctime;
+                ifile_size = statBuf.st_size;
         }
-        time_stamp = statBuf.st_ctime;
-        ifile_size = statBuf.st_size;
-    }
 
 
-    if (tostdout==1) {
-        /* And get to work */
-        strcpy(ofname, "stdout");
-        outFileNum=fileno(stdout);
-        SET_BINARY_MODE(fileno(stdout));
+        if (tostdout == 1) {
+                /* And get to work */
+                strcpy(ofname, "stdout");
+                outFileNum = fileno(stdout);
+                SET_BINARY_MODE(fileno(stdout));
 
-        clear_bufs(); /* clear input and output buffers */
-        part_nb = 0;
+                clear_bufs();                   /* clear input and output buffers */
+                part_nb = 0;
 
-        /* Actually do the compression/decompression. */
-        zip(inFileNum, outFileNum);
+                /* Actually do the compression/decompression. */
+                zip(inFileNum, outFileNum);
 
-    } else {
+        } else {
 
-        /* And get to work */
-        strncpy(ofname, ifname, MAX_PATH_LEN-4);
-        strcat(ofname, ".gz");
+                /* And get to work */
+                strncpy(ofname, ifname, MAX_PATH_LEN - 4);
+                strcat(ofname, ".gz");
 
 
-        /* Open output fille */
+                /* Open output fille */
 #if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)
-        outFileNum=open( ofname, O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW);
+                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);
-            do_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);
+                outFileNum = open(ofname, O_RDWR | O_CREAT | O_EXCL);
+#endif
+                if (outFileNum < 0) {
+                        perror(ofname);
+                        do_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);
+                }
         }
-    }
 
-    do_exit(exit_code);
+        do_exit(exit_code);
 }
 
 /* trees.c -- output deflated data using Huffman coding
@@ -1998,14 +2038,16 @@ int gzip_main(int argc, char ** argv)
 /* number of codes used to transfer the bit lengths */
 
 
-local int near extra_lbits[LENGTH_CODES] /* extra bits for each length code */
-   = {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};
+local int near extra_lbits[LENGTH_CODES]        /* extra bits for each length code */
+        = { 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 };
 
-local int near extra_dbits[D_CODES] /* extra bits for each distance code */
-   = {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};
+local int near extra_dbits[D_CODES]     /* extra bits for each distance code */
+        = { 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 };
 
-local int near extra_blbits[BL_CODES]/* extra bits for each bit length code */
-   = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7};
+local int near extra_blbits[BL_CODES]   /* extra bits for each bit length code */
+= { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 7 };
 
 #define STORED_BLOCK 0
 #define STATIC_TREES 1
@@ -2047,32 +2089,24 @@ 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 {
-    union {
-        ush  freq;       /* frequency count */
-        ush  code;       /* bit string */
-    } fc;
-    union {
-        ush  dad;        /* father node in Huffman tree */
-        ush  len;        /* length of bit string */
-    } dl;
+ *//* Data structure describing a single value and its code string. */ typedef struct ct_data {
+        union {
+                ush freq;                               /* frequency count */
+                ush code;                               /* bit string */
+        } fc;
+        union {
+                ush dad;                                /* father node in Huffman tree */
+                ush len;                                /* length of bit string */
+        } dl;
 } ct_data;
 
 #define Freq fc.freq
@@ -2083,10 +2117,11 @@ typedef struct ct_data {
 #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 */
+local ct_data near dyn_ltree[HEAP_SIZE];        /* literal and length tree */
+local ct_data near dyn_dtree[2 * D_CODES + 1];  /* distance tree */
+
+local ct_data near static_ltree[L_CODES + 2];
 
-local ct_data near 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
  * The codes 286 and 287 are needed to build a canonical tree (see ct_init
@@ -2094,65 +2129,77 @@ local ct_data near static_ltree[L_CODES+2];
  */
 
 local ct_data near 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];
+local ct_data near 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 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 */
 } tree_desc;
 
 local tree_desc near l_desc =
-{dyn_ltree, static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS, 0};
+        { dyn_ltree, static_ltree, extra_lbits, LITERALS + 1, L_CODES,
+                MAX_BITS, 0 };
 
 local tree_desc near d_desc =
-{dyn_dtree, static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS, 0};
+        { 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};
+        { bl_tree, (ct_data near *) 0, extra_blbits, 0, BL_CODES, MAX_BL_BITS,
+                0 };
 
 
-local ush near bl_count[MAX_BITS+1];
+local ush near bl_count[MAX_BITS + 1];
+
 /* number of codes at each bit length for an optimal tree */
 
 local uch near bl_order[BL_CODES]
-   = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};
+= { 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 */
+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 */
+
 /* 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];
+local uch near 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];
+local uch length_code[MAX_MATCH - MIN_MATCH + 1];
+
 /* length code for each normalized match length (0 == MIN_MATCH) */
 
 local 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];
+
 /* First normalized length for each code (0 = MIN_MATCH) */
 
 local int near base_dist[D_CODES];
+
 /* First normalized distance for each code (0 = distance of 1) */
 
 #define l_buf inbuf
@@ -2160,62 +2207,65 @@ local int near base_dist[D_CODES];
 
 /* DECLARE(ush, d_buf, DIST_BUFSIZE); buffer for distances */
 
-local uch near flag_buf[(LIT_BUFSIZE/8)];
+local uch near 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 */
+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 */
+
 /* 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 */
+local ulg opt_len;                              /* bit length of current block with optimal trees */
+local ulg static_len;                   /* bit length of current block with static trees */
+
+local ulg compressed_len;               /* total bit length of compressed file */
 
-local ulg compressed_len; /* total bit length of compressed file */
+local ulg input_len;                    /* total byte length of input 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 */
+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 */
+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 */
+extern long block_start;                /* window offset of current block */
+extern unsigned near strstart;  /* window offset of current string */
 
 /* ===========================================================================
  * Local (static) routines in this file.
  */
 
-local void init_block     OF((void));
-local void pqdownheap     OF((ct_data near *tree, int k));
-local void gen_bitlen     OF((tree_desc near *desc));
-local void gen_codes      OF((ct_data near *tree, int max_code));
-local void build_tree     OF((tree_desc near *desc));
-local void scan_tree      OF((ct_data near *tree, int max_code));
-local void send_tree      OF((ct_data near *tree, int max_code));
-local int  build_bl_tree  OF((void));
+local void init_block OF((void));
+local void pqdownheap OF((ct_data near * tree, int k));
+local void gen_bitlen OF((tree_desc near * desc));
+local void gen_codes OF((ct_data near * tree, int max_code));
+local void build_tree OF((tree_desc near * desc));
+local void scan_tree OF((ct_data near * tree, int max_code));
+local void send_tree OF((ct_data near * tree, int max_code));
+local int build_bl_tree OF((void));
 local void send_all_trees OF((int lcodes, int dcodes, int blcodes));
-local void compress_block OF((ct_data near *ltree, ct_data near *dtree));
-local void set_file_type  OF((void));
+local void compress_block OF((ct_data near * ltree, ct_data near * dtree));
+local void set_file_type OF((void));
 
 
 #ifndef DEBUG
 #  define send_code(c, tree) send_bits(tree[c].Code, tree[c].Len)
    /* Send a code of the given tree. c and tree must not have side effects */
 
-#else /* DEBUG */
+#else                                                   /* DEBUG */
 #  define send_code(c, tree) \
      { if (verbose>1) fprintf(stderr,"\ncd %3d ",(c)); \
        send_bits(tree[c].Code, tree[c].Len); }
@@ -2237,75 +2287,81 @@ local void set_file_type  OF((void));
  * (DEFLATE/STORE).
  */
 void ct_init(attr, methodp)
-    ush  *attr;   /* pointer to internal file attribute */
-    int  *methodp; /* pointer to compression method */
+ush *attr;                                              /* pointer to internal file attribute */
+int *methodp;                                   /* pointer to compression method */
 {
-    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;
-        
-    if (static_dtree[0].Len != 0) return; /* ct_init already called */
-
-    /* Initialize the mapping length (0..255) -> length code (0..28) */
-    length = 0;
-    for (code = 0; code < LENGTH_CODES-1; code++) {
-        base_length[code] = length;
-        for (n = 0; n < (1<<extra_lbits[code]); n++) {
-            length_code[length++] = (uch)code;
-        }
-    }
-    Assert (length == 256, "ct_init: length != 256");
-    /* Note that the length 255 (match length 258) can be represented
-     * in two different ways: code 284 + 5 bits or code 285, so we
-     * overwrite length_code[255] to use the best encoding:
-     */
-    length_code[length-1] = (uch)code;
-
-    /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
-    dist = 0;
-    for (code = 0 ; code < 16; code++) {
-        base_dist[code] = dist;
-        for (n = 0; n < (1<<extra_dbits[code]); n++) {
-            dist_code[dist++] = (uch)code;
-        }
-    }
-    Assert (dist == 256, "ct_init: dist != 256");
-    dist >>= 7; /* from now on, all distances are divided by 128 */
-    for ( ; code < D_CODES; code++) {
-        base_dist[code] = dist << 7;
-        for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
-            dist_code[256 + dist++] = (uch)code;
-        }
-    }
-    Assert (dist == 256, "ct_init: 256+dist != 512");
-
-    /* Construct the codes of the static literal tree */
-    for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
-    n = 0;
-    while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++;
-    while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++;
-    while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++;
-    while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++;
-    /* Codes 286 and 287 do not exist, but we must include them in the
-     * tree construction to get a canonical Huffman tree (longest code
-     * all ones)
-     */
-    gen_codes((ct_data near *)static_ltree, L_CODES+1);
-
-    /* The static distance tree is trivial: */
-    for (n = 0; n < D_CODES; n++) {
-        static_dtree[n].Len = 5;
-        static_dtree[n].Code = bi_reverse(n, 5);
-    }
-
-    /* Initialize the first block of the first file: */
-    init_block();
+        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;
+
+        if (static_dtree[0].Len != 0)
+                return;                                 /* ct_init already called */
+
+        /* Initialize the mapping length (0..255) -> length code (0..28) */
+        length = 0;
+        for (code = 0; code < LENGTH_CODES - 1; code++) {
+                base_length[code] = length;
+                for (n = 0; n < (1 << extra_lbits[code]); n++) {
+                        length_code[length++] = (uch) code;
+                }
+        }
+        Assert(length == 256, "ct_init: length != 256");
+        /* Note that the length 255 (match length 258) can be represented
+         * in two different ways: code 284 + 5 bits or code 285, so we
+         * overwrite length_code[255] to use the best encoding:
+         */
+        length_code[length - 1] = (uch) code;
+
+        /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
+        dist = 0;
+        for (code = 0; code < 16; code++) {
+                base_dist[code] = dist;
+                for (n = 0; n < (1 << extra_dbits[code]); n++) {
+                        dist_code[dist++] = (uch) code;
+                }
+        }
+        Assert(dist == 256, "ct_init: dist != 256");
+        dist >>= 7;                                     /* from now on, all distances are divided by 128 */
+        for (; code < D_CODES; code++) {
+                base_dist[code] = dist << 7;
+                for (n = 0; n < (1 << (extra_dbits[code] - 7)); n++) {
+                        dist_code[256 + dist++] = (uch) code;
+                }
+        }
+        Assert(dist == 256, "ct_init: 256+dist != 512");
+
+        /* Construct the codes of the static literal tree */
+        for (bits = 0; bits <= MAX_BITS; bits++)
+                bl_count[bits] = 0;
+        n = 0;
+        while (n <= 143)
+                static_ltree[n++].Len = 8, bl_count[8]++;
+        while (n <= 255)
+                static_ltree[n++].Len = 9, bl_count[9]++;
+        while (n <= 279)
+                static_ltree[n++].Len = 7, bl_count[7]++;
+        while (n <= 287)
+                static_ltree[n++].Len = 8, bl_count[8]++;
+        /* Codes 286 and 287 do not exist, but we must include them in the
+         * tree construction to get a canonical Huffman tree (longest code
+         * all ones)
+         */
+        gen_codes((ct_data near *) static_ltree, L_CODES + 1);
+
+        /* The static distance tree is trivial: */
+        for (n = 0; n < D_CODES; n++) {
+                static_dtree[n].Len = 5;
+                static_dtree[n].Code = bi_reverse(n, 5);
+        }
+
+        /* Initialize the first block of the first file: */
+        init_block();
 }
 
 /* ===========================================================================
@@ -2313,17 +2369,21 @@ void ct_init(attr, methodp)
  */
 local void init_block()
 {
-    int n; /* iterates over tree elements */
-
-    /* Initialize the trees. */
-    for (n = 0; n < L_CODES;  n++) dyn_ltree[n].Freq = 0;
-    for (n = 0; n < D_CODES;  n++) dyn_dtree[n].Freq = 0;
-    for (n = 0; n < BL_CODES; n++) bl_tree[n].Freq = 0;
-
-    dyn_ltree[END_BLOCK].Freq = 1;
-    opt_len = static_len = 0L;
-    last_lit = last_dist = last_flags = 0;
-    flags = 0; flag_bit = 1;
+        int n;                                          /* iterates over tree elements */
+
+        /* Initialize the trees. */
+        for (n = 0; n < L_CODES; n++)
+                dyn_ltree[n].Freq = 0;
+        for (n = 0; n < D_CODES; n++)
+                dyn_dtree[n].Freq = 0;
+        for (n = 0; n < BL_CODES; n++)
+                bl_tree[n].Freq = 0;
+
+        dyn_ltree[END_BLOCK].Freq = 1;
+        opt_len = static_len = 0L;
+        last_lit = last_dist = last_flags = 0;
+        flags = 0;
+        flag_bit = 1;
 }
 
 #define SMALLEST 1
@@ -2356,25 +2416,29 @@ local void init_block()
  * two sons).
  */
 local void pqdownheap(tree, k)
-    ct_data near *tree;  /* the tree to restore */
-    int k;               /* node to move down */
+ct_data near *tree;                             /* the tree to restore */
+int k;                                                  /* node to move down */
 {
-    int v = heap[k];
-    int j = k << 1;  /* left son of k */
-    while (j <= heap_len) {
-        /* Set j to the smallest of the two sons: */
-        if (j < heap_len && smaller(tree, heap[j+1], heap[j])) j++;
-
-        /* Exit if v is smaller than both sons */
-        if (smaller(tree, v, heap[j])) break;
-
-        /* Exchange v with the smallest son */
-        heap[k] = heap[j];  k = j;
-
-        /* And continue down the tree, setting j to the left son of k */
-        j <<= 1;
-    }
-    heap[k] = v;
+        int v = heap[k];
+        int j = k << 1;                         /* left son of k */
+
+        while (j <= heap_len) {
+                /* Set j to the smallest of the two sons: */
+                if (j < heap_len && smaller(tree, heap[j + 1], heap[j]))
+                        j++;
+
+                /* Exit if v is smaller than both sons */
+                if (smaller(tree, v, heap[j]))
+                        break;
+
+                /* Exchange v with the smallest son */
+                heap[k] = heap[j];
+                k = j;
+
+                /* And continue down the tree, setting j to the left son of k */
+                j <<= 1;
+        }
+        heap[k] = v;
 }
 
 /* ===========================================================================
@@ -2388,80 +2452,93 @@ local void pqdownheap(tree, k)
  *     not null.
  */
 local void gen_bitlen(desc)
-    tree_desc near *desc; /* the tree descriptor */
+tree_desc near *desc;                   /* the tree descriptor */
 {
-    ct_data near *tree  = desc->dyn_tree;
-    int near *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 */
-
-    for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
-
-    /* In a first pass, compute the optimal bit lengths (which may
-     * overflow in the case of the bit length tree).
-     */
-    tree[heap[heap_max]].Len = 0; /* root of the heap */
-
-    for (h = heap_max+1; h < HEAP_SIZE; h++) {
-        n = heap[h];
-        bits = tree[tree[n].Dad].Len + 1;
-        if (bits > max_length) bits = max_length, overflow++;
-        tree[n].Len = (ush)bits;
-        /* We overwrite tree[n].Dad which is no longer needed */
-
-        if (n > max_code) continue; /* not a leaf node */
-
-        bl_count[bits]++;
-        xbits = 0;
-        if (n >= base) xbits = extra[n-base];
-        f = tree[n].Freq;
-        opt_len += (ulg)f * (bits + xbits);
-        if (stree) static_len += (ulg)f * (stree[n].Len + xbits);
-    }
-    if (overflow == 0) return;
-
-    Trace((stderr,"\nbit length overflow\n"));
-    /* This happens for example on obj2 and pic of the Calgary corpus */
-
-    /* Find the first bit length which could increase: */
-    do {
-        bits = max_length-1;
-        while (bl_count[bits] == 0) bits--;
-        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,
-         * but this does not affect bl_count[max_length]
-         */
-        overflow -= 2;
-    } while (overflow > 0);
-
-    /* Now recompute all bit lengths, scanning in increasing frequency.
-     * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
-     * lengths instead of fixing only the wrong ones. This idea is taken
-     * from 'ar' written by Haruhiko Okumura.)
-     */
-    for (bits = max_length; bits != 0; bits--) {
-        n = bl_count[bits];
-        while (n != 0) {
-            m = heap[--h];
-            if (m > max_code) continue;
-            if (tree[m].Len != (unsigned) bits) {
-                Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
-                opt_len += ((long)bits-(long)tree[m].Len)*(long)tree[m].Freq;
-                tree[m].Len = (ush)bits;
-            }
-            n--;
-        }
-    }
+        ct_data near *tree = desc->dyn_tree;
+        int near *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 */
+
+        for (bits = 0; bits <= MAX_BITS; bits++)
+                bl_count[bits] = 0;
+
+        /* In a first pass, compute the optimal bit lengths (which may
+         * overflow in the case of the bit length tree).
+         */
+        tree[heap[heap_max]].Len = 0;   /* root of the heap */
+
+        for (h = heap_max + 1; h < HEAP_SIZE; h++) {
+                n = heap[h];
+                bits = tree[tree[n].Dad].Len + 1;
+                if (bits > max_length)
+                        bits = max_length, overflow++;
+                tree[n].Len = (ush) bits;
+                /* We overwrite tree[n].Dad which is no longer needed */
+
+                if (n > max_code)
+                        continue;                       /* not a leaf node */
+
+                bl_count[bits]++;
+                xbits = 0;
+                if (n >= base)
+                        xbits = extra[n - base];
+                f = tree[n].Freq;
+                opt_len += (ulg) f *(bits + xbits);
+
+                if (stree)
+                        static_len += (ulg) f *(stree[n].Len + xbits);
+        }
+        if (overflow == 0)
+                return;
+
+        Trace((stderr, "\nbit length overflow\n"));
+        /* This happens for example on obj2 and pic of the Calgary corpus */
+
+        /* Find the first bit length which could increase: */
+        do {
+                bits = max_length - 1;
+                while (bl_count[bits] == 0)
+                        bits--;
+                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,
+                 * but this does not affect bl_count[max_length]
+                 */
+                overflow -= 2;
+        } while (overflow > 0);
+
+        /* Now recompute all bit lengths, scanning in increasing frequency.
+         * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
+         * lengths instead of fixing only the wrong ones. This idea is taken
+         * from 'ar' written by Haruhiko Okumura.)
+         */
+        for (bits = max_length; bits != 0; bits--) {
+                n = bl_count[bits];
+                while (n != 0) {
+                        m = heap[--h];
+                        if (m > max_code)
+                                continue;
+                        if (tree[m].Len != (unsigned) bits) {
+                                Trace(
+                                          (stderr, "code %d bits %d->%d\n", m, tree[m].Len,
+                                           bits));
+                                opt_len +=
+                                        ((long) bits -
+                                         (long) tree[m].Len) * (long) tree[m].Freq;
+                                tree[m].Len = (ush) bits;
+                        }
+                        n--;
+                }
+        }
 }
 
 /* ===========================================================================
@@ -2472,37 +2549,41 @@ local void gen_bitlen(desc)
  * 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 */
+local void gen_codes(tree, max_code)
+ct_data near *tree;                             /* the tree to decorate */
+int max_code;                                   /* largest code with non zero frequency */
 {
-    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 */
-
-    /* The distribution counts are first used to generate the code values
-     * without bit reversal.
-     */
-    for (bits = 1; bits <= MAX_BITS; bits++) {
-        next_code[bits] = code = (code + bl_count[bits-1]) << 1;
-    }
-    /* Check that the bit counts in bl_count are consistent. The last code
-     * must be all ones.
-     */
-    Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
-            "inconsistent bit counts");
-    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
-
-    for (n = 0;  n <= max_code; n++) {
-        int len = tree[n].Len;
-        if (len == 0) continue;
-        /* Now reverse the bits */
-        tree[n].Code = bi_reverse(next_code[len]++, len);
-
-        Tracec(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
-             n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
-    }
+        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 */
+
+        /* The distribution counts are first used to generate the code values
+         * without bit reversal.
+         */
+        for (bits = 1; bits <= MAX_BITS; bits++) {
+                next_code[bits] = code = (code + bl_count[bits - 1]) << 1;
+        }
+        /* Check that the bit counts in bl_count are consistent. The last code
+         * must be all ones.
+         */
+        Assert(code + bl_count[MAX_BITS] - 1 == (1 << MAX_BITS) - 1,
+                   "inconsistent bit counts");
+        Tracev((stderr, "\ngen_codes: max_code %d ", max_code));
+
+        for (n = 0; n <= max_code; n++) {
+                int len = tree[n].Len;
+
+                if (len == 0)
+                        continue;
+                /* Now reverse the bits */
+                tree[n].Code = bi_reverse(next_code[len]++, len);
+
+                Tracec(tree != static_ltree,
+                           (stderr, "\nn %3d %c l %2d c %4x (%x) ", n,
+                                (isgraph(n) ? n : ' '), len, tree[n].Code,
+                                next_code[len] - 1));
+        }
 }
 
 /* ===========================================================================
@@ -2514,84 +2595,89 @@ local void gen_codes (tree, max_code)
  *     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 */
+tree_desc near *desc;                   /* the tree descriptor */
 {
-    ct_data near *tree   = desc->dyn_tree;
-    ct_data near *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 */
-
-    /* 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].
-     * heap[0] is not used.
-     */
-    heap_len = 0, heap_max = HEAP_SIZE;
-
-    for (n = 0; n < elems; n++) {
-        if (tree[n].Freq != 0) {
-            heap[++heap_len] = max_code = n;
-            depth[n] = 0;
-        } else {
-            tree[n].Len = 0;
-        }
-    }
-
-    /* The pkzip format requires that at least one distance code exists,
-     * and that at least one bit should be sent even if there is only one
-     * possible code. So to avoid special checks later on we force at least
-     * two codes of non zero frequency.
-     */
-    while (heap_len < 2) {
-        int new = heap[++heap_len] = (max_code < 2 ? ++max_code : 0);
-        tree[new].Freq = 1;
-        depth[new] = 0;
-        opt_len--; if (stree) static_len -= stree[new].Len;
-        /* new is 0 or 1 so it does not have extra bits */
-    }
-    desc->max_code = max_code;
-
-    /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
-     * establish sub-heaps of increasing lengths:
-     */
-    for (n = heap_len/2; n >= 1; n--) pqdownheap(tree, n);
-
-    /* Construct the Huffman tree by repeatedly combining the least two
-     * frequent nodes.
-     */
-    do {
-        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;
-
-        /* Create a new node father of n and m */
-        tree[node].Freq = tree[n].Freq + tree[m].Freq;
-        depth[node] = (uch) (MAX(depth[n], depth[m]) + 1);
-        tree[n].Dad = tree[m].Dad = (ush)node;
+        ct_data near *tree = desc->dyn_tree;
+        ct_data near *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 */
+
+        /* 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].
+         * heap[0] is not used.
+         */
+        heap_len = 0, heap_max = HEAP_SIZE;
+
+        for (n = 0; n < elems; n++) {
+                if (tree[n].Freq != 0) {
+                        heap[++heap_len] = max_code = n;
+                        depth[n] = 0;
+                } else {
+                        tree[n].Len = 0;
+                }
+        }
+
+        /* The pkzip format requires that at least one distance code exists,
+         * and that at least one bit should be sent even if there is only one
+         * possible code. So to avoid special checks later on we force at least
+         * two codes of non zero frequency.
+         */
+        while (heap_len < 2) {
+                int new = heap[++heap_len] = (max_code < 2 ? ++max_code : 0);
+
+                tree[new].Freq = 1;
+                depth[new] = 0;
+                opt_len--;
+                if (stree)
+                        static_len -= stree[new].Len;
+                /* new is 0 or 1 so it does not have extra bits */
+        }
+        desc->max_code = max_code;
+
+        /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
+         * establish sub-heaps of increasing lengths:
+         */
+        for (n = heap_len / 2; n >= 1; n--)
+                pqdownheap(tree, n);
+
+        /* Construct the Huffman tree by repeatedly combining the least two
+         * frequent nodes.
+         */
+        do {
+                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;
+
+                /* Create a new node father of n and m */
+                tree[node].Freq = tree[n].Freq + tree[m].Freq;
+                depth[node] = (uch) (MAX(depth[n], depth[m]) + 1);
+                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);
-        }
+                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);
+                }
 #endif
-        /* and insert the new node in the heap */
-        heap[SMALLEST] = node++;
-        pqdownheap(tree, SMALLEST);
+                /* and insert the new node in the heap */
+                heap[SMALLEST] = node++;
+                pqdownheap(tree, SMALLEST);
 
-    } while (heap_len >= 2);
+        } while (heap_len >= 2);
 
-    heap[--heap_max] = heap[SMALLEST];
+        heap[--heap_max] = heap[SMALLEST];
 
-    /* At this point, the fields freq and dad are set. We can now
-     * generate the bit lengths.
-     */
-    gen_bitlen((tree_desc near *)desc);
+        /* At this point, the fields freq and dad are set. We can now
+         * generate the bit lengths.
+         */
+        gen_bitlen((tree_desc near *) desc);
 
-    /* The field len is now set, we can generate the bit codes */
-    gen_codes ((ct_data near *)tree, max_code);
+        /* The field len is now set, we can generate the bit codes */
+        gen_codes((ct_data near *) tree, max_code);
 }
 
 /* ===========================================================================
@@ -2600,94 +2686,107 @@ local void build_tree(desc)
  * 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 */
+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 */
 {
-    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 */
-
-    if (nextlen == 0) max_count = 138, min_count = 3;
-    tree[max_code+1].Len = (ush)0xffff; /* guard */
-
-    for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
-        if (++count < max_count && curlen == nextlen) {
-            continue;
-        } else if (count < min_count) {
-            bl_tree[curlen].Freq += count;
-        } else if (curlen != 0) {
-            if (curlen != prevlen) bl_tree[curlen].Freq++;
-            bl_tree[REP_3_6].Freq++;
-        } else if (count <= 10) {
-            bl_tree[REPZ_3_10].Freq++;
-        } else {
-            bl_tree[REPZ_11_138].Freq++;
-        }
-        count = 0; prevlen = curlen;
-        if (nextlen == 0) {
-            max_count = 138, min_count = 3;
-        } else if (curlen == nextlen) {
-            max_count = 6, min_count = 3;
-        } else {
-            max_count = 7, min_count = 4;
-        }
-    }
+        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 */
+
+        if (nextlen == 0)
+                max_count = 138, min_count = 3;
+        tree[max_code + 1].Len = (ush) 0xffff;  /* guard */
+
+        for (n = 0; n <= max_code; n++) {
+                curlen = nextlen;
+                nextlen = tree[n + 1].Len;
+                if (++count < max_count && curlen == nextlen) {
+                        continue;
+                } else if (count < min_count) {
+                        bl_tree[curlen].Freq += count;
+                } else if (curlen != 0) {
+                        if (curlen != prevlen)
+                                bl_tree[curlen].Freq++;
+                        bl_tree[REP_3_6].Freq++;
+                } else if (count <= 10) {
+                        bl_tree[REPZ_3_10].Freq++;
+                } else {
+                        bl_tree[REPZ_11_138].Freq++;
+                }
+                count = 0;
+                prevlen = curlen;
+                if (nextlen == 0) {
+                        max_count = 138, min_count = 3;
+                } else if (curlen == nextlen) {
+                        max_count = 6, min_count = 3;
+                } else {
+                        max_count = 7, min_count = 4;
+                }
+        }
 }
 
 /* ===========================================================================
  * 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 */
+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 */
 {
-    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 */
-
-    /* tree[max_code+1].Len = -1; */  /* guard already set */
-    if (nextlen == 0) max_count = 138, min_count = 3;
-
-    for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
-        if (++count < max_count && curlen == nextlen) {
-            continue;
-        } else if (count < min_count) {
-            do { send_code(curlen, bl_tree); } while (--count != 0);
-
-        } else if (curlen != 0) {
-            if (curlen != prevlen) {
-                send_code(curlen, bl_tree); count--;
-            }
-            Assert(count >= 3 && count <= 6, " 3_6?");
-            send_code(REP_3_6, bl_tree); send_bits(count-3, 2);
-
-        } else if (count <= 10) {
-            send_code(REPZ_3_10, bl_tree); send_bits(count-3, 3);
-
-        } else {
-            send_code(REPZ_11_138, bl_tree); send_bits(count-11, 7);
-        }
-        count = 0; prevlen = curlen;
-        if (nextlen == 0) {
-            max_count = 138, min_count = 3;
-        } else if (curlen == nextlen) {
-            max_count = 6, min_count = 3;
-        } else {
-            max_count = 7, min_count = 4;
-        }
-    }
+        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 */
+
+/* tree[max_code+1].Len = -1; *//* guard already set */
+        if (nextlen == 0)
+                max_count = 138, min_count = 3;
+
+        for (n = 0; n <= max_code; n++) {
+                curlen = nextlen;
+                nextlen = tree[n + 1].Len;
+                if (++count < max_count && curlen == nextlen) {
+                        continue;
+                } else if (count < min_count) {
+                        do {
+                                send_code(curlen, bl_tree);
+                        } while (--count != 0);
+
+                } else if (curlen != 0) {
+                        if (curlen != prevlen) {
+                                send_code(curlen, bl_tree);
+                                count--;
+                        }
+                        Assert(count >= 3 && count <= 6, " 3_6?");
+                        send_code(REP_3_6, bl_tree);
+                        send_bits(count - 3, 2);
+
+                } else if (count <= 10) {
+                        send_code(REPZ_3_10, bl_tree);
+                        send_bits(count - 3, 3);
+
+                } else {
+                        send_code(REPZ_11_138, bl_tree);
+                        send_bits(count - 11, 7);
+                }
+                count = 0;
+                prevlen = curlen;
+                if (nextlen == 0) {
+                        max_count = 138, min_count = 3;
+                } else if (curlen == nextlen) {
+                        max_count = 6, min_count = 3;
+                } else {
+                        max_count = 7, min_count = 4;
+                }
+        }
 }
 
 /* ===========================================================================
@@ -2696,30 +2795,33 @@ local void send_tree (tree, max_code)
  */
 local int build_bl_tree()
 {
-    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);
-
-    /* Build the bit length tree: */
-    build_tree((tree_desc near *)(&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.
-     */
-
-    /* Determine the number of bit length codes to send. The pkzip format
-     * requires that at least 4 bit length codes be sent. (appnote.txt says
-     * 3 but the actual value used is 4.)
-     */
-    for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {
-        if (bl_tree[bl_order[max_blindex]].Len != 0) break;
-    }
-    /* 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));
-
-    return max_blindex;
+        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);
+
+        /* Build the bit length tree: */
+        build_tree((tree_desc near *) (&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.
+         */
+
+        /* Determine the number of bit length codes to send. The pkzip format
+         * requires that at least 4 bit length codes be sent. (appnote.txt says
+         * 3 but the actual value used is 4.)
+         */
+        for (max_blindex = BL_CODES - 1; max_blindex >= 3; max_blindex--) {
+                if (bl_tree[bl_order[max_blindex]].Len != 0)
+                        break;
+        }
+        /* 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));
+
+        return max_blindex;
 }
 
 /* ===========================================================================
@@ -2728,28 +2830,29 @@ local int build_bl_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 */
+int lcodes, dcodes, blcodes;    /* number of codes for each tree */
 {
-    int rank;                    /* index in bl_order */
-
-    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: "));
-    send_bits(lcodes-257, 5); /* not +255 as stated in appnote.txt */
-    send_bits(dcodes-1,   5);
-    send_bits(blcodes-4,  4); /* not -3 as stated in appnote.txt */
-    for (rank = 0; rank < blcodes; rank++) {
-        Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
-        send_bits(bl_tree[bl_order[rank]].Len, 3);
-    }
-    Tracev((stderr, "\nbl tree: sent %ld", bits_sent));
-
-    send_tree((ct_data near *)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 */
-    Tracev((stderr, "\ndist tree: sent %ld", bits_sent));
+        int rank;                                       /* index in bl_order */
+
+        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: "));
+        send_bits(lcodes - 257, 5);     /* not +255 as stated in appnote.txt */
+        send_bits(dcodes - 1, 5);
+        send_bits(blcodes - 4, 4);      /* not -3 as stated in appnote.txt */
+        for (rank = 0; rank < blcodes; rank++) {
+                Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
+                send_bits(bl_tree[bl_order[rank]].Len, 3);
+        }
+        Tracev((stderr, "\nbl tree: sent %ld", bits_sent));
+
+        send_tree((ct_data near *) 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 */
+        Tracev((stderr, "\ndist tree: sent %ld", bits_sent));
 }
 
 /* ===========================================================================
@@ -2758,204 +2861,222 @@ local void send_all_trees(lcodes, dcodes, blcodes)
  * 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 */
+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 */
 {
-    ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
-    int max_blindex;  /* index of last bit length code of non zero freq */
-
-    flag_buf[last_flags] = flags; /* Save the flags for the last 8 items */
-
-     /* Check if the file is ascii or binary */
-    if (*file_type == (ush)UNKNOWN) set_file_type();
-
-    /* Construct the literal and distance trees */
-    build_tree((tree_desc near *)(&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));
-    /* At this point, opt_len and static_len are the total bit lengths of
-     * the compressed block data, excluding the tree representations.
-     */
-
-    /* Build the bit length tree for the above two trees, and get the index
-     * in bl_order of the last bit length code to send.
-     */
-    max_blindex = build_bl_tree();
-
-    /* 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, "\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));
-
-    if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
-
-    /* If compression failed and this is the first and last block,
-     * and if the zip file can be seeked (to rewrite the local header),
-     * the whole file is transformed into a stored file:
-     */
+        ulg opt_lenb, static_lenb;      /* opt_len and static_len in bytes */
+        int max_blindex;                        /* index of last bit length code of non zero freq */
+
+        flag_buf[last_flags] = flags;   /* Save the flags for the last 8 items */
+
+        /* Check if the file is ascii or binary */
+        if (*file_type == (ush) UNKNOWN)
+                set_file_type();
+
+        /* Construct the literal and distance trees */
+        build_tree((tree_desc near *) (&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));
+        /* At this point, opt_len and static_len are the total bit lengths of
+         * the compressed block data, excluding the tree representations.
+         */
+
+        /* Build the bit length tree for the above two trees, and get the index
+         * in bl_order of the last bit length code to send.
+         */
+        max_blindex = build_bl_tree();
+
+        /* 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,
+                   "\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));
+
+        if (static_lenb <= opt_lenb)
+                opt_lenb = static_lenb;
+
+        /* If compression failed and this is the first and last block,
+         * 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()) {
+        if (stored_len <= opt_lenb && eof && compressed_len == 0L
+                && seekable()) {
 #endif
-        /* Since LIT_BUFSIZE <= 2*WSIZE, the input data must be there: */
-        if (buf == (char*)0) error ("block vanished");
+                /* Since LIT_BUFSIZE <= 2*WSIZE, the input data must be there: */
+                if (buf == (char *) 0)
+                        error("block vanished");
 
-        copy_block(buf, (unsigned)stored_len, 0); /* without header */
-        compressed_len = stored_len << 3;
-        *file_method = STORED;
+                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 */
+        } 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
-         * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
-         * transform a block into a stored block.
-         */
-        send_bits((STORED_BLOCK<<1)+eof, 3);  /* send block type */
-        compressed_len = (compressed_len + 3 + 7) & ~7L;
-        compressed_len += (stored_len + 4) << 3;
+                /* 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
+                 * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
+                 * transform a block into a stored block.
+                 */
+                send_bits((STORED_BLOCK << 1) + eof, 3);        /* send block type */
+                compressed_len = (compressed_len + 3 + 7) & ~7L;
+                compressed_len += (stored_len + 4) << 3;
 
-        copy_block(buf, (unsigned)stored_len, 1); /* with header */
+                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);
-        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);
-        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 */
-    }
-    Tracev((stderr,"\ncomprlen %lu(%lu) ", compressed_len>>3,
-           compressed_len-7*eof));
-
-    return compressed_len >> 3;
+        } 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);
+                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);
+                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 */
+        }
+        Tracev((stderr, "\ncomprlen %lu(%lu) ", compressed_len >> 3,
+                        compressed_len - 7 * eof));
+
+        return compressed_len >> 3;
 }
 
 /* ===========================================================================
  * 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) */
+int ct_tally(dist, lc)
+int dist;                                               /* distance of matched string */
+int lc;                                                 /* match length-MIN_MATCH or unmatched char (if dist==0) */
 {
-    l_buf[last_lit++] = (uch)lc;
-    if (dist == 0) {
-        /* lc is the unmatched char */
-        dyn_ltree[lc].Freq++;
-    } else {
-        /* Here, lc is the match length - MIN_MATCH */
-        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");
-
-        dyn_ltree[length_code[lc]+LITERALS+1].Freq++;
-        dyn_dtree[d_code(dist)].Freq++;
-
-        d_buf[last_dist++] = (ush)dist;
-        flags |= flag_bit;
-    }
-    flag_bit <<= 1;
-
-    /* Output the flags if they fill a byte: */
-    if ((last_lit & 7) == 0) {
-        flag_buf[last_flags++] = flags;
-        flags = 0, flag_bit = 1;
-    }
-    /* Try to guess if it is profitable to stop the current block here */
-    if ((last_lit & 0xfff) == 0) {
-        /* Compute an upper bound for the compressed length */
-        ulg out_length = (ulg)last_lit*8L;
-        ulg in_length = (ulg)strstart-block_start;
-        int dcode;
-        for (dcode = 0; dcode < D_CODES; dcode++) {
-            out_length += (ulg)dyn_dtree[dcode].Freq*(5L+extra_dbits[dcode]);
-        }
-        out_length >>= 3;
-        Trace((stderr,"\nlast_lit %u, last_dist %u, in %ld, out ~%ld(%ld%%) ",
-               last_lit, last_dist, in_length, out_length,
-               100L - out_length*100L/in_length));
-        if (last_dist < last_lit/2 && out_length < in_length/2) return 1;
-    }
-    return (last_lit == LIT_BUFSIZE-1 || last_dist == DIST_BUFSIZE);
-    /* We avoid equality with LIT_BUFSIZE because of wraparound at 64K
-     * on 16 bit machines and because stored blocks are restricted to
-     * 64K-1 bytes.
-     */
+        l_buf[last_lit++] = (uch) lc;
+        if (dist == 0) {
+                /* lc is the unmatched char */
+                dyn_ltree[lc].Freq++;
+        } else {
+                /* Here, lc is the match length - MIN_MATCH */
+                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");
+
+                dyn_ltree[length_code[lc] + LITERALS + 1].Freq++;
+                dyn_dtree[d_code(dist)].Freq++;
+
+                d_buf[last_dist++] = (ush) dist;
+                flags |= flag_bit;
+        }
+        flag_bit <<= 1;
+
+        /* Output the flags if they fill a byte: */
+        if ((last_lit & 7) == 0) {
+                flag_buf[last_flags++] = flags;
+                flags = 0, flag_bit = 1;
+        }
+        /* Try to guess if it is profitable to stop the current block here */
+        if ((last_lit & 0xfff) == 0) {
+                /* Compute an upper bound for the compressed length */
+                ulg out_length = (ulg) last_lit * 8L;
+                ulg in_length = (ulg) strstart - block_start;
+                int dcode;
+
+                for (dcode = 0; dcode < D_CODES; dcode++) {
+                        out_length +=
+                                (ulg) dyn_dtree[dcode].Freq * (5L + extra_dbits[dcode]);
+                }
+                out_length >>= 3;
+                Trace(
+                          (stderr,
+                           "\nlast_lit %u, last_dist %u, in %ld, out ~%ld(%ld%%) ",
+                           last_lit, last_dist, in_length, out_length,
+                           100L - out_length * 100L / in_length));
+                if (last_dist < last_lit / 2 && out_length < in_length / 2)
+                        return 1;
+        }
+        return (last_lit == LIT_BUFSIZE - 1 || last_dist == DIST_BUFSIZE);
+        /* We avoid equality with LIT_BUFSIZE because of wraparound at 64K
+         * on 16 bit machines and because stored blocks are restricted to
+         * 64K-1 bytes.
+         */
 }
 
 /* ===========================================================================
  * 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 */
+ct_data near *ltree;                    /* literal tree */
+ct_data near *dtree;                    /* distance tree */
 {
-    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 {
-        if ((lx & 7) == 0) flag = flag_buf[fx++];
-        lc = l_buf[lx++];
-        if ((flag & 1) == 0) {
-            send_code(lc, ltree); /* send a literal byte */
-            Tracecv(isgraph(lc), (stderr," '%c' ", lc));
-        } else {
-            /* Here, lc is the match length - MIN_MATCH */
-            code = length_code[lc];
-            send_code(code+LITERALS+1, ltree); /* send the length code */
-            extra = extra_lbits[code];
-            if (extra != 0) {
-                lc -= base_length[code];
-                send_bits(lc, extra);        /* send the extra length bits */
-            }
-            dist = d_buf[dx++];
-            /* Here, dist is the match distance - 1 */
-            code = d_code(dist);
-            Assert (code < D_CODES, "bad d_code");
-
-            send_code(code, dtree);       /* send the distance code */
-            extra = extra_dbits[code];
-            if (extra != 0) {
-                dist -= base_dist[code];
-                send_bits(dist, extra);   /* send the extra distance bits */
-            }
-        } /* literal or match pair ? */
-        flag >>= 1;
-    } while (lx < last_lit);
-
-    send_code(END_BLOCK, ltree);
+        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 {
+                        if ((lx & 7) == 0)
+                                flag = flag_buf[fx++];
+                        lc = l_buf[lx++];
+                        if ((flag & 1) == 0) {
+                                send_code(lc, ltree);   /* send a literal byte */
+                                Tracecv(isgraph(lc), (stderr, " '%c' ", lc));
+                        } else {
+                                /* Here, lc is the match length - MIN_MATCH */
+                                code = length_code[lc];
+                                send_code(code + LITERALS + 1, ltree);  /* send the length code */
+                                extra = extra_lbits[code];
+                                if (extra != 0) {
+                                        lc -= base_length[code];
+                                        send_bits(lc, extra);   /* send the extra length bits */
+                                }
+                                dist = d_buf[dx++];
+                                /* Here, dist is the match distance - 1 */
+                                code = d_code(dist);
+                                Assert(code < D_CODES, "bad d_code");
+
+                                send_code(code, dtree); /* send the distance code */
+                                extra = extra_dbits[code];
+                                if (extra != 0) {
+                                        dist -= base_dist[code];
+                                        send_bits(dist, extra); /* send the extra distance bits */
+                                }
+                        }                                       /* literal or match pair ? */
+                        flag >>= 1;
+                } while (lx < last_lit);
+
+        send_code(END_BLOCK, ltree);
 }
 
 /* ===========================================================================
@@ -2966,17 +3087,22 @@ local void compress_block(ltree, dtree)
  */
 local void set_file_type()
 {
-    int n = 0;
-    unsigned ascii_freq = 0;
-    unsigned bin_freq = 0;
-    while (n < 7)        bin_freq += dyn_ltree[n++].Freq;
-    while (n < 128)    ascii_freq += dyn_ltree[n++].Freq;
-    while (n < LITERALS) bin_freq += dyn_ltree[n++].Freq;
-    *file_type = bin_freq > (ascii_freq >> 2) ? BINARY : ASCII;
-    if (*file_type == BINARY && translate_eol) {
-        warn("-l used on binary file", "");
-    }
+        int n = 0;
+        unsigned ascii_freq = 0;
+        unsigned bin_freq = 0;
+
+        while (n < 7)
+                bin_freq += dyn_ltree[n++].Freq;
+        while (n < 128)
+                ascii_freq += dyn_ltree[n++].Freq;
+        while (n < LITERALS)
+                bin_freq += dyn_ltree[n++].Freq;
+        *file_type = bin_freq > (ascii_freq >> 2) ? BINARY : ASCII;
+        if (*file_type == BINARY && translate_eol) {
+                warn("-l used on binary file", "");
+        }
 }
+
 /* util.c -- utility functions for gzip support
  * Copyright (C) 1992-1993 Jean-loup Gailly
  * This is free software; you can redistribute it and/or modify it under the
@@ -2997,7 +3123,7 @@ local void set_file_type()
 #if defined(STDC_HEADERS) || !defined(NO_STDLIB_H)
 #  include <stdlib.h>
 #else
-   extern int errno;
+extern int errno;
 #endif
 
 /* ===========================================================================
@@ -3005,30 +3131,32 @@ local void set_file_type()
  * IN assertion: insize bytes have already been read in inbuf.
  */
 int copy(in, out)
-    int in, out;   /* input and output file descriptors */
+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();
-    }
-    bytes_in = bytes_out;
-    return OK;
+        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();
+        }
+        bytes_in = bytes_out;
+        return OK;
 }
 
 /* ========================================================================
  * Put string s in lower case, return s.
  */
 char *strlwr(s)
-    char *s;
+char *s;
 {
-    char *t;
-    for (t = s; *t; t++) *t = tolow(*t);
-    return s;
+        char *t;
+
+        for (t = s; *t; t++)
+                *t = tolow(*t);
+        return s;
 }
 
 #if defined(NO_STRING_H) && !defined(STDC_HEADERS)
@@ -3039,7 +3167,7 @@ char *strlwr(s)
 #    define const
 #  endif
 
-int strspn  OF((const char *s, const char *accept));
+int strspn OF((const char *s, const char *accept));
 int strcspn OF((const char *s, const char *reject));
 
 /* ========================================================================
@@ -3047,21 +3175,23 @@ int strcspn OF((const char *s, const char *reject));
  * of s which contains only characters in accept.
  */
 int strspn(s, accept)
-    const char *s;
-    const char *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;
+        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;
         }
-        if (*a == '\0') return count;
-        ++count;
-    }
-    return count;
+        return count;
 }
 
 /* ========================================================================
@@ -3069,104 +3199,113 @@ int strspn(s, accept)
  * which contains no characters from reject.
  */
 int strcspn(s, reject)
-    const char *s;
-    const char *reject;
+const char *s;
+const char *reject;
 {
-    register int count = 0;
+        register int count = 0;
 
-    while (*s != '\0') {
-        if (strchr(reject, *s++) != NULL) return count;
-        ++count;
-    }
-    return count;
+        while (*s != '\0') {
+                if (strchr(reject, *s++) != NULL)
+                        return count;
+                ++count;
+        }
+        return count;
 }
 
-#endif /* NO_STRING_H */
+#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 */
+#define SEPARATOR       " \t"           /* separators in env variable */
 
 char *add_envopt(argcp, argvp, env)
-    int *argcp;          /* pointer to argc */
-    char ***argvp;       /* pointer to argv */
-    char *env;           /* name of environment variable */
+int *argcp;                                             /* pointer to argc */
+char ***argvp;                                  /* pointer to argv */
+char *env;                                              /* name of environment variable */
 {
-    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) error("out of memory");
-    oargv  = *argvp;
-    *argvp = nargv;
-
-    /* Copy the program name first */
-    if (oargc-- < 0) error("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;
+        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)
+                error("out of memory");
+        oargv = *argvp;
+        *argvp = nargv;
+
+        /* Copy the program name first */
+        if (oargc-- < 0)
+                error("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;
 }
+
 /* ========================================================================
  * Display compression ratio on the given stream on 6 characters.
  */
 void display_ratio(num, den, file)
-    long num;
-    long den;
-    FILE *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);
+        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);
 }
 
 
@@ -3186,8 +3325,8 @@ void display_ratio(num, den, file)
 #  include <fcntl.h>
 #endif
 
-local ulg crc;       /* crc on uncompressed file data */
-long header_bytes;   /* number of bytes in gzip header */
+local ulg crc;                                  /* crc on uncompressed file data */
+long header_bytes;                              /* number of bytes in gzip header */
 
 /* ===========================================================================
  * Deflate in to out.
@@ -3195,48 +3334,48 @@ long header_bytes;   /* number of bytes in gzip header */
  *   The variables time_stamp and save_orig_name are initialized.
  */
 int zip(in, out)
-    int in, out;            /* input and output file descriptors */
+int in, out;                                    /* input and output file descriptors */
 {
-    uch  flags = 0;         /* general purpose bit flags */
-    ush  attr = 0;          /* ascii/binary flag */
-    ush  deflate_flags = 0; /* pkzip -es, -en or -ex equivalent */
+        uch 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;
-    outcnt = 0;
+        ifd = in;
+        ofd = out;
+        outcnt = 0;
 
-    /* Write the header to the gzip file. See algorithm.doc for the format */
+        /* Write the header to the gzip file. See algorithm.doc for the format */
 
 
-    method = DEFLATED;
-    put_byte(GZIP_MAGIC[0]); /* magic header */
-    put_byte(GZIP_MAGIC[1]);
-    put_byte(DEFLATED);      /* compression method */
+        method = DEFLATED;
+        put_byte(GZIP_MAGIC[0]);        /* magic header */
+        put_byte(GZIP_MAGIC[1]);
+        put_byte(DEFLATED);                     /* compression method */
 
-    put_byte(flags);         /* general flags */
-    put_long(time_stamp);
+        put_byte(flags);                        /* general flags */
+        put_long(time_stamp);
 
-    /* Write deflated file to zip file */
-    crc = updcrc(0, 0);
+        /* Write deflated file to zip file */
+        crc = updcrc(0, 0);
 
-    bi_init(out);
-    ct_init(&attr, &method);
-    lm_init(&deflate_flags);
+        bi_init(out);
+        ct_init(&attr, &method);
+        lm_init(&deflate_flags);
 
-    put_byte((uch)deflate_flags); /* extra flags */
-    put_byte(OS_CODE);            /* OS identifier */
+        put_byte((uch) deflate_flags);  /* extra flags */
+        put_byte(OS_CODE);                      /* OS identifier */
 
-    header_bytes = (long)outcnt;
+        header_bytes = (long) outcnt;
 
-    (void)deflate();
+        (void) deflate();
 
-    /* Write the crc and uncompressed size */
-    put_long(crc);
-    put_long(isize);
-    header_bytes += 2*sizeof(long);
+        /* Write the crc and uncompressed size */
+        put_long(crc);
+        put_long(isize);
+        header_bytes += 2 * sizeof(long);
 
-    flush_outbuf();
-    return OK;
+        flush_outbuf();
+        return OK;
 }
 
 
@@ -3246,18 +3385,19 @@ int zip(in, out)
  * IN assertion: size >= 2 (for end-of-line translation)
  */
 int file_read(buf, size)
-    char *buf;
-    unsigned size;
+char *buf;
+unsigned size;
 {
-    unsigned len;
+        unsigned len;
 
-    Assert(insize == 0, "inbuf not empty");
+        Assert(insize == 0, "inbuf not empty");
 
-    len = read(ifd, buf, size);
-    if (len == (unsigned)(-1) || len == 0) return (int)len;
+        len = read(ifd, buf, size);
+        if (len == (unsigned) (-1) || len == 0)
+                return (int) len;
 
-    crc = updcrc((uch*)buf, len);
-    isize += (ulg)len;
-    return (int)len;
+        crc = updcrc((uch *) buf, len);
+        isize += (ulg) len;
+        return (int) len;
 }
 #endif
diff --git a/archival/tar.c b/archival/tar.c
index 6496231ae..87b5d2176 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini tar implementation for busybox based on code taken from sash.
  *
@@ -40,27 +41,29 @@
 #include <utime.h>
 #include <sys/types.h>
 #include <sys/sysmacros.h>
-#include <sys/param.h>          /* for PATH_MAX */
+#include <sys/param.h>                  /* for PATH_MAX */
 
 
 #ifdef BB_FEATURE_TAR_CREATE
 
 static const char tar_usage[] =
-"tar -[cxtvOf] [tarFileName] [FILE] ...\n\n"
-"Create, extract, or list files from a tar file.\n\n"
-"Options:\n"
-"\tc=create, x=extract, t=list contents, v=verbose,\n"
-"\tO=extract to stdout, f=tarfile or \"-\" for stdin\n";
+        "tar -[cxtvOf] [tarFileName] [FILE] ...\n\n"
+        "Create, extract, or list files from a tar file.\n\n"
+        "Options:\n"
+
+        "\tc=create, x=extract, t=list contents, v=verbose,\n"
+        "\tO=extract to stdout, f=tarfile or \"-\" for stdin\n";
 
 #else
 
 static const char tar_usage[] =
-"tar -[xtvOf] [tarFileName] [FILE] ...\n\n"
-"Extract, or list files stored in a tar file.  This\n"
-"version of tar does not support creation of tar files.\n\n"
-"Options:\n"
-"\tx=extract, t=list contents, v=verbose,\n"
-"\tO=extract to stdout, f=tarfile or \"-\" for stdin\n";
+        "tar -[xtvOf] [tarFileName] [FILE] ...\n\n"
+        "Extract, or list files stored in a tar file.  This\n"
+        "version of tar does not support creation of tar files.\n\n"
+        "Options:\n"
+
+        "\tx=extract, t=list contents, v=verbose,\n"
+        "\tO=extract to stdout, f=tarfile or \"-\" for stdin\n";
 
 #endif
 
@@ -78,22 +81,22 @@ static const char tar_usage[] =
  * with zero padding.  We only process this information minimally.
  */
 typedef struct {
-    char name[TAR_NAME_SIZE];
-    char mode[8];
-    char uid[8];
-    char gid[8];
-    char size[12];
-    char mtime[12];
-    char checkSum[8];
-    char typeFlag;
-    char linkName[TAR_NAME_SIZE];
-    char magic[6];
-    char version[2];
-    char uname[32];
-    char gname[32];
-    char devMajor[8];
-    char devMinor[8];
-    char prefix[155];
+        char name[TAR_NAME_SIZE];
+        char mode[8];
+        char uid[8];
+        char gid[8];
+        char size[12];
+        char mtime[12];
+        char checkSum[8];
+        char typeFlag;
+        char linkName[TAR_NAME_SIZE];
+        char magic[6];
+        char version[2];
+        char uname[32];
+        char gname[32];
+        char devMajor[8];
+        char devMinor[8];
+        char prefix[155];
 } TarHeader;
 
 #define TAR_MAGIC       "ustar"
@@ -113,7 +116,7 @@ static int createFlag;
 static int verboseFlag;
 static int tostdoutFlag;
 
-static int inHeader; // <- check me
+static int inHeader;                    // <- check me
 static int badHeader;
 static int errorFlag;
 static int skipFileFlag;
@@ -140,141 +143,145 @@ static ino_t tarInode;
 /*
  * Local procedures to restore files from a tar file.
  */
-static void readTarFile (int fileCount, char **fileTable);
-static void readData (const char *cp, int count);
-static long getOctal (const char *cp, int len);
+static void readTarFile(int fileCount, char **fileTable);
+static void readData(const char *cp, int count);
+static long getOctal(const char *cp, int len);
+
+static void readHeader(const TarHeader * hp,
 
-static void readHeader (const TarHeader * hp,
-                        int fileCount, char **fileTable);
+                                           int fileCount, char **fileTable);
 
-static int wantFileName (const char *fileName,
-                         int fileCount, char **fileTable);
+static int wantFileName(const char *fileName,
+
+                                                int fileCount, char **fileTable);
 
 #ifdef BB_FEATURE_TAR_CREATE
 /*
  * Local procedures to save files into a tar file.
  */
-static void saveFile (const char *fileName, int seeLinks);
+static void saveFile(const char *fileName, int seeLinks);
+
+static void saveRegularFile(const char *fileName,
 
-static void saveRegularFile (const char *fileName,
-                             const struct stat *statbuf);
+                                                        const struct stat *statbuf);
 
-static void saveDirectory (const char *fileName,
-                           const struct stat *statbuf);
+static void saveDirectory(const char *fileName,
 
-static void writeHeader (const char *fileName, const struct stat *statbuf);
+                                                  const struct stat *statbuf);
 
-static void writeTarFile (int fileCount, char **fileTable);
-static void writeTarBlock (const char *buf, int len);
-static int putOctal (char *cp, int len, long value);
+static void writeHeader(const char *fileName, const struct stat *statbuf);
+
+static void writeTarFile(int fileCount, char **fileTable);
+static void writeTarBlock(const char *buf, int len);
+static int putOctal(char *cp, int len, long value);
 
 #endif
 
 
-extern int tar_main (int argc, char **argv)
+extern int tar_main(int argc, char **argv)
 {
-    const char *options;
-
-    argc--;
-    argv++;
-
-    if (argc < 1)
-        usage( tar_usage);
-
-
-    errorFlag = FALSE;
-    extractFlag = FALSE;
-    createFlag = FALSE;
-    listFlag = FALSE;
-    verboseFlag = FALSE;
-    tostdoutFlag = FALSE;
-    tarName = NULL;
-    tarDev = 0;
-    tarInode = 0;
-    tarFd = -1;
-
-    /* 
-     * Parse the options.
-     */
-    if (**argv == '-')
-        options = (*argv++) + 1;
-    else 
-        options = (*argv++);
-    argc--;
-
-    for (; *options; options++) {
-        switch (*options) {
-        case 'f':
-            if (tarName != NULL) {
-                fprintf (stderr, "Only one 'f' option allowed\n");
-
-                exit (FALSE);
-            }
-
-            tarName = *argv++;
-            argc--;
-
-            break;
-
-        case 't':
-            if (extractFlag == TRUE || createFlag == TRUE )
-                goto flagError;
-            listFlag = TRUE;
-            break;
-
-        case 'x':
-            if (listFlag == TRUE || createFlag == TRUE )
-                goto flagError;
-            extractFlag = TRUE;
-            break;
-        case 'c':
-            if (extractFlag == TRUE || listFlag == TRUE)
-                goto flagError;
-            createFlag = TRUE;
-            break;
-
-        case 'v':
-            verboseFlag = TRUE;
-            break;
-
-        case 'O':
-            tostdoutFlag = TRUE;
-            break;
-
-        case '-':
-            usage( tar_usage);
-            break;
-
-        default:
-            fprintf (stderr, "Unknown tar flag '%c'\n"
-                    "Try `tar --help' for more information\n", 
-                    *options);
-            exit (FALSE);
+        const char *options;
+
+        argc--;
+        argv++;
+
+        if (argc < 1)
+                usage(tar_usage);
+
+
+        errorFlag = FALSE;
+        extractFlag = FALSE;
+        createFlag = FALSE;
+        listFlag = FALSE;
+        verboseFlag = FALSE;
+        tostdoutFlag = FALSE;
+        tarName = NULL;
+        tarDev = 0;
+        tarInode = 0;
+        tarFd = -1;
+
+        /* 
+         * Parse the options.
+         */
+        if (**argv == '-')
+                options = (*argv++) + 1;
+        else
+                options = (*argv++);
+        argc--;
+
+        for (; *options; options++) {
+                switch (*options) {
+                case 'f':
+                        if (tarName != NULL) {
+                                fprintf(stderr, "Only one 'f' option allowed\n");
+
+                                exit(FALSE);
+                        }
+
+                        tarName = *argv++;
+                        argc--;
+
+                        break;
+
+                case 't':
+                        if (extractFlag == TRUE || createFlag == TRUE)
+                                goto flagError;
+                        listFlag = TRUE;
+                        break;
+
+                case 'x':
+                        if (listFlag == TRUE || createFlag == TRUE)
+                                goto flagError;
+                        extractFlag = TRUE;
+                        break;
+                case 'c':
+                        if (extractFlag == TRUE || listFlag == TRUE)
+                                goto flagError;
+                        createFlag = TRUE;
+                        break;
+
+                case 'v':
+                        verboseFlag = TRUE;
+                        break;
+
+                case 'O':
+                        tostdoutFlag = TRUE;
+                        break;
+
+                case '-':
+                        usage(tar_usage);
+                        break;
+
+                default:
+                        fprintf(stderr, "Unknown tar flag '%c'\n"
+                                        "Try `tar --help' for more information\n", *options);
+                        exit(FALSE);
+                }
         }
-    }
 
-    /* 
-     * Do the correct type of action supplying the rest of the
-     * command line arguments as the list of files to process.
-     */
-    if (createFlag==TRUE) {
+        /* 
+         * Do the correct type of action supplying the rest of the
+         * command line arguments as the list of files to process.
+         */
+        if (createFlag == TRUE) {
 #ifndef BB_FEATURE_TAR_CREATE
-        fprintf (stderr, "This version of tar was not compiled with tar creation support.\n" );
-        exit (FALSE);
+                fprintf(stderr,
+                                "This version of tar was not compiled with tar creation support.\n");
+                exit(FALSE);
 #else
-        writeTarFile (argc, argv);
-#endif 
-    } else {
-        readTarFile (argc, argv);
-    }
-    if (errorFlag==TRUE) {
-        fprintf (stderr, "\n");
-    }
-    exit (!errorFlag);
-
-flagError:
-    fprintf (stderr, "Exactly one of 'c', 'x' or 't' must be specified\n");
-    exit (FALSE);
+                writeTarFile(argc, argv);
+#endif
+        } else {
+                readTarFile(argc, argv);
+        }
+        if (errorFlag == TRUE) {
+                fprintf(stderr, "\n");
+        }
+        exit(!errorFlag);
+
+  flagError:
+        fprintf(stderr, "Exactly one of 'c', 'x' or 't' must be specified\n");
+        exit(FALSE);
 }
 
 
@@ -282,120 +289,120 @@ flagError:
  * Read a tar file and extract or list the specified files within it.
  * If the list is empty than all files are extracted or listed.
  */
-static void readTarFile (int fileCount, char **fileTable)
+static void readTarFile(int fileCount, char **fileTable)
 {
-    const char *cp;
-    int cc;
-    int inCc;
-    int blockSize;
-    char buf[BUF_SIZE];
-
-    skipFileFlag = FALSE;
-    badHeader = FALSE;
-    warnedRoot = FALSE;
-    eofFlag = FALSE;
-    inHeader = TRUE;
-    inCc = 0;
-    dataCc = 0;
-    outFd = -1;
-    blockSize = sizeof (buf);
-    cp = buf;
-
-    /* 
-     * Open the tar file for reading.
-     */
-    if ((tarName == NULL) || !strcmp (tarName, "-")) {
-        tarFd = fileno(stdin);
-    } else
-        tarFd = open (tarName, O_RDONLY);
-
-    if (tarFd < 0) {
-        perror (tarName);
-        errorFlag = TRUE;
-        return;
-    }
-
-    /* 
-     * Read blocks from the file until an end of file header block
-     * has been seen.  (A real end of file from a read is an error.)
-     */
-    while (eofFlag==FALSE) {
+        const char *cp;
+        int cc;
+        int inCc;
+        int blockSize;
+        char buf[BUF_SIZE];
+
+        skipFileFlag = FALSE;
+        badHeader = FALSE;
+        warnedRoot = FALSE;
+        eofFlag = FALSE;
+        inHeader = TRUE;
+        inCc = 0;
+        dataCc = 0;
+        outFd = -1;
+        blockSize = sizeof(buf);
+        cp = buf;
+
         /* 
-         * Read the next block of data if necessary.
-         * This will be a large block if possible, which we will
-         * then process in the small tar blocks.
+         * Open the tar file for reading.
          */
-        if (inCc <= 0) {
-            cp = buf;
-            inCc = fullRead (tarFd, buf, blockSize);
-
-            if (inCc < 0) {
-                perror (tarName);
-                errorFlag = TRUE;
-                goto done;
-            }
+        if ((tarName == NULL) || !strcmp(tarName, "-")) {
+                tarFd = fileno(stdin);
+        } else
+                tarFd = open(tarName, O_RDONLY);
 
-            if (inCc == 0) {
-                fprintf (stderr,
-                         "Unexpected end of file from \"%s\"", tarName);
+        if (tarFd < 0) {
+                perror(tarName);
                 errorFlag = TRUE;
-                goto done;
-            }
+                return;
         }
 
         /* 
-         * If we are expecting a header block then examine it.
+         * Read blocks from the file until an end of file header block
+         * has been seen.  (A real end of file from a read is an error.)
          */
-        if (inHeader==TRUE) {
-            readHeader ((const TarHeader *) cp, fileCount, fileTable);
-
-            cp += TAR_BLOCK_SIZE;
-            inCc -= TAR_BLOCK_SIZE;
-
-            continue;
+        while (eofFlag == FALSE) {
+                /* 
+                 * Read the next block of data if necessary.
+                 * This will be a large block if possible, which we will
+                 * then process in the small tar blocks.
+                 */
+                if (inCc <= 0) {
+                        cp = buf;
+                        inCc = fullRead(tarFd, buf, blockSize);
+
+                        if (inCc < 0) {
+                                perror(tarName);
+                                errorFlag = TRUE;
+                                goto done;
+                        }
+
+                        if (inCc == 0) {
+                                fprintf(stderr,
+                                                "Unexpected end of file from \"%s\"", tarName);
+                                errorFlag = TRUE;
+                                goto done;
+                        }
+                }
+
+                /* 
+                 * If we are expecting a header block then examine it.
+                 */
+                if (inHeader == TRUE) {
+                        readHeader((const TarHeader *) cp, fileCount, fileTable);
+
+                        cp += TAR_BLOCK_SIZE;
+                        inCc -= TAR_BLOCK_SIZE;
+
+                        continue;
+                }
+
+                /* 
+                 * We are currently handling the data for a file.
+                 * Process the minimum of the amount of data we have available
+                 * and the amount left to be processed for the file.
+                 */
+                cc = inCc;
+
+                if (cc > dataCc)
+                        cc = dataCc;
+
+                readData(cp, cc);
+
+                /* 
+                 * If the amount left isn't an exact multiple of the tar block
+                 * size then round it up to the next block boundary since there
+                 * is padding at the end of the file.
+                 */
+                if (cc % TAR_BLOCK_SIZE)
+                        cc += TAR_BLOCK_SIZE - (cc % TAR_BLOCK_SIZE);
+
+                cp += cc;
+                inCc -= cc;
         }
 
+  done:
         /* 
-         * We are currently handling the data for a file.
-         * Process the minimum of the amount of data we have available
-         * and the amount left to be processed for the file.
+         * Close the tar file if needed.
          */
-        cc = inCc;
-
-        if (cc > dataCc)
-            cc = dataCc;
-
-        readData (cp, cc);
+        if ((tarFd >= 0) && (close(tarFd) < 0))
+                perror(tarName);
 
         /* 
-         * If the amount left isn't an exact multiple of the tar block
-         * size then round it up to the next block boundary since there
-         * is padding at the end of the file.
+         * Close the output file if needed.
+         * This is only done here on a previous error and so no
+         * message is required on errors.
          */
-        if (cc % TAR_BLOCK_SIZE)
-            cc += TAR_BLOCK_SIZE - (cc % TAR_BLOCK_SIZE);
-
-        cp += cc;
-        inCc -= cc;
-    }
-
-  done:
-    /* 
-     * Close the tar file if needed.
-     */
-    if ((tarFd >= 0) && (close (tarFd) < 0))
-        perror (tarName);
-
-    /* 
-     * Close the output file if needed.
-     * This is only done here on a previous error and so no
-     * message is required on errors.
-     */
-    if (tostdoutFlag == FALSE) {
-        if (outFd >= 0) {
-            close (outFd);
+        if (tostdoutFlag == FALSE) {
+                if (outFd >= 0) {
+                        close(outFd);
+                }
         }
-    }
 }
 
 
@@ -405,304 +412,305 @@ static void readTarFile (int fileCount, char **fileTable)
  * the end of the tar file.
  */
 static void
-readHeader (const TarHeader * hp, int fileCount, char **fileTable)
+readHeader(const TarHeader * hp, int fileCount, char **fileTable)
 {
-    int checkSum;
-    int cc;
-    int hardLink;
-    int softLink;
-    int devFileFlag;
-    unsigned int major;
-    unsigned int minor;
-    long size;
-    struct utimbuf utb;
-
-    /* 
-     * If the block is completely empty, then this is the end of the
-     * archive file.  If the name is null, then just skip this header.
-     */
-    outName = hp->name;
-
-    if (*outName == '\0') {
-        for (cc = TAR_BLOCK_SIZE; cc > 0; cc--) {
-            if (*outName++)
+        int checkSum;
+        int cc;
+        int hardLink;
+        int softLink;
+        int devFileFlag;
+        unsigned int major;
+        unsigned int minor;
+        long size;
+        struct utimbuf utb;
+
+        /* 
+         * If the block is completely empty, then this is the end of the
+         * archive file.  If the name is null, then just skip this header.
+         */
+        outName = hp->name;
+
+        if (*outName == '\0') {
+                for (cc = TAR_BLOCK_SIZE; cc > 0; cc--) {
+                        if (*outName++)
+                                return;
+                }
+
+                eofFlag = TRUE;
+
                 return;
         }
 
-        eofFlag = TRUE;
-
-        return;
-    }
-
-    /* 
-     * There is another file in the archive to examine.
-     * Extract the encoded information and check it.
-     */
-    mode = getOctal (hp->mode, sizeof (hp->mode));
-    uid = getOctal (hp->uid, sizeof (hp->uid));
-    gid = getOctal (hp->gid, sizeof (hp->gid));
-    size = getOctal (hp->size, sizeof (hp->size));
-    mtime = getOctal (hp->mtime, sizeof (hp->mtime));
-    checkSum = getOctal (hp->checkSum, sizeof (hp->checkSum));
-    major = getOctal (hp->devMajor, sizeof (hp->devMajor));
-    minor = getOctal (hp->devMinor, sizeof (hp->devMinor));
-
-    if ((mode < 0) || (uid < 0) || (gid < 0) || (size < 0)) {
-        if (badHeader==FALSE)
-            fprintf (stderr, "Bad tar header, skipping\n");
-
-        badHeader = TRUE;
-
-        return;
-    }
-
-    badHeader = FALSE;
-    skipFileFlag = FALSE;
-    devFileFlag = FALSE;
-
-    /* 
-     * Check for the file modes.
-     */
-    hardLink = ((hp->typeFlag == TAR_TYPE_HARD_LINK) ||
-                (hp->typeFlag == TAR_TYPE_HARD_LINK - '0'));
-
-    softLink = ((hp->typeFlag == TAR_TYPE_SOFT_LINK) ||
-                (hp->typeFlag == TAR_TYPE_SOFT_LINK - '0'));
-
-    /* 
-     * Check for a directory.
-     */
-    if (outName[strlen (outName) - 1] == '/')
-        mode |= S_IFDIR;
-
-    /* 
-     * Check for absolute paths in the file.
-     * If we find any, then warn the user and make them relative.
-     */
-    if (*outName == '/') {
-        while (*outName == '/')
-            outName++;
-
-        if (warnedRoot==FALSE) {
-            fprintf (stderr,
-                     "Absolute path detected, removing leading slashes\n");
-        }
+        /* 
+         * There is another file in the archive to examine.
+         * Extract the encoded information and check it.
+         */
+        mode = getOctal(hp->mode, sizeof(hp->mode));
+        uid = getOctal(hp->uid, sizeof(hp->uid));
+        gid = getOctal(hp->gid, sizeof(hp->gid));
+        size = getOctal(hp->size, sizeof(hp->size));
+        mtime = getOctal(hp->mtime, sizeof(hp->mtime));
+        checkSum = getOctal(hp->checkSum, sizeof(hp->checkSum));
+        major = getOctal(hp->devMajor, sizeof(hp->devMajor));
+        minor = getOctal(hp->devMinor, sizeof(hp->devMinor));
 
-        warnedRoot = TRUE;
-    }
-
-    /* 
-     * See if we want this file to be restored.
-     * If not, then set up to skip it.
-     */
-    if (wantFileName (outName, fileCount, fileTable) == FALSE) {
-        if ( !hardLink && !softLink && (S_ISREG (mode) || S_ISCHR (mode)
-                    || S_ISBLK (mode) || S_ISSOCK(mode) || S_ISFIFO(mode) ) ) {
-            inHeader = (size == 0)? TRUE : FALSE;
-            dataCc = size;
-        }
+        if ((mode < 0) || (uid < 0) || (gid < 0) || (size < 0)) {
+                if (badHeader == FALSE)
+                        fprintf(stderr, "Bad tar header, skipping\n");
 
-        skipFileFlag = TRUE;
-
-        return;
-    }
-
-    /* 
-     * This file is to be handled.
-     * If we aren't extracting then just list information about the file.
-     */
-    if (extractFlag==FALSE) {
-        if (verboseFlag==TRUE) {
-            printf ("%s %3d/%-d ", modeString (mode), uid, gid);
-            if( S_ISCHR (mode) || S_ISBLK (mode) )
-                printf ("%4d,%4d %s ", major,minor, timeString (mtime));
-            else
-                printf ("%9ld %s ", size, timeString (mtime));
-        }
-        printf ("%s", outName);
-
-        if (hardLink)
-            printf (" (link to \"%s\")", hp->linkName);
-        else if (softLink)
-            printf (" (symlink to \"%s\")", hp->linkName);
-        else if (S_ISREG (mode) || S_ISCHR (mode) || S_ISBLK (mode) || 
-                S_ISSOCK(mode) || S_ISFIFO(mode) ) {
-            inHeader = (size == 0)? TRUE : FALSE;
-            dataCc = size;
+                badHeader = TRUE;
+
+                return;
         }
 
-        printf ("\n");
+        badHeader = FALSE;
+        skipFileFlag = FALSE;
+        devFileFlag = FALSE;
 
-        return;
-    }
+        /* 
+         * Check for the file modes.
+         */
+        hardLink = ((hp->typeFlag == TAR_TYPE_HARD_LINK) ||
+                                (hp->typeFlag == TAR_TYPE_HARD_LINK - '0'));
+
+        softLink = ((hp->typeFlag == TAR_TYPE_SOFT_LINK) ||
+                                (hp->typeFlag == TAR_TYPE_SOFT_LINK - '0'));
+
+        /* 
+         * Check for a directory.
+         */
+        if (outName[strlen(outName) - 1] == '/')
+                mode |= S_IFDIR;
+
+        /* 
+         * Check for absolute paths in the file.
+         * If we find any, then warn the user and make them relative.
+         */
+        if (*outName == '/') {
+                while (*outName == '/')
+                        outName++;
 
-    /* 
-     * We really want to extract the file.
-     */
-    if (verboseFlag==TRUE)
-        printf ("x %s\n", outName);
+                if (warnedRoot == FALSE) {
+                        fprintf(stderr,
+                                        "Absolute path detected, removing leading slashes\n");
+                }
 
-    if (hardLink) {
-        if (link (hp->linkName, outName) < 0) {
-            perror (outName);
-            return;
+                warnedRoot = TRUE;
         }
-        /* Set the file time */
-        utb.actime = mtime;
-        utb.modtime = mtime;
-        utime (outName, &utb);
-        /* Set the file permissions */
-        chown(outName, uid, gid);
-        chmod(outName, mode);
-        return;
-    }
-
-    if (softLink) {
-#ifdef  S_ISLNK
-        if (symlink (hp->linkName, outName) < 0) {
-            perror (outName);
-            return;
+
+        /* 
+         * See if we want this file to be restored.
+         * If not, then set up to skip it.
+         */
+        if (wantFileName(outName, fileCount, fileTable) == FALSE) {
+                if (!hardLink && !softLink && (S_ISREG(mode) || S_ISCHR(mode)
+                                                                           || S_ISBLK(mode) || S_ISSOCK(mode)
+                                                                           || S_ISFIFO(mode))) {
+                        inHeader = (size == 0) ? TRUE : FALSE;
+                        dataCc = size;
+                }
+
+                skipFileFlag = TRUE;
+
+                return;
         }
-        /* Try to change ownership of the symlink.
-         * If libs doesn't support that, don't bother.
-         * Changing the pointed-to file is the Wrong Thing(tm).
+
+        /* 
+         * This file is to be handled.
+         * If we aren't extracting then just list information about the file.
          */
+        if (extractFlag == FALSE) {
+                if (verboseFlag == TRUE) {
+                        printf("%s %3d/%-d ", modeString(mode), uid, gid);
+                        if (S_ISCHR(mode) || S_ISBLK(mode))
+                                printf("%4d,%4d %s ", major, minor, timeString(mtime));
+                        else
+                                printf("%9ld %s ", size, timeString(mtime));
+                }
+                printf("%s", outName);
+
+                if (hardLink)
+                        printf(" (link to \"%s\")", hp->linkName);
+                else if (softLink)
+                        printf(" (symlink to \"%s\")", hp->linkName);
+                else if (S_ISREG(mode) || S_ISCHR(mode) || S_ISBLK(mode) ||
+                                 S_ISSOCK(mode) || S_ISFIFO(mode)) {
+                        inHeader = (size == 0) ? TRUE : FALSE;
+                        dataCc = size;
+                }
+
+                printf("\n");
+
+                return;
+        }
+
+        /* 
+         * We really want to extract the file.
+         */
+        if (verboseFlag == TRUE)
+                printf("x %s\n", outName);
+
+        if (hardLink) {
+                if (link(hp->linkName, outName) < 0) {
+                        perror(outName);
+                        return;
+                }
+                /* Set the file time */
+                utb.actime = mtime;
+                utb.modtime = mtime;
+                utime(outName, &utb);
+                /* Set the file permissions */
+                chown(outName, uid, gid);
+                chmod(outName, mode);
+                return;
+        }
+
+        if (softLink) {
+#ifdef  S_ISLNK
+                if (symlink(hp->linkName, outName) < 0) {
+                        perror(outName);
+                        return;
+                }
+                /* Try to change ownership of the symlink.
+                 * If libs doesn't support that, don't bother.
+                 * Changing the pointed-to file is the Wrong Thing(tm).
+                 */
 #if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)
-        lchown(outName, uid, gid);
+                lchown(outName, uid, gid);
 #endif
 
-        /* Do not change permissions or date on symlink,
-         * since it changes the pointed to file instead.  duh. */
+                /* Do not change permissions or date on symlink,
+                 * since it changes the pointed to file instead.  duh. */
 #else
-        fprintf (stderr, "Cannot create symbolic links\n");
+                fprintf(stderr, "Cannot create symbolic links\n");
 #endif
-        return;
-    }
-
-    /* Set the umask for this process so it doesn't 
-     * screw things up. */
-    umask(0);
-
-    /* 
-     * If the file is a directory, then just create the path.
-     */
-    if (S_ISDIR (mode)) {
-        if (createPath (outName, mode)==TRUE) { 
-            /* Set the file time */
-            utb.actime = mtime;
-            utb.modtime = mtime;
-            utime (outName, &utb);
-            /* Set the file permissions */
-            chown(outName, uid, gid);
-            chmod(outName, mode);
-            return;
+                return;
         }
-        return;
-    }
-
-    /* 
-     * There is a file to write.
-     * First create the path to it if necessary with default permissions.
-     */
-    createPath (outName, 0777);
-
-    inHeader = (size == 0)? TRUE : FALSE;
-    dataCc = size;
-
-    /* 
-     * Start the output file.
-     */
-    if (tostdoutFlag == TRUE)
-        outFd = fileno(stdout);
-    else {
-        if ( S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode) ) {
-            devFileFlag = TRUE;
-            outFd = mknod (outName, mode, makedev(major, minor) );
+
+        /* Set the umask for this process so it doesn't 
+         * screw things up. */
+        umask(0);
+
+        /* 
+         * If the file is a directory, then just create the path.
+         */
+        if (S_ISDIR(mode)) {
+                if (createPath(outName, mode) == TRUE) {
+                        /* Set the file time */
+                        utb.actime = mtime;
+                        utb.modtime = mtime;
+                        utime(outName, &utb);
+                        /* Set the file permissions */
+                        chown(outName, uid, gid);
+                        chmod(outName, mode);
+                        return;
+                }
+                return;
         }
-        else if (S_ISFIFO(mode) ) {
-            devFileFlag = TRUE;
-            outFd = mkfifo(outName, mode);
-        } else {
-            outFd = open (outName, O_WRONLY | O_CREAT | O_TRUNC, mode);
+
+        /* 
+         * There is a file to write.
+         * First create the path to it if necessary with default permissions.
+         */
+        createPath(outName, 0777);
+
+        inHeader = (size == 0) ? TRUE : FALSE;
+        dataCc = size;
+
+        /* 
+         * Start the output file.
+         */
+        if (tostdoutFlag == TRUE)
+                outFd = fileno(stdout);
+        else {
+                if (S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode)) {
+                        devFileFlag = TRUE;
+                        outFd = mknod(outName, mode, makedev(major, minor));
+                } else if (S_ISFIFO(mode)) {
+                        devFileFlag = TRUE;
+                        outFd = mkfifo(outName, mode);
+                } else {
+                        outFd = open(outName, O_WRONLY | O_CREAT | O_TRUNC, mode);
+                }
+                if (outFd < 0) {
+                        perror(outName);
+                        skipFileFlag = TRUE;
+                        return;
+                }
+                /* Set the file time */
+                utb.actime = mtime;
+                utb.modtime = mtime;
+                utime(outName, &utb);
+                /* Set the file permissions */
+                chown(outName, uid, gid);
+                chmod(outName, mode);
         }
-        if (outFd < 0) {
-            perror (outName);
-            skipFileFlag = TRUE;
-            return;
+
+
+        /* 
+         * If the file is empty, then that's all we need to do.
+         */
+        if (size == 0 && (tostdoutFlag == FALSE) && (devFileFlag == FALSE)) {
+                close(outFd);
+                outFd = -1;
         }
-        /* Set the file time */
-        utb.actime = mtime;
-        utb.modtime = mtime;
-        utime (outName, &utb);
-        /* Set the file permissions */
-        chown(outName, uid, gid);
-        chmod(outName, mode);
-    }
-
-
-    /* 
-     * If the file is empty, then that's all we need to do.
-     */
-    if (size == 0 && (tostdoutFlag == FALSE) && (devFileFlag == FALSE)) {
-        close (outFd);
-        outFd = -1;
-    }
 }
 
 
 /*
  * Handle a data block of some specified size that was read.
  */
-static void readData (const char *cp, int count)
+static void readData(const char *cp, int count)
 {
-    /* 
-     * Reduce the amount of data left in this file.
-     * If there is no more data left, then we need to read
-     * the header again.
-     */
-    dataCc -= count;
-
-    if (dataCc <= 0)
-        inHeader = TRUE;
+        /* 
+         * Reduce the amount of data left in this file.
+         * If there is no more data left, then we need to read
+         * the header again.
+         */
+        dataCc -= count;
 
-    /* 
-     * If we aren't extracting files or this file is being
-     * skipped then do nothing more.
-     */
-    if (extractFlag==FALSE || skipFileFlag==TRUE)
-        return;
-
-    /* 
-     * Write the data to the output file.
-     */
-    if (fullWrite (outFd, cp, count) < 0) {
-        perror (outName);
-        if (tostdoutFlag == FALSE) {
-            close (outFd);
-            outFd = -1;
+        if (dataCc <= 0)
+                inHeader = TRUE;
+
+        /* 
+         * If we aren't extracting files or this file is being
+         * skipped then do nothing more.
+         */
+        if (extractFlag == FALSE || skipFileFlag == TRUE)
+                return;
+
+        /* 
+         * Write the data to the output file.
+         */
+        if (fullWrite(outFd, cp, count) < 0) {
+                perror(outName);
+                if (tostdoutFlag == FALSE) {
+                        close(outFd);
+                        outFd = -1;
+                }
+                skipFileFlag = TRUE;
+                return;
         }
-        skipFileFlag = TRUE;
-        return;
-    }
-
-    /* 
-     * Check if we are done writing to the file now.
-     */
-    if (dataCc <= 0 && tostdoutFlag == FALSE) {
-        struct utimbuf utb;
-        if (close (outFd))
-            perror (outName);
 
-        /* Set the file time */
-        utb.actime = mtime;
-        utb.modtime = mtime;
-        utime (outName, &utb);
-        /* Set the file permissions */
-        chown(outName, uid, gid);
-        chmod(outName, mode);
+        /* 
+         * Check if we are done writing to the file now.
+         */
+        if (dataCc <= 0 && tostdoutFlag == FALSE) {
+                struct utimbuf utb;
+
+                if (close(outFd))
+                        perror(outName);
 
-        outFd = -1;
-    }
+                /* Set the file time */
+                utb.actime = mtime;
+                utb.modtime = mtime;
+                utime(outName, &utb);
+                /* Set the file permissions */
+                chown(outName, uid, gid);
+                chmod(outName, mode);
+
+                outFd = -1;
+        }
 }
 
 
@@ -712,40 +720,40 @@ static void readData (const char *cp, int count)
  * Returns TRUE if the file is selected.
  */
 static int
-wantFileName (const char *fileName, int fileCount, char **fileTable)
+wantFileName(const char *fileName, int fileCount, char **fileTable)
 {
-    const char *pathName;
-    int fileLength;
-    int pathLength;
-
-    /* 
-     * If there are no files in the list, then the file is wanted.
-     */
-    if (fileCount == 0)
-        return TRUE;
+        const char *pathName;
+        int fileLength;
+        int pathLength;
+
+        /* 
+         * If there are no files in the list, then the file is wanted.
+         */
+        if (fileCount == 0)
+                return TRUE;
 
-    fileLength = strlen (fileName);
+        fileLength = strlen(fileName);
 
-    /* 
-     * Check each of the test paths.
-     */
-    while (fileCount-- > 0) {
-        pathName = *fileTable++;
+        /* 
+         * Check each of the test paths.
+         */
+        while (fileCount-- > 0) {
+                pathName = *fileTable++;
 
-        pathLength = strlen (pathName);
+                pathLength = strlen(pathName);
 
-        if (fileLength < pathLength)
-            continue;
+                if (fileLength < pathLength)
+                        continue;
 
-        if (memcmp (fileName, pathName, pathLength) != 0)
-            continue;
+                if (memcmp(fileName, pathName, pathLength) != 0)
+                        continue;
 
-        if ((fileLength == pathLength) || (fileName[pathLength] == '/')) {
-            return TRUE;
+                if ((fileLength == pathLength) || (fileName[pathLength] == '/')) {
+                        return TRUE;
+                }
         }
-    }
 
-    return FALSE;
+        return FALSE;
 }
 
 /*
@@ -753,34 +761,34 @@ wantFileName (const char *fileName, int fileCount, char **fileTable)
  * spaces on both sides of the number and with an optional null character
  * at the end.  Returns -1 on an illegal format.
  */
-static long getOctal (const char *cp, int len)
+static long getOctal(const char *cp, int len)
 {
-    long val;
+        long val;
 
-    while ((len > 0) && (*cp == ' ')) {
-        cp++;
-        len--;
-    }
+        while ((len > 0) && (*cp == ' ')) {
+                cp++;
+                len--;
+        }
 
-    if ((len == 0) || !isOctal (*cp))
-        return -1;
+        if ((len == 0) || !isOctal(*cp))
+                return -1;
 
-    val = 0;
+        val = 0;
 
-    while ((len > 0) && isOctal (*cp)) {
-        val = val * 8 + *cp++ - '0';
-        len--;
-    }
+        while ((len > 0) && isOctal(*cp)) {
+                val = val * 8 + *cp++ - '0';
+                len--;
+        }
 
-    while ((len > 0) && (*cp == ' ')) {
-        cp++;
-        len--;
-    }
+        while ((len > 0) && (*cp == ' ')) {
+                cp++;
+                len--;
+        }
 
-    if ((len > 0) && *cp)
-        return -1;
+        if ((len > 0) && *cp)
+                return -1;
 
-    return val;
+        return val;
 }
 
 
@@ -795,65 +803,65 @@ static long getOctal (const char *cp, int len)
 /*
  * Write a tar file containing the specified files.
  */
-static void writeTarFile (int fileCount, char **fileTable)
+static void writeTarFile(int fileCount, char **fileTable)
 {
-    struct stat statbuf;
-
-    /* 
-     * Make sure there is at least one file specified.
-     */
-    if (fileCount <= 0) {
-        fprintf (stderr, "No files specified to be saved\n");
-        errorFlag = TRUE;
-    }
-
-    /* 
-     * Create the tar file for writing.
-     */
-    if ((tarName == NULL) || !strcmp (tarName, "-")) {
-        tostdoutFlag = TRUE;
-        tarFd = fileno(stdout);
-    } else
-        tarFd = open (tarName, O_WRONLY | O_CREAT | O_TRUNC, 0666);
-
-    if (tarFd < 0) {
-        perror (tarName);
-        errorFlag = TRUE;
-        return;
-    }
-
-    /* 
-     * Get the device and inode of the tar file for checking later.
-     */
-    if (fstat (tarFd, &statbuf) < 0) {
-        perror (tarName);
-        errorFlag = TRUE;
-        goto done;
-    }
-
-    tarDev = statbuf.st_dev;
-    tarInode = statbuf.st_ino;
-                
-    /* 
-     * Append each file name into the archive file.
-     * Follow symbolic links for these top level file names.
-     */
-    while (errorFlag==FALSE && (fileCount-- > 0)) {
-        saveFile (*fileTable++, FALSE);
-    }
-
-    /* 
-     * Now write an empty block of zeroes to end the archive.
-     */
-    writeTarBlock ("", 1);
+        struct stat statbuf;
+
+        /* 
+         * Make sure there is at least one file specified.
+         */
+        if (fileCount <= 0) {
+                fprintf(stderr, "No files specified to be saved\n");
+                errorFlag = TRUE;
+        }
+
+        /* 
+         * Create the tar file for writing.
+         */
+        if ((tarName == NULL) || !strcmp(tarName, "-")) {
+                tostdoutFlag = TRUE;
+                tarFd = fileno(stdout);
+        } else
+                tarFd = open(tarName, O_WRONLY | O_CREAT | O_TRUNC, 0666);
+
+        if (tarFd < 0) {
+                perror(tarName);
+                errorFlag = TRUE;
+                return;
+        }
+
+        /* 
+         * Get the device and inode of the tar file for checking later.
+         */
+        if (fstat(tarFd, &statbuf) < 0) {
+                perror(tarName);
+                errorFlag = TRUE;
+                goto done;
+        }
+
+        tarDev = statbuf.st_dev;
+        tarInode = statbuf.st_ino;
+
+        /* 
+         * Append each file name into the archive file.
+         * Follow symbolic links for these top level file names.
+         */
+        while (errorFlag == FALSE && (fileCount-- > 0)) {
+                saveFile(*fileTable++, FALSE);
+        }
+
+        /* 
+         * Now write an empty block of zeroes to end the archive.
+         */
+        writeTarBlock("", 1);
 
 
   done:
-    /* 
-     * Close the tar file and check for errors if it was opened.
-     */
-    if ((tostdoutFlag == FALSE) && (tarFd >= 0) && (close (tarFd) < 0))
-        perror (tarName);
+        /* 
+         * Close the tar file and check for errors if it was opened.
+         */
+        if ((tostdoutFlag == FALSE) && (tarFd >= 0) && (close(tarFd) < 0))
+                perror(tarName);
 }
 
 /*
@@ -863,73 +871,73 @@ static void writeTarFile (int fileCount, char **fileTable)
  * flag indicates whether or not we want to see symbolic links as
  * they really are, instead of blindly following them.
  */
-static void saveFile (const char *fileName, int seeLinks)
+static void saveFile(const char *fileName, int seeLinks)
 {
-    int status;
-    struct stat statbuf;
+        int status;
+        struct stat statbuf;
 
-    if (verboseFlag==TRUE)
-        printf ("a %s\n", fileName);
+        if (verboseFlag == TRUE)
+                printf("a %s\n", fileName);
 
-    /* 
-     * Check that the file name will fit in the header.
-     */
-    if (strlen (fileName) >= TAR_NAME_SIZE) {
-        fprintf (stderr, "%s: File name is too long\n", fileName);
+        /* 
+         * Check that the file name will fit in the header.
+         */
+        if (strlen(fileName) >= TAR_NAME_SIZE) {
+                fprintf(stderr, "%s: File name is too long\n", fileName);
 
-        return;
-    }
+                return;
+        }
 
-    /* 
-     * Find out about the file.
-     */
+        /* 
+         * Find out about the file.
+         */
 #ifdef  S_ISLNK
-    if (seeLinks==TRUE)
-        status = lstat (fileName, &statbuf);
-    else
+        if (seeLinks == TRUE)
+                status = lstat(fileName, &statbuf);
+        else
 #endif
-        status = stat (fileName, &statbuf);
+                status = stat(fileName, &statbuf);
 
-    if (status < 0) {
-        perror (fileName);
+        if (status < 0) {
+                perror(fileName);
+
+                return;
+        }
 
-        return;
-    }
+        /* 
+         * Make sure we aren't trying to save our file into itself.
+         */
+        if ((statbuf.st_dev == tarDev) && (statbuf.st_ino == tarInode)) {
+                fprintf(stderr, "Skipping saving of archive file itself\n");
 
-    /* 
-     * Make sure we aren't trying to save our file into itself.
-     */
-    if ((statbuf.st_dev == tarDev) && (statbuf.st_ino == tarInode)) {
-        fprintf (stderr, "Skipping saving of archive file itself\n");
+                return;
+        }
 
-        return;
-    }
+        /* 
+         * Check the type of file.
+         */
+        mode = statbuf.st_mode;
 
-    /* 
-     * Check the type of file.
-     */
-    mode = statbuf.st_mode;
+        if (S_ISDIR(mode)) {
+                saveDirectory(fileName, &statbuf);
 
-    if (S_ISDIR (mode)) {
-        saveDirectory (fileName, &statbuf);
+                return;
+        }
+        if (S_ISREG(mode)) {
+                saveRegularFile(fileName, &statbuf);
 
-        return;
-    }
-    if (S_ISREG (mode)) {
-        saveRegularFile (fileName, &statbuf);
+                return;
+        }
 
-        return;
-    }
-    
-    /* Some day add support for tarring these up... but not today. :) */
+        /* Some day add support for tarring these up... but not today. :) */
 //  if (S_ISLNK(mode) || S_ISFIFO(mode) || S_ISBLK(mode) || S_ISCHR (mode) ) {
-//      fprintf (stderr, "%s: This version of tar can't store this type of file\n", fileName);
+//  fprintf (stderr, "%s: This version of tar can't store this type of file\n", fileName);
 //  }
 
-    /* 
-     * The file is a strange type of file, ignore it.
-     */
-    fprintf (stderr, "%s: not a directory or regular file\n", fileName);
+        /* 
+         * The file is a strange type of file, ignore it.
+         */
+        fprintf(stderr, "%s: not a directory or regular file\n", fileName);
 }
 
 
@@ -937,173 +945,172 @@ static void saveFile (const char *fileName, int seeLinks)
  * Save a regular file to the tar file.
  */
 static void
-saveRegularFile (const char *fileName, const struct stat *statbuf)
+saveRegularFile(const char *fileName, const struct stat *statbuf)
 {
-    int sawEof;
-    int fileFd;
-    int cc;
-    int dataCount;
-    long fullDataCount;
-    char data[TAR_BLOCK_SIZE * 16];
-
-    /* 
-     * Open the file for reading.
-     */
-    fileFd = open (fileName, O_RDONLY);
-
-    if (fileFd < 0) {
-        perror (fileName);
-
-        return;
-    }
-
-    /* 
-     * Write out the header for the file.
-     */
-    writeHeader (fileName, statbuf);
-
-    /* 
-     * Write the data blocks of the file.
-     * We must be careful to write the amount of data that the stat
-     * buffer indicated, even if the file has changed size.  Otherwise
-     * the tar file will be incorrect.
-     */
-    fullDataCount = statbuf->st_size;
-    sawEof = FALSE;
-
-    while (fullDataCount > 0) {
-        /* 
-         * Get the amount to write this iteration which is
-         * the minumum of the amount left to write and the
-         * buffer size.
-         */
-        dataCount = sizeof (data);
-
-        if (dataCount > fullDataCount)
-            dataCount = (int) fullDataCount;
+        int sawEof;
+        int fileFd;
+        int cc;
+        int dataCount;
+        long fullDataCount;
+        char data[TAR_BLOCK_SIZE * 16];
 
         /* 
-         * Read the data from the file if we haven't seen the
-         * end of file yet.
+         * Open the file for reading.
          */
-        cc = 0;
-
-        if (sawEof==FALSE) {
-            cc = fullRead (fileFd, data, dataCount);
+        fileFd = open(fileName, O_RDONLY);
 
-            if (cc < 0) {
-                perror (fileName);
-
-                (void) close (fileFd);
-                errorFlag = TRUE;
+        if (fileFd < 0) {
+                perror(fileName);
 
                 return;
-            }
-
-            /* 
-             * If the file ended too soon, complain and set
-             * a flag so we will zero fill the rest of it.
-             */
-            if (cc < dataCount) {
-                fprintf (stderr,
-                         "%s: Short read - zero filling", fileName);
-
-                sawEof = TRUE;
-            }
         }
 
         /* 
-         * Zero fill the rest of the data if necessary.
+         * Write out the header for the file.
          */
-        if (cc < dataCount)
-            memset (data + cc, 0, dataCount - cc);
+        writeHeader(fileName, statbuf);
 
         /* 
-         * Write the buffer to the TAR file.
+         * Write the data blocks of the file.
+         * We must be careful to write the amount of data that the stat
+         * buffer indicated, even if the file has changed size.  Otherwise
+         * the tar file will be incorrect.
          */
-        writeTarBlock (data, dataCount);
-
-        fullDataCount -= dataCount;
-    }
+        fullDataCount = statbuf->st_size;
+        sawEof = FALSE;
+
+        while (fullDataCount > 0) {
+                /* 
+                 * Get the amount to write this iteration which is
+                 * the minumum of the amount left to write and the
+                 * buffer size.
+                 */
+                dataCount = sizeof(data);
+
+                if (dataCount > fullDataCount)
+                        dataCount = (int) fullDataCount;
+
+                /* 
+                 * Read the data from the file if we haven't seen the
+                 * end of file yet.
+                 */
+                cc = 0;
+
+                if (sawEof == FALSE) {
+                        cc = fullRead(fileFd, data, dataCount);
+
+                        if (cc < 0) {
+                                perror(fileName);
+
+                                (void) close(fileFd);
+                                errorFlag = TRUE;
+
+                                return;
+                        }
+
+                        /* 
+                         * If the file ended too soon, complain and set
+                         * a flag so we will zero fill the rest of it.
+                         */
+                        if (cc < dataCount) {
+                                fprintf(stderr, "%s: Short read - zero filling", fileName);
+
+                                sawEof = TRUE;
+                        }
+                }
+
+                /* 
+                 * Zero fill the rest of the data if necessary.
+                 */
+                if (cc < dataCount)
+                        memset(data + cc, 0, dataCount - cc);
+
+                /* 
+                 * Write the buffer to the TAR file.
+                 */
+                writeTarBlock(data, dataCount);
+
+                fullDataCount -= dataCount;
+        }
 
-    /* 
-     * Close the file.
-     */
-    if ((tostdoutFlag == FALSE) && close (fileFd) < 0)
-        fprintf (stderr, "%s: close: %s\n", fileName, strerror (errno));
+        /* 
+         * Close the file.
+         */
+        if ((tostdoutFlag == FALSE) && close(fileFd) < 0)
+                fprintf(stderr, "%s: close: %s\n", fileName, strerror(errno));
 }
 
 
 /*
  * Save a directory and all of its files to the tar file.
  */
-static void saveDirectory (const char *dirName, const struct stat *statbuf)
+static void saveDirectory(const char *dirName, const struct stat *statbuf)
 {
-    DIR *dir;
-    struct dirent *entry;
-    int needSlash;
-    char fullName[PATH_MAX + 1];
-
-    /* 
-     * Construct the directory name as used in the tar file by appending
-     * a slash character to it.
-     */
-    strcpy (fullName, dirName);
-    strcat (fullName, "/");
-
-    /* 
-     * Write out the header for the directory entry.
-     */
-    writeHeader (fullName, statbuf);
-
-    /* 
-     * Open the directory.
-     */
-    dir = opendir (dirName);
-
-    if (dir == NULL) {
-        fprintf (stderr, "Cannot read directory \"%s\": %s\n",
-                 dirName, strerror (errno));
-
-        return;
-    }
-
-    /* 
-     * See if a slash is needed.
-     */
-    needSlash = (*dirName && (dirName[strlen (dirName) - 1] != '/'));
-
-    /* 
-     * Read all of the directory entries and check them,
-     * except for the current and parent directory entries.
-     */
-    while (errorFlag==FALSE && ((entry = readdir (dir)) != NULL)) {
-        if ((strcmp (entry->d_name, ".") == 0) ||
-            (strcmp (entry->d_name, "..") == 0)) {
-            continue;
-        }
+        DIR *dir;
+        struct dirent *entry;
+        int needSlash;
+        char fullName[PATH_MAX + 1];
+
+        /* 
+         * Construct the directory name as used in the tar file by appending
+         * a slash character to it.
+         */
+        strcpy(fullName, dirName);
+        strcat(fullName, "/");
+
+        /* 
+         * Write out the header for the directory entry.
+         */
+        writeHeader(fullName, statbuf);
 
         /* 
-         * Build the full path name to the file.
+         * Open the directory.
          */
-        strcpy (fullName, dirName);
+        dir = opendir(dirName);
+
+        if (dir == NULL) {
+                fprintf(stderr, "Cannot read directory \"%s\": %s\n",
+                                dirName, strerror(errno));
 
-        if (needSlash)
-            strcat (fullName, "/");
+                return;
+        }
 
-        strcat (fullName, entry->d_name);
+        /* 
+         * See if a slash is needed.
+         */
+        needSlash = (*dirName && (dirName[strlen(dirName) - 1] != '/'));
 
         /* 
-         * Write this file to the tar file, noticing whether or not
-         * the file is a symbolic link.
+         * Read all of the directory entries and check them,
+         * except for the current and parent directory entries.
          */
-        saveFile (fullName, TRUE);
-    }
+        while (errorFlag == FALSE && ((entry = readdir(dir)) != NULL)) {
+                if ((strcmp(entry->d_name, ".") == 0) ||
+                        (strcmp(entry->d_name, "..") == 0)) {
+                        continue;
+                }
+
+                /* 
+                 * Build the full path name to the file.
+                 */
+                strcpy(fullName, dirName);
+
+                if (needSlash)
+                        strcat(fullName, "/");
+
+                strcat(fullName, entry->d_name);
+
+                /* 
+                 * Write this file to the tar file, noticing whether or not
+                 * the file is a symbolic link.
+                 */
+                saveFile(fullName, TRUE);
+        }
 
-    /* 
-     * All done, close the directory.
-     */
-    closedir (dir);
+        /* 
+         * All done, close the directory.
+         */
+        closedir(dir);
 }
 
 
@@ -1111,54 +1118,54 @@ static void saveDirectory (const char *dirName, const struct stat *statbuf)
  * Write a tar header for the specified file name and status.
  * It is assumed that the file name fits.
  */
-static void writeHeader (const char *fileName, const struct stat *statbuf)
+static void writeHeader(const char *fileName, const struct stat *statbuf)
 {
-    long checkSum;
-    const unsigned char *cp;
-    int len;
-    TarHeader header;
-
-    /* 
-     * Zero the header block in preparation for filling it in.
-     */
-    memset ((char *) &header, 0, sizeof (header));
-
-    /* 
-     * Fill in the header.
-     */
-    strcpy (header.name, fileName);
-
-    strncpy (header.magic, TAR_MAGIC, sizeof (header.magic));
-    strncpy (header.version, TAR_VERSION, sizeof (header.version));
-
-    putOctal (header.mode, sizeof (header.mode), statbuf->st_mode & 0777);
-    putOctal (header.uid, sizeof (header.uid), statbuf->st_uid);
-    putOctal (header.gid, sizeof (header.gid), statbuf->st_gid);
-    putOctal (header.size, sizeof (header.size), statbuf->st_size);
-    putOctal (header.mtime, sizeof (header.mtime), statbuf->st_mtime);
-
-    header.typeFlag = TAR_TYPE_REGULAR;
-
-    /* 
-     * Calculate and store the checksum.
-     * This is the sum of all of the bytes of the header,
-     * with the checksum field itself treated as blanks.
-     */
-    memset (header.checkSum, ' ', sizeof (header.checkSum));
-
-    cp = (const unsigned char *) &header;
-    len = sizeof (header);
-    checkSum = 0;
-
-    while (len-- > 0)
-        checkSum += *cp++;
-
-    putOctal (header.checkSum, sizeof (header.checkSum), checkSum);
-
-    /* 
-     * Write the tar header.
-     */
-    writeTarBlock ((const char *) &header, sizeof (header));
+        long checkSum;
+        const unsigned char *cp;
+        int len;
+        TarHeader header;
+
+        /* 
+         * Zero the header block in preparation for filling it in.
+         */
+        memset((char *) &header, 0, sizeof(header));
+
+        /* 
+         * Fill in the header.
+         */
+        strcpy(header.name, fileName);
+
+        strncpy(header.magic, TAR_MAGIC, sizeof(header.magic));
+        strncpy(header.version, TAR_VERSION, sizeof(header.version));
+
+        putOctal(header.mode, sizeof(header.mode), statbuf->st_mode & 0777);
+        putOctal(header.uid, sizeof(header.uid), statbuf->st_uid);
+        putOctal(header.gid, sizeof(header.gid), statbuf->st_gid);
+        putOctal(header.size, sizeof(header.size), statbuf->st_size);
+        putOctal(header.mtime, sizeof(header.mtime), statbuf->st_mtime);
+
+        header.typeFlag = TAR_TYPE_REGULAR;
+
+        /* 
+         * Calculate and store the checksum.
+         * This is the sum of all of the bytes of the header,
+         * with the checksum field itself treated as blanks.
+         */
+        memset(header.checkSum, ' ', sizeof(header.checkSum));
+
+        cp = (const unsigned char *) &header;
+        len = sizeof(header);
+        checkSum = 0;
+
+        while (len-- > 0)
+                checkSum += *cp++;
+
+        putOctal(header.checkSum, sizeof(header.checkSum), checkSum);
+
+        /* 
+         * Write the tar header.
+         */
+        writeTarBlock((const char *) &header, sizeof(header));
 }
 
 
@@ -1167,56 +1174,56 @@ static void writeHeader (const char *fileName, const struct stat *statbuf)
  * The data is always padded out to a multiple of TAR_BLOCK_SIZE.
  * The errorFlag static variable is set on an error.
  */
-static void writeTarBlock (const char *buf, int len)
+static void writeTarBlock(const char *buf, int len)
 {
-    int partialLength;
-    int completeLength;
-    char fullBlock[TAR_BLOCK_SIZE];
-
-    /* 
-     * If we had a write error before, then do nothing more.
-     */
-    if (errorFlag==TRUE)
-        return;
-
-    /* 
-     * Get the amount of complete and partial blocks.
-     */
-    partialLength = len % TAR_BLOCK_SIZE;
-    completeLength = len - partialLength;
-
-    /* 
-     * Write all of the complete blocks.
-     */
-    if ((completeLength > 0) && !fullWrite (tarFd, buf, completeLength)) {
-        perror (tarName);
-
-        errorFlag = TRUE;
-
-        return;
-    }
-
-    /* 
-     * If there are no partial blocks left, we are done.
-     */
-    if (partialLength == 0)
-        return;
-
-    /* 
-     * Copy the partial data into a complete block, and pad the rest
-     * of it with zeroes.
-     */
-    memcpy (fullBlock, buf + completeLength, partialLength);
-    memset (fullBlock + partialLength, 0, TAR_BLOCK_SIZE - partialLength);
-
-    /* 
-     * Write the last complete block.
-     */
-    if (!fullWrite (tarFd, fullBlock, TAR_BLOCK_SIZE)) {
-        perror (tarName);
-
-        errorFlag = TRUE;
-    }
+        int partialLength;
+        int completeLength;
+        char fullBlock[TAR_BLOCK_SIZE];
+
+        /* 
+         * If we had a write error before, then do nothing more.
+         */
+        if (errorFlag == TRUE)
+                return;
+
+        /* 
+         * Get the amount of complete and partial blocks.
+         */
+        partialLength = len % TAR_BLOCK_SIZE;
+        completeLength = len - partialLength;
+
+        /* 
+         * Write all of the complete blocks.
+         */
+        if ((completeLength > 0) && !fullWrite(tarFd, buf, completeLength)) {
+                perror(tarName);
+
+                errorFlag = TRUE;
+
+                return;
+        }
+
+        /* 
+         * If there are no partial blocks left, we are done.
+         */
+        if (partialLength == 0)
+                return;
+
+        /* 
+         * Copy the partial data into a complete block, and pad the rest
+         * of it with zeroes.
+         */
+        memcpy(fullBlock, buf + completeLength, partialLength);
+        memset(fullBlock + partialLength, 0, TAR_BLOCK_SIZE - partialLength);
+
+        /* 
+         * Write the last complete block.
+         */
+        if (!fullWrite(tarFd, fullBlock, TAR_BLOCK_SIZE)) {
+                perror(tarName);
+
+                errorFlag = TRUE;
+        }
 }
 
 
@@ -1225,48 +1232,48 @@ static void writeTarBlock (const char *buf, int len)
  * The number is zero and space padded and possibly null padded.
  * Returns TRUE if successful.
  */
-static int putOctal (char *cp, int len, long value)
+static int putOctal(char *cp, int len, long value)
 {
-    int tempLength;
-    char *tempString;
-    char tempBuffer[32];
-
-    /* 
-     * Create a string of the specified length with an initial space,
-     * leading zeroes and the octal number, and a trailing null.
-     */
-    tempString = tempBuffer;
-
-    sprintf (tempString, " %0*lo", len - 2, value);
-
-    tempLength = strlen (tempString) + 1;
-
-    /* 
-     * If the string is too large, suppress the leading space.
-     */
-    if (tempLength > len) {
-        tempLength--;
-        tempString++;
-    }
-
-    /* 
-     * If the string is still too large, suppress the trailing null.
-     */
-    if (tempLength > len)
-        tempLength--;
-
-    /* 
-     * If the string is still too large, fail.
-     */
-    if (tempLength > len)
-        return FALSE;
+        int tempLength;
+        char *tempString;
+        char tempBuffer[32];
 
-    /* 
-     * Copy the string to the field.
-     */
-    memcpy (cp, tempString, len);
+        /* 
+         * Create a string of the specified length with an initial space,
+         * leading zeroes and the octal number, and a trailing null.
+         */
+        tempString = tempBuffer;
 
-    return TRUE;
+        sprintf(tempString, " %0*lo", len - 2, value);
+
+        tempLength = strlen(tempString) + 1;
+
+        /* 
+         * If the string is too large, suppress the leading space.
+         */
+        if (tempLength > len) {
+                tempLength--;
+                tempString++;
+        }
+
+        /* 
+         * If the string is still too large, suppress the trailing null.
+         */
+        if (tempLength > len)
+                tempLength--;
+
+        /* 
+         * If the string is still too large, fail.
+         */
+        if (tempLength > len)
+                return FALSE;
+
+        /* 
+         * Copy the string to the field.
+         */
+        memcpy(cp, tempString, len);
+
+        return TRUE;
 }
 #endif