X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=unzip.c;h=6ec5bd674725f4b8fbcadd879bd4126071dba558;hb=92249085071a973e2c0621b0415b93d2e48bb00d;hp=55185a95c8974a81dff4a2e035df030e4d86e51f;hpb=a2016c1de6e4884f6c8ed5cc498f3bf821c25ca4;p=debian%2Fgzip

diff --git a/unzip.c b/unzip.c
index 55185a9..6ec5bd6 100644
--- a/unzip.c
+++ b/unzip.c
@@ -1,6 +1,6 @@
 /* unzip.c -- decompress files in gzip or pkzip format.
 
-   Copyright (C) 1997-1999, 2009-2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-1999, 2009-2018 Free Software Foundation, Inc.
    Copyright (C) 1992-1993 Jean-loup Gailly
 
    This program is free software; you can redistribute it and/or modify
@@ -31,7 +31,6 @@
 #include <config.h>
 #include "tailor.h"
 #include "gzip.h"
-#include "crypt.h"
 
 /* PKZIP header definitions */
 #define LOCSIG 0x04034b50L      /* four-byte lead-in (lsb first) */
@@ -52,10 +51,9 @@
 
 /* Globals */
 
-int decrypt;        /* flag to turn on decryption */
-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 */
+static int decrypt;        /* flag to turn on decryption */
+static int pkzip = 0;      /* set for a pkzip file */
+static int ext_header = 0; /* set if extended local header */
 
 /* ===========================================================================
  * Check zip file and advance inptr to the start of the compressed data.
@@ -72,33 +70,33 @@ int check_zipfile(in)
     inptr += LOCHDR + SH(h + LOCFIL) + SH(h + LOCEXT);
 
     if (inptr > insize || LG(h) != LOCSIG) {
-	fprintf(stderr, "\n%s: %s: not a valid zip file\n",
-		program_name, ifname);
-	exit_code = ERROR;
-	return ERROR;
+        fprintf(stderr, "\n%s: %s: not a valid zip file\n",
+                program_name, ifname);
+        exit_code = ERROR;
+        return ERROR;
     }
     method = h[LOCHOW];
     if (method != STORED && method != DEFLATED) {
-	fprintf(stderr,
-		"\n%s: %s: first entry not deflated or stored -- use unzip\n",
-		program_name, ifname);
-	exit_code = ERROR;
-	return ERROR;
+        fprintf(stderr,
+                "\n%s: %s: first entry not deflated or stored -- use unzip\n",
+                program_name, ifname);
+        exit_code = ERROR;
+        return ERROR;
     }
 
     /* If entry encrypted, decrypt and validate encryption header */
     if ((decrypt = h[LOCFLG] & CRPFLG) != 0) {
-	fprintf(stderr, "\n%s: %s: encrypted file -- use unzip\n",
-		program_name, ifname);
-	exit_code = ERROR;
-	return ERROR;
+        fprintf(stderr, "\n%s: %s: encrypted file -- use unzip\n",
+                program_name, ifname);
+        exit_code = ERROR;
+        return ERROR;
     }
 
     /* Save flags for unzip() */
     ext_header = (h[LOCFLG] & EXTFLG) != 0;
     pkzip = 1;
 
-    /* Get ofname and time stamp from local header (to be done) */
+    /* Get ofname and timestamp from local header (to be done) */
     return OK;
 }
 
@@ -124,88 +122,88 @@ int unzip(in, out)
     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(inbuf + LOCCRC);
+        orig_len = LG(inbuf + LOCLEN);
     }
 
     /* Decompress */
     if (method == DEFLATED)  {
 
-	int res = inflate();
+        int res = inflate();
 
-	if (res == 3) {
-	    xalloc_die ();
-	} else if (res != 0) {
-	    gzip_error ("invalid compressed data--format violated");
-	}
+        if (res == 3) {
+            xalloc_die ();
+        } else if (res != 0) {
+            gzip_error ("invalid compressed data--format violated");
+        }
 
     } else if (pkzip && method == STORED) {
 
-	register ulg n = LG(inbuf + LOCLEN);
+        register ulg n = LG(inbuf + LOCLEN);
 
-	if (n != LG(inbuf + LOCSIZ) - (decrypt ? RAND_HEAD_LEN : 0)) {
+        if (n != LG(inbuf + LOCSIZ) - (decrypt ? RAND_HEAD_LEN : 0)) {
 
-	    fprintf(stderr, "len %ld, siz %ld\n", n, LG(inbuf + LOCSIZ));
-	    gzip_error ("invalid compressed data--length mismatch");
-	}
-	while (n--) {
-	    uch c = (uch)get_byte();
-	    put_ubyte(c);
-	}
-	flush_window();
+            fprintf(stderr, "len %lu, siz %lu\n", n, LG(inbuf + LOCSIZ));
+            gzip_error ("invalid compressed data--length mismatch");
+        }
+        while (n--) {
+            uch c = (uch)get_byte();
+            put_ubyte(c);
+        }
+        flush_window();
     } else {
-	gzip_error ("internal error, invalid method");
+        gzip_error ("internal error, invalid method");
     }
 
     /* Get the crc and original length */
     if (!pkzip) {
         /* crc32  (see algorithm.doc)
-	 * uncompressed input size modulo 2^32
+         * 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);
+        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
+        /* 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);
+         */
+        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)) {
-	fprintf(stderr, "\n%s: %s: invalid compressed data--crc error\n",
-		program_name, ifname);
-	err = ERROR;
+        fprintf(stderr, "\n%s: %s: invalid compressed data--crc error\n",
+                program_name, ifname);
+        err = ERROR;
     }
     if (orig_len != (ulg)(bytes_out & 0xffffffff)) {
-	fprintf(stderr, "\n%s: %s: invalid compressed data--length error\n",
-		program_name, ifname);
-	err = ERROR;
+        fprintf(stderr, "\n%s: %s: invalid compressed data--length error\n",
+                program_name, ifname);
+        err = ERROR;
     }
 
     /* Check if there are more entries in a pkzip file */
     if (pkzip && inptr + 4 < insize && LG(inbuf+inptr) == LOCSIG) {
-	if (to_stdout) {
-	    WARN((stderr,
-		  "%s: %s has more than one entry--rest ignored\n",
-		  program_name, ifname));
-	} else {
-	    /* Don't destroy the input zip file */
-	    fprintf(stderr,
-		    "%s: %s has more than one entry -- unchanged\n",
-		    program_name, ifname);
-	    err = ERROR;
-	}
+        if (to_stdout) {
+            WARN((stderr,
+                  "%s: %s has more than one entry--rest ignored\n",
+                  program_name, ifname));
+        } else {
+            /* Don't destroy the input zip file */
+            fprintf(stderr,
+                    "%s: %s has more than one entry -- unchanged\n",
+                    program_name, ifname);
+            err = ERROR;
+        }
     }
     ext_header = pkzip = 0; /* for next file */
     if (err == OK) return OK;