summaryrefslogtreecommitdiff
path: root/zipup.c
diff options
context:
space:
mode:
Diffstat (limited to 'zipup.c')
-rw-r--r--zipup.c1186
1 files changed, 1186 insertions, 0 deletions
diff --git a/zipup.c b/zipup.c
new file mode 100644
index 0000000..c6883f7
--- /dev/null
+++ b/zipup.c
@@ -0,0 +1,1186 @@
+/*
+ Copyright (c) 1990-2005 Info-ZIP. All rights reserved.
+
+ See the accompanying file LICENSE, version 2004-May-22 or later
+ (the contents of which are also included in zip.h) for terms of use.
+ If, for some reason, both of these files are missing, the Info-ZIP license
+ also may be found at: ftp://ftp.info-zip.org/pub/infozip/license.html
+*/
+/*
+ * zipup.c by Mark Adler and Jean-loup Gailly.
+ */
+#define __ZIPUP_C
+
+#include <ctype.h>
+#include "zip.h"
+
+#ifndef UTIL /* This module contains no code for Zip Utilities */
+
+#include "revision.h"
+#include "crypt.h"
+#ifdef USE_ZLIB
+# include "zlib.h"
+#endif
+
+#ifdef OS2
+# include "os2/os2zip.h"
+#endif
+
+#if defined(MMAP)
+# include <sys/mman.h>
+# ifndef PAGESIZE /* used to be SYSV, what about pagesize on SVR3 ? */
+# define PAGESIZE getpagesize()
+# endif
+# if defined(NO_VALLOC) && !defined(valloc)
+# define valloc malloc
+# endif
+#endif
+
+/* Use the raw functions for MSDOS and Unix to save on buffer space.
+ They're not used for VMS since it doesn't work (raw is weird on VMS).
+ */
+
+#ifdef AMIGA
+# include "amiga/zipup.h"
+#endif /* AMIGA */
+
+#ifdef AOSVS
+# include "aosvs/zipup.h"
+#endif /* AOSVS */
+
+#ifdef ATARI
+# include "atari/zipup.h"
+#endif
+
+#ifdef __BEOS__
+# include "beos/zipup.h"
+#endif
+
+#ifdef __ATHEOS__
+# include "atheos/zipup.h"
+#endif /* __ATHEOS__ */
+
+#ifdef __human68k__
+# include "human68k/zipup.h"
+#endif /* __human68k__ */
+
+#ifdef MACOS
+# include "macos/zipup.h"
+#endif
+
+#ifdef DOS
+# include "msdos/zipup.h"
+#endif /* DOS */
+
+#ifdef OS2
+# include "os2/zipup.h"
+#endif /* OS2 */
+
+#ifdef RISCOS
+# include "acorn/zipup.h"
+#endif
+
+#ifdef TOPS20
+# include "tops20/zipup.h"
+#endif
+
+#ifdef UNIX
+# include "unix/zipup.h"
+#endif
+
+#ifdef CMS_MVS
+# include "zipup.h"
+#endif /* CMS_MVS */
+
+#ifdef TANDEM
+# include "zipup.h"
+#endif /* TANDEM */
+
+#ifdef VMS
+# include "vms/zipup.h"
+#endif /* VMS */
+
+#ifdef QDOS
+# include "qdos/zipup.h"
+#endif /* QDOS */
+
+#ifdef WIN32
+# include "win32/zipup.h"
+#endif
+
+#ifdef THEOS
+# include "theos/zipup.h"
+#endif
+
+/* Local functions */
+#ifndef RISCOS
+ local int suffixes OF((char *, char *));
+#else
+ local int filetypes OF((char *, char *));
+#endif
+local unsigned file_read OF((char *buf, unsigned size));
+#ifdef USE_ZLIB
+ local int zl_deflate_init OF((int pack_level));
+#else /* !USE_ZLIB */
+# ifdef ZP_NEED_MEMCOMPR
+ local unsigned mem_read OF((char *buf, unsigned size));
+# endif
+#endif /* ?USE_ZLIB */
+local ulg filecompress OF((struct zlist far *z_entry, FILE *zipfile,
+ int *cmpr_method));
+
+/* Deflate "internal" global data (currently not in zip.h) */
+#if defined(MMAP) || defined(BIG_MEM)
+# ifdef USE_ZLIB
+ local uch *window = NULL; /* Used to read all input file at once */
+ local ulg window_size; /* size of said window */
+# else /* !USE_ZLIB */
+ extern uch *window; /* Used to read all input file at once */
+#endif /* ?USE_ZLIB */
+#endif /* MMAP || BIG_MEM */
+#ifndef USE_ZLIB
+ extern ulg window_size; /* size of said window */
+
+ unsigned (*read_buf) OF((char *buf, unsigned size)) = file_read;
+ /* Current input function. Set to mem_read for in-memory compression */
+#endif /* !USE_ZLIB */
+
+
+/* Local data */
+local ulg crc; /* crc on uncompressed file data */
+local ftype ifile; /* file to compress */
+#if defined(MMAP) || defined(BIG_MEM)
+ local ulg remain;
+ /* window bytes not yet processed.
+ * special value "(ulg)-1L" reserved to signal normal reads.
+ */
+#endif /* MMAP || BIG_MEM */
+#ifdef USE_ZLIB
+ local int deflInit; /* flag: zlib deflate is initialized */
+ local z_stream zstrm; /* zlib's data interface structure */
+ local char *f_ibuf = NULL;
+ local char *f_obuf = NULL;
+#else /* !USE_ZLIB */
+ local FILE *zfile; /* output zip file */
+ local char file_outbuf[1024]; /* output buffer for compression to file */
+
+# ifdef ZP_NEED_MEMCOMPR
+ local char *in_buf;
+ /* Current input buffer, in_buf is used only for in-memory compression. */
+ local unsigned in_offset;
+ /* Current offset in input buffer. in_offset is used only for in-memory
+ * compression. On 16 bit machines, the buffer is limited to 64K.
+ */
+ local unsigned in_size;
+ /* size of current input buffer */
+# endif /* ZP_NEED_MEMCOMPR */
+#endif /* ?USE_ZLIB */
+
+#ifdef DEBUG
+ ulg isize; /* input file size. global only for debugging */
+#else /* !DEBUG */
+ local ulg isize; /* input file size. */
+#endif /* ?DEBUG */
+
+
+int percent(n, m)
+ulg n;
+ulg m; /* n is the original size, m is the new size */
+/* Return the percentage compression from n to m using only integer
+ operations */
+{
+ if (n > 0xffffffL) /* If n >= 16M */
+ { /* then divide n and m by 256 */
+ n += 0x80; n >>= 8;
+ m += 0x80; m >>= 8;
+ }
+ return n > m ? (int)(1 + (200 * (n - m)/n)) / 2 : 0;
+}
+
+#ifndef RISCOS
+
+local int suffixes(a, s)
+char *a; /* name to check suffix of */
+char *s; /* list of suffixes separated by : or ; */
+/* Return true if a ends in any of the suffixes in the list s. */
+{
+ int m; /* true if suffix matches so far */
+ char *p; /* pointer into special */
+ char *q; /* pointer into name a */
+
+#ifdef QDOS
+ short dlen = devlen(a);
+ a = a + dlen;
+#endif
+
+ m = 1;
+#ifdef VMS
+ if( (q = strrchr(a,';')) != NULL ) /* Cut out VMS file version */
+ --q;
+ else
+ q = a + strlen(a) - 1;
+#else /* !VMS */
+ q = a + strlen(a) - 1;
+#endif /* ?VMS */
+ for (p = s + strlen(s) - 1; p >= s; p--)
+ if (*p == ':' || *p == ';')
+ {
+ if (m)
+ return 1;
+ else
+ {
+ m = 1;
+#ifdef VMS
+ if( (q = strrchr(a,';')) != NULL ) /* Cut out VMS file version */
+ --q;
+ else
+ q = a + strlen(a) - 1;
+#else /* !VMS */
+ q = a + strlen(a) - 1;
+#endif /* ?VMS */
+ }
+ }
+ else
+ {
+ m = m && q >= a && case_map(*p) == case_map(*q);
+ q--;
+ }
+ return m;
+}
+
+#else /* RISCOS */
+
+local int filetypes(a, s)
+char *a; /* extra field of file to check filetype of */
+char *s; /* list of filetypes separated by : or ; */
+/* Return true if a is any of the filetypes in the list s. */
+{
+ char *p; /* pointer into special */
+ char typestr[4]; /* filetype hex string taken from a */
+
+ if ((((unsigned*)a)[2] & 0xFFF00000) != 0xFFF00000) {
+ /* The file is not filestamped, always try to compress it */
+ return 0;
+ }
+
+ sprintf(typestr,"%.3X",(((unsigned*)a)[2] & 0x000FFF00) >> 8);
+
+ for (p=s;p<=s+strlen(s)-3;p+=3) { /* p+=3 to skip 3 hex type */
+ while (*p==':' || *p==';')
+ p++;
+
+ if (typestr[0]==toupper(p[0]) && typestr[1]==toupper(p[1]) && typestr[2]==toupper(p[2]))
+ return 1;
+ }
+ return 0;
+}
+#endif /* ?RISCOS */
+
+
+
+/* Note: a zip "entry" includes a local header (which includes the file
+ name), an encryption header if encrypting, the compressed data
+ and possibly an extended local header. */
+
+int zipup(z, y)
+struct zlist far *z; /* zip entry to compress */
+FILE *y; /* output file */
+/* Compress the file z->name into the zip entry described by *z and write
+ it to the file *y. Encrypt if requested. Return an error code in the
+ ZE_ class. Also, update tempzn by the number of bytes written. */
+{
+ iztimes f_utim; /* UNIX GMT timestamps, filled by filetime() */
+ ulg tim; /* time returned by filetime() */
+ ulg a = 0L; /* attributes returned by filetime() */
+ char *b; /* malloc'ed file buffer */
+ extent k = 0; /* result of zread */
+ int l = 0; /* true if this file is a symbolic link */
+ int m; /* method for this entry */
+ ulg o, p; /* offsets in zip file */
+ long q = -3L; /* size returned by filetime */
+ int r; /* temporary variable */
+ ulg s = 0L; /* size of compressed data */
+ int isdir; /* set for a directory name */
+ int set_type = 0; /* set if file type (ascii/binary) unknown */
+
+ z->nam = strlen(z->iname);
+ isdir = z->iname[z->nam-1] == (char)0x2f; /* ascii[(unsigned)('/')] */
+
+ if ((tim = filetime(z->name, &a, &q, &f_utim)) == 0 || q == -3L)
+ return ZE_OPEN;
+
+ /* q is set to -1 if the input file is a device, -2 for a volume label */
+ if (q == -2L) {
+ isdir = 1;
+ q = 0;
+ } else if (isdir != ((a & MSDOS_DIR_ATTR) != 0)) {
+ /* don't overwrite a directory with a file and vice-versa */
+ return ZE_MISS;
+ }
+ z->att = (ush)UNKNOWN; /* will be changed later */
+ z->atx = 0; /* may be changed by set_extra_field() */
+
+ /* Free the old extra fields which are probably obsolete */
+ if (z->ext) {
+ free((zvoid *)(z->extra));
+ }
+ if (z->cext && z->extra != z->cextra) {
+ free((zvoid *)(z->cextra));
+ }
+ z->extra = z->cextra = NULL;
+ z->ext = z->cext = 0;
+
+#if defined(MMAP) || defined(BIG_MEM)
+ remain = (ulg)-1L; /* changed only for MMAP or BIG_MEM */
+#endif /* MMAP || BIG_MEM */
+#if (!defined(USE_ZLIB) || defined(MMAP) || defined(BIG_MEM))
+ window_size = 0L;
+#endif /* !USE_ZLIB || MMAP || BIG_MEM */
+
+ /* Select method based on the suffix and the global method */
+#ifndef RISCOS
+ m = special != NULL && suffixes(z->name, special) ? STORE : method;
+#else /* RISCOS must set m after setting extra field */
+ m = method;
+#endif /* ?RISCOS */
+
+ /* Open file to zip up unless it is stdin */
+ if (strcmp(z->name, "-") == 0)
+ {
+ ifile = (ftype)zstdin;
+#if defined(MSDOS) || defined(__human68k__)
+ if (isatty(zstdin) == 0) /* keep default mode if stdin is a terminal */
+ setmode(zstdin, O_BINARY);
+#endif
+ z->tim = tim;
+ }
+ else
+ {
+#if !(defined(VMS) && defined(VMS_PK_EXTRA))
+ if (extra_fields) {
+ /* create extra field and change z->att and z->atx if desired */
+ set_extra_field(z, &f_utim);
+#ifdef QLZIP
+ if(qlflag)
+ a |= (S_IXUSR) << 16; /* Cross compilers don't set this */
+#endif
+#ifdef RISCOS
+ m = special != NULL && filetypes(z->extra, special) ? STORE : method;
+#endif /* RISCOS */
+ }
+#endif /* !(VMS && VMS_PK_EXTRA) */
+ l = issymlnk(a);
+ if (l) {
+ ifile = fbad;
+ m = STORE;
+ }
+ else if (isdir) { /* directory */
+ ifile = fbad;
+ m = STORE;
+ q = 0;
+ }
+#ifdef THEOS
+ else if (((a >> 16) & S_IFMT) == S_IFLIB) { /* library */
+ ifile = fbad;
+ m = STORE;
+ q = 0;
+ }
+#endif
+ else {
+#ifdef CMS_MVS
+ if (bflag) {
+ if ((ifile = zopen(z->name, fhowb)) == fbad)
+ return ZE_OPEN;
+ }
+ else
+#endif /* CMS_MVS */
+ if ((ifile = zopen(z->name, fhow)) == fbad)
+ return ZE_OPEN;
+ }
+
+ z->tim = tim;
+
+#if defined(VMS) && defined(VMS_PK_EXTRA)
+ /* vms_get_attributes must be called after vms_open() */
+ if (extra_fields) {
+ /* create extra field and change z->att and z->atx if desired */
+ vms_get_attributes(ifile, z, &f_utim);
+ }
+#endif /* VMS && VMS_PK_EXTRA */
+
+#if defined(MMAP) || defined(BIG_MEM)
+ /* Map ordinary files but not devices. This code should go in fileio.c */
+ if (!translate_eol && m != STORE && q != -1L && (ulg)q > 0 &&
+ (ulg)q + MIN_LOOKAHEAD > (ulg)q) {
+# ifdef MMAP
+ /* Map the whole input file in memory */
+ if (window != NULL)
+ free(window); /* window can't be a mapped file here */
+ window_size = (ulg)q + MIN_LOOKAHEAD;
+ remain = window_size & (PAGESIZE-1);
+ /* If we can't touch the page beyond the end of file, we must
+ * allocate an extra page.
+ */
+ if (remain > MIN_LOOKAHEAD) {
+ window = (uch*)mmap(0, window_size, PROT_READ, MAP_PRIVATE, ifile, 0);
+ } else {
+ window = (uch*)valloc(window_size - remain + PAGESIZE);
+ if (window != NULL) {
+ window = (uch*)mmap((char*)window, window_size - remain, PROT_READ,
+ MAP_PRIVATE | MAP_FIXED, ifile, 0);
+ } else {
+ window = (uch*)(-1);
+ }
+ }
+ if (window == (uch*)(-1)) {
+ Trace((mesg, " mmap failure on %s\n", z->name));
+ window = NULL;
+ window_size = 0L;
+ remain = (ulg)-1L;
+ } else {
+ remain = (ulg)q;
+ }
+# else /* !MMAP, must be BIG_MEM */
+ /* Read the whole input file at once */
+ window_size = (ulg)q + MIN_LOOKAHEAD;
+ window = window ? (uch*) realloc(window, (unsigned)window_size)
+ : (uch*) malloc((unsigned)window_size);
+ /* Just use normal code if big malloc or realloc fails: */
+ if (window != NULL) {
+ remain = (ulg)zread(ifile, (char*)window, q+1);
+ if (remain != (ulg)q) {
+ fprintf(mesg, " q=%lu, remain=%lu ", (ulg)q, remain);
+ error("can't read whole file at once");
+ }
+ } else {
+ window_size = 0L;
+ }
+# endif /* ?MMAP */
+ }
+#endif /* MMAP || BIG_MEM */
+
+ } /* strcmp(z->name, "-") == 0 */
+
+ if (q == 0)
+ m = STORE;
+ if (m == BEST)
+ m = DEFLATE;
+
+ /* Do not create STORED files with extended local headers if the
+ * input size is not known, because such files could not be extracted.
+ * So if the zip file is not seekable and the input file is not
+ * on disk, obey the -0 option by forcing deflation with stored block.
+ * Note however that using "zip -0" as filter is not very useful...
+ * ??? to be done.
+ */
+
+ /* Fill in header information and write local header to zip file.
+ * This header will later be re-written since compressed length and
+ * crc are not yet known.
+ */
+
+ /* (Assume ext, cext, com, and zname already filled in.) */
+#if defined(OS2) || defined(WIN32)
+ z->vem = (ush)(z->dosflag ? (dosify ? 20 : /* Made under MSDOS by PKZIP 2.0 */
+ (0 + Z_MAJORVER * 10 + Z_MINORVER))
+ : OS_CODE + Z_MAJORVER * 10 + Z_MINORVER);
+ /* For a FAT file system, we cheat and pretend that the file
+ * was not made on OS2/WIN32 but under DOS. unzip is confused otherwise.
+ */
+#else /* !(OS2 || WIN32) */
+ z->vem = (ush)(dosify ? 20 : OS_CODE + Z_MAJORVER * 10 + Z_MINORVER);
+#endif /* ?(OS2 || WIN32) */
+
+ z->ver = (ush)(m == STORE ? 10 : 20); /* Need PKUNZIP 2.0 except for store */
+ z->crc = 0; /* to be updated later */
+ /* Assume first that we will need an extended local header: */
+ z->flg = 8; /* to be updated later */
+#if CRYPT
+ if (key != NULL) {
+ z->flg |= 1;
+ /* Since we do not yet know the crc here, we pretend that the crc
+ * is the modification time:
+ */
+ z->crc = z->tim << 16;
+ }
+#endif /* CRYPT */
+ z->lflg = z->flg;
+ z->how = (ush)m; /* may be changed later */
+ z->siz = (ulg)(m == STORE && q >= 0 ? q : 0); /* will be changed later */
+ z->len = (ulg)(q != -1L ? q : 0); /* may be changed later */
+ z->dsk = 0;
+ if (z->att == (ush)UNKNOWN) {
+ z->att = BINARY; /* set sensible value in header */
+ set_type = 1;
+ }
+ /* Attributes from filetime(), flag bits from set_extra_field(): */
+#if defined(DOS) || defined(OS2) || defined(WIN32)
+ z->atx = z->dosflag ? a & 0xff : a | (z->atx & 0x0000ff00);
+#else
+ z->atx = dosify ? a & 0xff : a | (z->atx & 0x0000ff00);
+#endif /* DOS || OS2 || WIN32 */
+ z->off = tempzn;
+ if ((r = putlocal(z, y)) != ZE_OK) {
+ if (ifile != fbad)
+ zclose(ifile);
+ return r;
+ }
+ tempzn += 4 + LOCHEAD + z->nam + z->ext;
+
+#if CRYPT
+ if (key != NULL) {
+ crypthead(key, z->crc, y);
+ z->siz += RAND_HEAD_LEN; /* to be updated later */
+ tempzn += RAND_HEAD_LEN;
+ }
+#endif /* CRYPT */
+ if (ferror(y)) {
+ if (ifile != fbad)
+ zclose(ifile);
+ ZIPERR(ZE_WRITE, "unexpected error on zip file");
+ }
+
+ o = ftell(y); /* for debugging only, ftell can fail on pipes */
+ if (ferror(y))
+ clearerr(y);
+
+ /* Write stored or deflated file to zip file */
+ isize = 0L;
+ crc = CRCVAL_INITIAL;
+
+ if (m == DEFLATE) {
+ if (set_type) z->att = (ush)UNKNOWN; /* is finally set in filecompress() */
+ s = filecompress(z, y, &m);
+#ifndef PGP
+ if (z->att == (ush)BINARY && translate_eol) {
+ zipwarn("-l used on binary file", "");
+ }
+#endif
+ }
+ else if (!isdir)
+ {
+ if ((b = malloc(SBSZ)) == NULL)
+ return ZE_MEM;
+
+ if (l) {
+ k = rdsymlnk(z->name, b, SBSZ);
+/*
+ * compute crc first because zfwrite will alter the buffer b points to !!
+ */
+ crc = crc32(crc, (uch *) b, k);
+ if (zfwrite(b, 1, k, y) != k)
+ {
+ free((zvoid *)b);
+ return ZE_TEMP;
+ }
+ isize = k;
+
+#ifdef MINIX
+ q = k;
+#endif /* MINIX */
+ }
+ else
+ {
+ while ((k = file_read(b, SBSZ)) > 0 && k != (extent) EOF)
+ {
+ if (zfwrite(b, 1, k, y) != k)
+ {
+ if (ifile != fbad)
+ zclose(ifile);
+ free((zvoid *)b);
+ return ZE_TEMP;
+ }
+#ifndef WINDLL
+ if (verbose) putc('.', stderr);
+#else
+ if (verbose) fprintf(stdout,"%c",'.');
+#endif
+ }
+ }
+ free((zvoid *)b);
+ s = isize;
+ }
+ if (ifile != fbad && zerr(ifile)) {
+ perror("\nzip warning");
+ zipwarn("could not read input file: ", z->zname);
+ }
+ if (ifile != fbad)
+ zclose(ifile);
+#ifdef MMAP
+ if (remain != (ulg)-1L) {
+ munmap((caddr_t) window, window_size);
+ window = NULL;
+ }
+#endif /*MMAP */
+
+ tempzn += s;
+ p = tempzn; /* save for future fseek() */
+
+#if (!defined(MSDOS) || defined(OS2))
+#if !defined(VMS) && !defined(CMS_MVS) && !defined(__mpexl)
+ /* Check input size (but not in VMS -- variable record lengths mess it up)
+ * and not on MSDOS -- diet in TSR mode reports an incorrect file size)
+ */
+#ifndef TANDEM /* Tandem EOF does not match byte count unless Unstructured */
+ if (!translate_eol && q != -1L && isize != (ulg)q)
+ {
+ Trace((mesg, " i=%lu, q=%lu ", isize, q));
+ zipwarn(" file size changed while zipping ", z->name);
+ }
+#endif /* !TANDEM */
+#endif /* !VMS && !CMS_MVS && !__mpexl */
+#endif /* (!MSDOS || OS2) */
+
+ /* Try to rewrite the local header with correct information */
+ z->crc = crc;
+ z->siz = s;
+#if CRYPT
+ if (key != NULL)
+ z->siz += RAND_HEAD_LEN;
+#endif /* CRYPT */
+ z->len = isize;
+#ifdef BROKEN_FSEEK
+ if (!fseekable(y) || fseek(y, z->off, SEEK_SET))
+#else
+ if (fseek(y, z->off, SEEK_SET))
+#endif
+ {
+ if (z->how != (ush) m)
+ error("can't rewrite method");
+ if (m == STORE && q < 0)
+ ZIPERR(ZE_PARMS, "zip -0 not supported for I/O on pipes or devices");
+ if ((r = putextended(z, y)) != ZE_OK)
+ return r;
+ tempzn += 16L;
+ z->flg = z->lflg; /* if flg modified by inflate */
+ } else {
+ /* seek ok, ftell() should work, check compressed size */
+#if !defined(VMS) && !defined(CMS_MVS)
+ if (p - o != s) {
+ fprintf(mesg, " s=%ld, actual=%ld ", s, p-o);
+ error("incorrect compressed size");
+ }
+#endif /* !VMS && !CMS_MVS */
+ z->how = (ush)m;
+ z->ver = (ush)(m == STORE ? 10 : 20); /* Need PKUNZIP 2.0 unless STORED */
+ if ((z->flg & 1) == 0)
+ z->flg &= ~8; /* clear the extended local header flag */
+ z->lflg = z->flg;
+ /* rewrite the local header: */
+ if ((r = putlocal(z, y)) != ZE_OK)
+ return r;
+ if (fseek(y, p, SEEK_SET))
+ return ZE_READ;
+ if ((z->flg & 1) != 0) {
+ /* encrypted file, extended header still required */
+ if ((r = putextended(z, y)) != ZE_OK)
+ return r;
+ tempzn += 16L;
+ }
+ }
+ /* Free the local extra field which is no longer needed */
+ if (z->ext) {
+ if (z->extra != z->cextra) {
+ free((zvoid *)(z->extra));
+ z->extra = NULL;
+ }
+ z->ext = 0;
+ }
+
+ /* Display statistics */
+ if (noisy)
+ {
+ if (verbose)
+ fprintf(mesg, "\t(in=%lu) (out=%lu)", isize, s);
+ if (m == DEFLATE)
+ fprintf(mesg, " (deflated %d%%)\n", percent(isize, s));
+ else
+ fprintf(mesg, " (stored 0%%)\n");
+ fflush(mesg);
+ }
+#ifdef WINDLL
+ if (lpZipUserFunctions->ServiceApplication != NULL)
+ {
+ if ((*lpZipUserFunctions->ServiceApplication)(z->zname, isize))
+ {
+ ZIPERR(ZE_ABORT, "User terminated operation");
+ }
+ }
+#endif
+ return ZE_OK;
+}
+
+
+local unsigned file_read(buf, size)
+ char *buf;
+ unsigned size;
+/* Read a new buffer from the current input file, perform end-of-line
+ * translation, and update the crc and input file size.
+ * IN assertion: size >= 2 (for end-of-line translation)
+ */
+{
+ unsigned len;
+ char *b;
+
+#if defined(MMAP) || defined(BIG_MEM)
+ if (remain == 0L) {
+ return 0;
+ } else if (remain != (ulg)-1L) {
+ /* The window data is already in place. We still compute the crc
+ * by 32K blocks instead of once on whole file to keep a certain
+ * locality of reference.
+ */
+ Assert(buf == (char*)window + isize, "are you lost?");
+ if ((ulg)size > remain) size = (unsigned)remain;
+ if (size > WSIZE) size = WSIZE; /* don't touch all pages at once */
+ remain -= (ulg)size;
+ len = size;
+ } else
+#endif /* MMAP || BIG_MEM */
+ if (translate_eol == 0) {
+ len = zread(ifile, buf, size);
+ if (len == (unsigned)EOF || len == 0) return len;
+#ifdef OS390
+ b = buf;
+ if (aflag == ASCII) {
+ while (*b != '\0') {
+ *b = (char)ascii[(uch)*b];
+ b++;
+ }
+ }
+#endif
+ } else if (translate_eol == 1) {
+ /* Transform LF to CR LF */
+ size >>= 1;
+ b = buf+size;
+ size = len = zread(ifile, b, size);
+ if (len == (unsigned)EOF || len == 0) return len;
+#ifdef EBCDIC
+ if (aflag == ASCII)
+ {
+ do {
+ char c;
+
+ if ((c = *b++) == '\n') {
+ *buf++ = CR; *buf++ = LF; len++;
+ } else {
+ *buf++ = (char)ascii[(uch)c];
+ }
+ } while (--size != 0);
+ }
+ else
+#endif /* EBCDIC */
+ {
+ do {
+ if ((*buf++ = *b++) == '\n') *(buf-1) = CR, *buf++ = LF, len++;
+ } while (--size != 0);
+ }
+ buf -= len;
+
+ } else {
+ /* Transform CR LF to LF and suppress final ^Z */
+ b = buf;
+ size = len = zread(ifile, buf, size-1);
+ if (len == (unsigned)EOF || len == 0) return len;
+ buf[len] = '\n'; /* I should check if next char is really a \n */
+#ifdef EBCDIC
+ if (aflag == ASCII)
+ {
+ do {
+ char c;
+
+ if ((c = *b++) == '\r' && *b == '\n') {
+ len--;
+ } else {
+ *buf++ = (char)(c == '\n' ? LF : ascii[(uch)c]);
+ }
+ } while (--size != 0);
+ }
+ else
+#endif /* EBCDIC */
+ {
+ do {
+ if (( *buf++ = *b++) == CR && *b == LF) buf--, len--;
+ } while (--size != 0);
+ }
+ if (len == 0) {
+ zread(ifile, buf, 1); len = 1; /* keep single \r if EOF */
+#ifdef EBCDIC
+ if (aflag == ASCII) {
+ *buf = (char)(*buf == '\n' ? LF : ascii[(uch)(*buf)]);
+ }
+#endif
+ } else {
+ buf -= len;
+ if (buf[len-1] == CTRLZ) len--; /* suppress final ^Z */
+ }
+ }
+ crc = crc32(crc, (uch *) buf, len);
+ isize += (ulg)len;
+ /* added check for file size - 2/20/05 */
+ if ((isize & (ulg)0xffffffffL) < (ulg)len) {
+ /* fatal error: file size exceeds Zip limit */
+ ZIPERR(ZE_BIG, "file exceeds Zip's 4GB uncompressed size limit");
+ }
+ return len;
+}
+
+
+#ifdef USE_ZLIB
+
+local int zl_deflate_init(pack_level)
+ int pack_level;
+{
+ unsigned i;
+ int windowBits;
+ int err = Z_OK;
+ int zp_err = ZE_OK;
+
+ if (zlib_version[0] != ZLIB_VERSION[0]) {
+ sprintf(errbuf, "incompatible zlib version (expected %s, found %s)",
+ ZLIB_VERSION, zlib_version);
+ zp_err = ZE_LOGIC;
+ } else if (strcmp(zlib_version, ZLIB_VERSION) != 0) {
+ fprintf(stderr,
+ "\twarning: different zlib version (expected %s, using %s)\n",
+ ZLIB_VERSION, zlib_version);
+ }
+
+ /* windowBits = log2(WSIZE) */
+ for (i = ((unsigned)WSIZE), windowBits = 0; i != 1; i >>= 1, ++windowBits);
+
+ zstrm.zalloc = (alloc_func)Z_NULL;
+ zstrm.zfree = (free_func)Z_NULL;
+
+ Trace((stderr, "initializing deflate()\n"));
+ err = deflateInit2(&zstrm, pack_level, Z_DEFLATED, -windowBits, 8, 0);
+
+ if (err == Z_MEM_ERROR) {
+ sprintf(errbuf, "cannot initialize zlib deflate");
+ zp_err = ZE_MEM;
+ } else if (err != Z_OK) {
+ sprintf(errbuf, "zlib deflateInit failure (%d)", err);
+ zp_err = ZE_LOGIC;
+ }
+
+ deflInit = TRUE;
+ return zp_err;
+}
+
+
+void zl_deflate_free()
+{
+ int err;
+
+ if (f_obuf != NULL) {
+ free(f_obuf);
+ f_obuf = NULL;
+ }
+ if (f_ibuf != NULL) {
+ free(f_ibuf);
+ f_ibuf = NULL;
+ }
+ if (deflInit) {
+ err = deflateEnd(&zstrm);
+ if (err != Z_OK && err !=Z_DATA_ERROR) {
+ ziperr(ZE_LOGIC, "zlib deflateEnd failed");
+ }
+ }
+}
+
+#else /* !USE_ZLIB */
+
+#ifdef ZP_NEED_MEMCOMPR
+/* ===========================================================================
+ * In-memory read function. As opposed to file_read(), this function
+ * does not perform end-of-line translation, and does not update the
+ * crc and input size.
+ * Note that the size of the entire input buffer is an unsigned long,
+ * but the size used in mem_read() is only an unsigned int. This makes a
+ * difference on 16 bit machines. mem_read() may be called several
+ * times for an in-memory compression.
+ */
+local unsigned mem_read(b, bsize)
+ char *b;
+ unsigned bsize;
+{
+ if (in_offset < in_size) {
+ ulg block_size = in_size - in_offset;
+ if (block_size > (ulg)bsize) block_size = (ulg)bsize;
+ memcpy(b, in_buf + in_offset, (unsigned)block_size);
+ in_offset += (unsigned)block_size;
+ return (unsigned)block_size;
+ } else {
+ return 0; /* end of input */
+ }
+}
+#endif /* ZP_NEED_MEMCOMPR */
+
+
+/* ===========================================================================
+ * Flush the current output buffer.
+ */
+void flush_outbuf(o_buf, o_idx)
+ char *o_buf;
+ unsigned *o_idx;
+{
+ if (zfile == NULL) {
+ error("output buffer too small for in-memory compression");
+ }
+ /* Encrypt and write the output buffer: */
+ if (*o_idx != 0) {
+ zfwrite(o_buf, 1, (extent)*o_idx, zfile);
+ if (ferror(zfile)) ziperr(ZE_WRITE, "write error on zip file");
+ }
+ *o_idx = 0;
+}
+
+/* ===========================================================================
+ * Return true if the zip file can be seeked. This is used to check if
+ * the local header can be re-rewritten. This function always returns
+ * true for in-memory compression.
+ * IN assertion: the local header has already been written (ftell() > 0).
+ */
+int seekable()
+{
+ return fseekable(zfile);
+}
+#endif /* ?USE_ZLIB */
+
+
+/* ===========================================================================
+ * Compression to archive file.
+ */
+
+local ulg filecompress(z_entry, zipfile, cmpr_method)
+ struct zlist far *z_entry;
+ FILE *zipfile;
+ int *cmpr_method;
+{
+#ifdef USE_ZLIB
+ int err = Z_OK;
+ unsigned mrk_cnt = 1;
+ int maybe_stored = FALSE;
+ ulg cmpr_size;
+#if defined(MMAP) || defined(BIG_MEM)
+ unsigned ibuf_sz = (unsigned)SBSZ;
+#else
+# define ibuf_sz ((unsigned)SBSZ)
+#endif
+#ifndef OBUF_SZ
+# define OBUF_SZ ZBSZ
+#endif
+
+#if defined(MMAP) || defined(BIG_MEM)
+ if (remain == (ulg)-1L && f_ibuf == NULL)
+#else /* !(MMAP || BIG_MEM */
+ if (f_ibuf == NULL)
+#endif /* MMAP || BIG_MEM */
+ f_ibuf = (char *)malloc(SBSZ);
+ if (f_obuf == NULL)
+ f_obuf = (char *)malloc(OBUF_SZ);
+#if defined(MMAP) || defined(BIG_MEM)
+ if ((remain == (ulg)-1L && f_ibuf == NULL) || f_obuf == NULL)
+#else /* !(MMAP || BIG_MEM */
+ if (f_ibuf == NULL || f_obuf == NULL)
+#endif /* MMAP || BIG_MEM */
+ ziperr(ZE_MEM, "allocating zlib file-I/O buffers");
+
+ if (!deflInit) {
+ err = zl_deflate_init(level);
+ if (err != ZE_OK)
+ ziperr(err, errbuf);
+ }
+
+ if (level <= 2) {
+ z_entry->flg |= 4;
+ } else if (level >= 8) {
+ z_entry->flg |= 2;
+ }
+#if defined(MMAP) || defined(BIG_MEM)
+ if (remain != (ulg)-1L) {
+ zstrm.next_in = (Bytef *)window;
+ ibuf_sz = (unsigned)WSIZE;
+ } else
+#endif /* MMAP || BIG_MEM */
+ {
+ zstrm.next_in = (Bytef *)f_ibuf;
+ }
+ zstrm.avail_in = file_read(zstrm.next_in, ibuf_sz);
+ if (zstrm.avail_in < ibuf_sz) {
+ unsigned more = file_read(zstrm.next_in + zstrm.avail_in,
+ (ibuf_sz - zstrm.avail_in));
+ if (more == EOF || more == 0) {
+ maybe_stored = TRUE;
+ } else {
+ zstrm.avail_in += more;
+ }
+ }
+ zstrm.next_out = (Bytef *)f_obuf;
+ zstrm.avail_out = OBUF_SZ;
+
+ if (!maybe_stored) while (zstrm.avail_in != 0 && zstrm.avail_in != EOF) {
+ err = deflate(&zstrm, Z_NO_FLUSH);
+ if (err != Z_OK && err != Z_STREAM_END) {
+ sprintf(errbuf, "unexpected zlib deflate error %d", err);
+ ziperr(ZE_LOGIC, errbuf);
+ }
+ if (zstrm.avail_out == 0) {
+ if (zfwrite(f_obuf, 1, OBUF_SZ, zipfile) != OBUF_SZ) {
+ ziperr(ZE_TEMP, "error writing to zipfile");
+ }
+ zstrm.next_out = (Bytef *)f_obuf;
+ zstrm.avail_out = OBUF_SZ;
+ }
+ if (zstrm.avail_in == 0) {
+ if (verbose)
+ while((unsigned)(zstrm.total_in / (uLong)WSIZE) > mrk_cnt) {
+ mrk_cnt++;
+#ifndef WINDLL
+ putc('.', stderr);
+#else
+ fprintf(stdout,"%c",'.');
+#endif
+ }
+#if defined(MMAP) || defined(BIG_MEM)
+ if (remain == (ulg)-1L)
+ zstrm.next_in = (Bytef *)f_ibuf;
+#else
+ zstrm.next_in = (Bytef *)f_ibuf;
+#endif
+ zstrm.avail_in = file_read(zstrm.next_in, ibuf_sz);
+ }
+ }
+
+ do {
+ err = deflate(&zstrm, Z_FINISH);
+ if (maybe_stored) {
+ if (err == Z_STREAM_END && zstrm.total_out >= zstrm.total_in &&
+ fseekable(zipfile)) {
+ /* deflation does not reduce size, switch to STORE method */
+ unsigned len_out = (unsigned)zstrm.total_in;
+ if (zfwrite(f_ibuf, 1, len_out, zipfile) != len_out) {
+ ziperr(ZE_TEMP, "error writing to zipfile");
+ }
+ zstrm.total_out = (uLong)len_out;
+ *cmpr_method = STORE;
+ break;
+ } else {
+ maybe_stored = FALSE;
+ }
+ }
+ if (zstrm.avail_out < OBUF_SZ) {
+ unsigned len_out = OBUF_SZ - zstrm.avail_out;
+ if (zfwrite(f_obuf, 1, len_out, zipfile) != len_out) {
+ ziperr(ZE_TEMP, "error writing to zipfile");
+ }
+ zstrm.next_out = (Bytef *)f_obuf;
+ zstrm.avail_out = OBUF_SZ;
+ }
+ } while (err == Z_OK);
+
+ if (err != Z_STREAM_END) {
+ sprintf(errbuf, "unexpected zlib deflate error %d", err);
+ ziperr(ZE_LOGIC, errbuf);
+ }
+
+ if (z_entry->att == (ush)UNKNOWN)
+ z_entry->att = (ush)(zstrm.data_type == Z_ASCII ? ASCII : BINARY);
+ cmpr_size = (ulg)zstrm.total_out;
+
+ if ((err = deflateReset(&zstrm)) != Z_OK)
+ ziperr(ZE_LOGIC, "zlib deflateReset failed");
+ return cmpr_size;
+#else /* !USE_ZLIB */
+
+ /* Set the defaults for file compression. */
+ zfile = zipfile;
+ read_buf = file_read;
+
+ /* Initialize deflate's internals and execute file compression. */
+ bi_init(file_outbuf, sizeof(file_outbuf), TRUE);
+ ct_init(&z_entry->att, cmpr_method);
+ lm_init(level, &z_entry->flg);
+ return deflate();
+#endif /* ?USE_ZLIB */
+}
+
+#ifdef ZP_NEED_MEMCOMPR
+/* ===========================================================================
+ * In-memory compression. This version can be used only if the entire input
+ * fits in one memory buffer. The compression is then done in a single
+ * call of memcompress(). (An extension to allow repeated calls would be
+ * possible but is not needed here.)
+ * The first two bytes of the compressed output are set to a short with the
+ * method used (DEFLATE or STORE). The following four bytes contain the CRC.
+ * The values are stored in little-endian order on all machines.
+ * This function returns the byte size of the compressed output, including
+ * the first six bytes (method and crc).
+ */
+
+ulg memcompress(tgt, tgtsize, src, srcsize)
+ char *tgt, *src; /* target and source buffers */
+ ulg tgtsize, srcsize; /* target and source sizes */
+{
+ ulg crc;
+ unsigned out_total;
+ int method = DEFLATE;
+#ifdef USE_ZLIB
+ int err = Z_OK;
+#else
+ ush att = (ush)UNKNOWN;
+ ush flags = 0;
+#endif
+
+ if (tgtsize <= (ulg)6L) error("target buffer too small");
+ out_total = 2 + 4;
+
+#ifdef USE_ZLIB
+ if (!deflInit) {
+ err = zl_deflate_init(level);
+ if (err != ZE_OK)
+ ziperr(err, errbuf);
+ }
+
+ zstrm.next_in = (Bytef *)src;
+ zstrm.avail_in = (uInt)srcsize;
+ zstrm.next_out = (Bytef *)(tgt + out_total);
+ zstrm.avail_out = (uInt)tgtsize - (uInt)out_total;
+
+ err = deflate(&zstrm, Z_FINISH);
+ if (err != Z_STREAM_END)
+ error("output buffer too small for in-memory compression");
+ out_total += (unsigned)zstrm.total_out;
+
+ if ((err = deflateReset(&zstrm)) != Z_OK)
+ error("zlib deflateReset failed");
+#else /* !USE_ZLIB */
+ zfile = NULL;
+ read_buf = mem_read;
+ in_buf = src;
+ in_size = (unsigned)srcsize;
+ in_offset = 0;
+ window_size = 0L;
+
+ bi_init(tgt + (2 + 4), (unsigned)(tgtsize - (2 + 4)), FALSE);
+ ct_init(&att, &method);
+ lm_init((level != 0 ? level : 1), &flags);
+ out_total += (unsigned)deflate();
+ window_size = 0L; /* was updated by lm_init() */
+#endif /* ?USE_ZLIB */
+
+ crc = CRCVAL_INITIAL;
+ crc = crc32(crc, (uch *)src, (extent)srcsize);
+
+ /* For portability, force little-endian order on all machines: */
+ tgt[0] = (char)(method & 0xff);
+ tgt[1] = (char)((method >> 8) & 0xff);
+ tgt[2] = (char)(crc & 0xff);
+ tgt[3] = (char)((crc >> 8) & 0xff);
+ tgt[4] = (char)((crc >> 16) & 0xff);
+ tgt[5] = (char)((crc >> 24) & 0xff);
+
+ return (ulg)out_total;
+}
+#endif /* ZP_NEED_MEMCOMPR */
+#endif /* !UTIL */