@@ -1,6 +1,14 @@

+Wed Aug  6 03:01:51 CEST 2003

+-----------------------------

+  * clamd: new directives: VirusAction, Debug

+  * libclamav: zziplib downgraded to the old version due to Zip handling

+	       problems

+

 Sun Aug  3 03:35:49 CEST 2003

 -----------------------------

   * libclamav: zziplib updated to 0.10.83-pre1

+  * clamscan: --debug enables libclamav's debug messages without a need

+	      to recompile with --enable-debug

 Sat Jul 26 17:11:46 CEST 2003

 -----------------------------

@@ -68,7 +68,7 @@ dnl there is now a CREATE_PREFIX_TARGET_H in this file as a shorthand for

 dnl PREFIX_CONFIG_H from a target.h file, however w/o the target.h ever created

 dnl (the prefix is a bit different, since we add an extra -target- and -host-)

 dnl 

-dnl @version: $Id: acinclude.m4,v 1.3 2003/08/03 22:25:30 kojm Exp $

+dnl @version: $Id: acinclude.m4,v 1.4 2003/08/06 03:05:50 kojm Exp $

 dnl @author Guido Draheim <guidod@gmx.de>                 STATUS: used often

 AC_DEFUN([AC_CREATE_TARGET_H],

@@ -4110,7 +4110,7 @@ dnl      AC_COMPILE_CHECK_SIZEOF(ptrdiff_t, $headers)

 dnl      AC_COMPILE_CHECK_SIZEOF(off_t, $headers)

 dnl

 dnl @author Kaveh Ghazi <ghazi@caip.rutgers.edu>

-dnl @version $Id: acinclude.m4,v 1.3 2003/08/03 22:25:30 kojm Exp $

+dnl @version $Id: acinclude.m4,v 1.4 2003/08/06 03:05:50 kojm Exp $

 dnl

 AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],

 [changequote(<<, >>)dnl

@@ -81,7 +81,7 @@ dnl there is now a CREATE_PREFIX_TARGET_H in this file as a shorthand for

 dnl PREFIX_CONFIG_H from a target.h file, however w/o the target.h ever created

 dnl (the prefix is a bit different, since we add an extra -target- and -host-)

 dnl 

-dnl @version: $Id: aclocal.m4,v 1.3 2003/08/03 22:25:30 kojm Exp $

+dnl @version: $Id: aclocal.m4,v 1.4 2003/08/06 03:05:50 kojm Exp $

 dnl @author Guido Draheim <guidod@gmx.de>                 STATUS: used often

 AC_DEFUN([AC_CREATE_TARGET_H],

@@ -4041,7 +4041,7 @@ dnl      AC_COMPILE_CHECK_SIZEOF(ptrdiff_t, $headers)

 dnl      AC_COMPILE_CHECK_SIZEOF(off_t, $headers)

 dnl

 dnl @author Kaveh Ghazi <ghazi@caip.rutgers.edu>

-dnl @version $Id: aclocal.m4,v 1.3 2003/08/03 22:25:30 kojm Exp $

+dnl @version $Id: aclocal.m4,v 1.4 2003/08/06 03:05:50 kojm Exp $

 dnl

 AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],

 [changequote(<<, >>)dnl

@@ -62,9 +62,11 @@ struct cfgstruct *parsecfg(const char *cfgfile)

 	    {"FollowDirectorySymlinks", OPT_NOARG},

 	    {"FollowFileSymlinks", OPT_NOARG},

 	    {"Foreground", OPT_NOARG},

+	    {"Debug", OPT_NOARG},

 	    {"User", OPT_STR},

 	    {"AllowSupplementaryGroups", OPT_NOARG},

 	    {"SelfCheck", OPT_NUM},

+	    {"VirusEvent", OPT_FULLSTR},

 	    {"ClamukoScanOnLine", OPT_NOARG},

 	    {"ClamukoScanOnOpen", OPT_NOARG},

 	    {"ClamukoScanOnClose", OPT_NOARG},

@@ -112,6 +114,18 @@ struct cfgstruct *parsecfg(const char *cfgfile)

 				}

 				copt = regcfg(copt, name, arg, 0);

 				break;

+			    case OPT_FULLSTR:

+				if(!arg) {

+				    fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires string as argument.\n", line, name);

+				    return NULL;

+				}

+				// FIXME: this one is an ugly hack of the above

+				// case

+				free(arg);

+				arg = strstr(buff, " ");

+				arg = strdup(++arg);

+				copt = regcfg(copt, name, arg, 0);

+				break;

 			    case OPT_NUM:

 				if(!isnumb(arg)) {

 				    fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires numerical argument.\n", line, name);

@@ -29,6 +29,7 @@

 #define OPT_COMPSIZE 3 /* convert kilobytes (k) and megabytes (m) to bytes */

 #define OPT_NOARG 4 /* no argument */

 #define OPT_OPTARG 5 /* argument is optional, it's registered as string */

+#define OPT_FULLSTR 6 /* string argument, but get a full line */

 struct cfgoption {

     const char *name;

@@ -90,6 +90,9 @@ void clamd(struct optstruct *opt)

     else

 	logsize = CL_DEFAULT_LOGSIZE;

+    if(cfgopt(copt, "Debug")) /* enable debug messages in libclamav */

+	cl_debug();

+

     if(cfgopt(copt, "LogVerbose"))

 	logverbose = 1;

     else

@@ -191,6 +194,7 @@ void clamd(struct optstruct *opt)

     if(!cfgopt(copt, "Foreground"))

 	daemonize();

+

     if(tcpsock)

 	ret = tcpserver(opt, copt, root);

     else

@@ -243,3 +243,45 @@ int rndnum(unsigned int max)

     return generated % max;

 }

 #endif

+

+void virusaction(const char *filename, const char *virname, const struct cfgstruct *copt)

+{

+	char *buffer, *pt, *cmd;

+	struct cfgstruct *cpt;

+

+

+    logg("InVirusAction\n", cmd);

+    if(!(cpt = cfgopt(copt, "VirusEvent")))

+	return;

+

+    cmd = strdup(cpt->strarg);

+    logg("COMMAND: %s\n", cmd);

+

+    buffer = (char *) cli_malloc(strlen(cmd) + strlen(filename) + strlen(virname) + 10, sizeof(char));

+

+    if((pt = strstr(cmd, "%f"))) {

+	*pt = 0; pt += 2;

+	strcpy(buffer, cmd);

+	strcat(buffer, filename);

+	strcat(buffer, pt);

+	free(cmd);

+	cmd = strdup(buffer);

+    }

+

+    if((pt = strstr(cmd, "%v"))) {

+	*pt = 0; pt += 2;

+	strcpy(buffer, cmd);

+	strcat(buffer, virname);

+	strcat(buffer, pt);

+	free(cmd);

+	cmd = strdup(buffer);

+    }

+

+    free(buffer);

+

+    logg("Executing: %s\n", cmd);

+    /* WARNING: this is uninterruptable ! */

+    system(cmd);

+

+    free(cmd);

+}

@@ -20,6 +20,7 @@

 #define __OTHERS_H

 #include <stdlib.h>

+#include "cfgfile.h"

 int mdprintf(int desc, const char *str, ...);

 int isnumb(const char *str);

@@ -37,4 +38,6 @@ int rndnum(unsigned int max);

 short use_syslog;

 #endif

+void virusaction(const char *filename, const char *virname, const struct cfgstruct *copt);

+

 #endif

@@ -91,6 +91,7 @@ int dirscan(const char *dirname, char **virname, unsigned long int *scanned, con

 				if(cl_scanfile(fname, virname, scanned, root, limits, options) == CL_VIRUS) {

 				    mdprintf(odesc, "%s: %s FOUND\n", fname, *virname);

 				    logg("%s: %s FOUND\n", fname, *virname);

+				    virusaction(fname, *virname, copt);

 				    if(!contscan) {

 					closedir(dd);

 					free(fname);

@@ -148,6 +149,7 @@ int scan(const char *filename, unsigned long int *scanned, const struct cl_node

 	    if(ret == CL_VIRUS) {

 		mdprintf(odesc, "%s: %s FOUND\n", filename, virname);

 		logg("%s: %s FOUND\n", filename, virname);

+		virusaction(filename, virname, copt);

 	    } else if(ret != CL_CLEAN) {

 		mdprintf(odesc, "%s: %s ERROR\n", filename, cl_perror(ret));

 		logg("%s: %s ERROR\n", filename, cl_perror(ret));

@@ -262,6 +264,7 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root

     if(ret == CL_VIRUS) {

 	mdprintf(odesc, "stream: %s FOUND\n", virname);

 	logg("stream: %s FOUND\n", virname);

+	virusaction("InputStream", virname, copt);

     } else if(ret != CL_CLEAN) {

 	mdprintf(odesc, "stream: %s ERROR\n", cl_perror(ret));

 	logg("stream: %s ERROR\n", cl_perror(ret));

@@ -1901,7 +1901,7 @@ fi

 # Define the identity of the package.

  PACKAGE=clamav

- VERSION=cvs

+ VERSION=20030806

 cat >>confdefs.h <<_ACEOF

@@ -19,7 +19,7 @@ AC_INIT(clamscan/clamscan.c)

 AC_CREATE_TARGET_H(target.h)

 AC_CANONICAL_SYSTEM

-AM_INIT_AUTOMAKE(clamav, cvs)

+AM_INIT_AUTOMAKE(clamav, 20030806)

 dnl AM_INIT_AUTOMAKE(clamav, `date +%Y%m%d`)

 LC_CURRENT=1

 LC_REVISION=3

@@ -31,7 +31,7 @@

         <p class="COPYRIGHT">Copyright &copy; 2002 by Paul Hoadley and

         Eric Parsonage</p>

-        <p class="PUBDATE">$Date: 2003/08/03 22:25:30 $<br>

+        <p class="PUBDATE">$Date: 2003/08/06 03:05:51 $<br>

         </p>

         <div>

@@ -17,7 +17,7 @@ Size in bytes. You can use a 'M' or 'm' modifiers for megabytes and a 'K' or 'k'

 .TP 

 \fBNUMBER\fR

 Unsigned integer.

-.SH "OPTIONS"

+.SH "DIRECTIVES"

 .LP 

 When some option is not used (hashed or doesn't exist in the configuration file), clamd takes a default action.

 .TP 

@@ -104,6 +104,13 @@ Do internal checks every NUMBER seconds. In some cases it's able to fix a proble

 .br 

 Default: 3600

 .TP 

+\fBVirusEvent COMMAND\fR

+Execute COMMAND when virus is found. In the command string %v and %f will be replaced by the virus name and the infected file name respectively.

+\fBSECURITY WARNING: Make sure the virus event command cannot be exploited, eg. by using some special file name when %f is used. Always use a full path to the command. Never delete/move files with this directive !

+\fR

+.br 

+Default: disabled.

+.TP 

 \fBUser STRING\fR

 When started by root, drop priviledges to a specified user.

 .br 

@@ -91,6 +91,15 @@ MaxDirectoryRecursion 15

 # By default clamd checks itself every 3600 seconds (1 hour).

 #SelfCheck 600

+# Execute a command when virus is found. In the command string %v and %f will

+# be replaced by the virus name and the infected file name respectively.

+#

+# SECURITY WARNING: Make sure the virus event command cannot be exploited,

+#		    eg. by using some special file name when %f is used.

+#		    Always use a full path to the command.

+#		    Never delete/move files with this directive !

+#VirusEvent /usr/local/bin/send_sms 123456789 "VIRUS ALERT: %f: %v"

+

 # Run as selected user (clamd must be started by root).

 # By default it doesn't drop privileges.

 #User clamav

@@ -102,6 +111,9 @@ MaxDirectoryRecursion 15

 # Don't fork into background. Useful in debugging.

 #Foreground

+# Enable debug messages in libclamav.

+#Debug

+

 ##

 ## Mail support

 ##

@@ -62,9 +62,11 @@ struct cfgstruct *parsecfg(const char *cfgfile)

 	    {"FollowDirectorySymlinks", OPT_NOARG},

 	    {"FollowFileSymlinks", OPT_NOARG},

 	    {"Foreground", OPT_NOARG},

+	    {"Debug", OPT_NOARG},

 	    {"User", OPT_STR},

 	    {"AllowSupplementaryGroups", OPT_NOARG},

 	    {"SelfCheck", OPT_NUM},

+	    {"VirusEvent", OPT_FULLSTR},

 	    {"ClamukoScanOnLine", OPT_NOARG},

 	    {"ClamukoScanOnOpen", OPT_NOARG},

 	    {"ClamukoScanOnClose", OPT_NOARG},

@@ -112,6 +114,18 @@ struct cfgstruct *parsecfg(const char *cfgfile)

 				}

 				copt = regcfg(copt, name, arg, 0);

 				break;

+			    case OPT_FULLSTR:

+				if(!arg) {

+				    fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires string as argument.\n", line, name);

+				    return NULL;

+				}

+				// FIXME: this one is an ugly hack of the above

+				// case

+				free(arg);

+				arg = strstr(buff, " ");

+				arg = strdup(++arg);

+				copt = regcfg(copt, name, arg, 0);

+				break;

 			    case OPT_NUM:

 				if(!isnumb(arg)) {

 				    fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires numerical argument.\n", line, name);

@@ -2,7 +2,7 @@

  * Author: 

  *      Guido Draheim <guidod@gmx.de>

  *

- *      Copyright (c) 2001,2002,2003 Guido Draheim

+ *      Copyright (c) 2001 Guido Draheim

  *          All rights reserved,

  *          use under the restrictions of the

  *          Lesser GNU General Public License

@@ -53,34 +53,15 @@

 #define _zzip_inline inline

 #endif

 #endif

-#ifndef _zzip_size_t

-#ifdef   ZZIP_size_t

-#define _zzip_size_t ZZIP_size_t

-#else

-#define _zzip_size_t size_t

-#endif

-#endif

-#ifndef _zzip_ssize_t

-#ifdef   ZZIP_ssize_t

-#define _zzip_ssize_t ZZIP_ssize_t

-#else

-#define _zzip_ssize_t ssize_t

-#endif

-#endif

 /* whether this library shall use a 64bit off_t largefile variant in 64on32: */

 /* (some exported names must be renamed to avoid bad calls after linking) */

-#if defined ZZIP_LARGEFILE_SENSITIVE 

-# if _FILE_OFFSET_BITS+0 == 64

-# define  ZZIP_LARGEFILE_RENAME

-# elif defined  _LARGE_FILES    /* used on older AIX to get at 64bit off_t */

-# define  ZZIP_LARGEFILE_RENAME

-# elif defined  _ZZIP_LARGEFILE /* or simply use this one for zzip64 runs */

-# define  ZZIP_LARGEFILE_RENAME

-# endif

+#if defined ZZIP_LARGEFILE_SENSITIVE && _FILE_OFFSET_BITS+0 == 64

+#define  ZZIP_LARGEFILE_RENAME

+#elif defined  _LARGE_FILES /* on AIX */

+#define  ZZIP_LARGEFILE_RENAME

 #endif

-

-/* if the environment did not setup these for 64bit off_t largefile... */

+/* if some were forgotten but required to have 64bit off_t largefile.. */

 #ifdef   ZZIP_LARGEFILE_RENAME

 # ifndef      _FILE_OFFSET_BITS

 #  ifdef ZZIP__FILE_OFFSET_BITS /* == 64 */

@@ -89,12 +70,7 @@

 # endif

 # ifndef      _LARGE_FILES

 #  ifdef ZZIP__LARGE_FILES /* == 1 */

-#  define     _LARGE_FILES ZZIP__LARGE_FILES

-#  endif

-# endif

-# ifndef      _LARGEFILE_SOURCE

-#  ifdef ZZIP__LARGEFILE_SOURCE /* == 1 */

-#  define     _LARGEFILE_SOURCE ZZIP__LARGEFILE_SOURCE

+#  define     _LARGE_FILES 1

 #  endif

 # endif

 #endif

@@ -165,11 +141,6 @@

 #define __attribute__(X) 

 #endif

-#if defined ZZIP_EXPORTS || defined ZZIPLIB_EXPORTS

-# undef ZZIP_DLL

-#define ZZIP_DLL 1

-#endif

-

 /* based on zconf.h : */

 /* compile with -DZZIP_DLL for Windows DLL support */

 #if defined ZZIP_DLL

@@ -1,3 +1,4 @@

+#define USE_DIRENT 0

 /*

  * Author: 

  *	Guido Draheim <guidod@gmx.de>

@@ -38,8 +39,6 @@

 # endif

 #endif

-#define USE_DIRENT 0

-

 /** 

  * This function is the equivalent of a => rewinddir(2) for a realdir or

  * the zipfile in place of a directory. The ZZIP_DIR handle returned from

@@ -88,14 +88,17 @@ zzip_file_saveoffset(ZZIP_FILE * fp)

     return 0;

 }

-# ifndef ZZIP_CHECK_BACKSLASH_DIRSEPARATOR           /* NOTE: also default */

-# define ZZIP_CHECK_BACKSLASH_DIRSEPARATOR 0         /* to "NO" on win32 ! */

+

+

+# ifndef ZZIP_CHECK_BACKSLASH_DIRSEPARATOR

+# define ZZIP_CHECK_BACKSLASH_DIRSEPARATOR 0

 # endif

 # if !defined strcasecmp && !defined ZZIP_HAVE_STRCASECMP

 # define ZZIP_CHECK_BACKSLASH_DIRSEPARATOR 1

 # endif

+

 #if ! ZZIP_CHECK_BACKSLASH_DIRSEPARATOR+0

 #define dirsep_strrchr(N,C) strrchr(N,C)

 #define dirsep_casecmp strcasecmp

@@ -219,11 +222,11 @@ zzip_file_open(ZZIP_DIR * dir, zzip_char_t* name, int o_mode)

             {   /* skip local header - should test tons of other info, 

 		 * but trust that those are correct */

-                zzip_ssize_t dataoff;

+                int dataoff;

                 struct zzip_file_header * p = (void*) fp->buf32k;

 		dataoff = dir->io->read(dir->fd, (void*)p, sizeof(*p));

-		if (dataoff < (zzip_ssize_t)sizeof(*p))

+		if (dataoff < (int) sizeof(*p))

 		{ err = ZZIP_DIR_READ;  goto error; }

                 if (! ZZIP_FILE_HEADER_CHECKMAGIC(p)) /* PK\3\4 */

 		{ err = ZZIP_CORRUPTED; goto error; }

@@ -320,12 +323,12 @@ zzip_close(ZZIP_FILE* fp)

  *       required just that but the latest zlib would work just fine with

  *       a smaller buffer.

  */

-zzip_ssize_t 

-zzip_file_read(ZZIP_FILE * fp, char * buf, zzip_size_t len)

+int 

+zzip_file_read(ZZIP_FILE * fp, char * buf, int len)

 {

     ZZIP_DIR * dir; 

-    zzip_size_t l;

-    zzip_ssize_t rv;

+    int l;

+    int rv;

     if (! fp || ! fp->dir) return 0;

@@ -355,15 +358,14 @@ zzip_file_read(ZZIP_FILE * fp, char * buf, zzip_size_t len)

          do {

              int err;

-             zzip_size_t startlen;

+             int startlen;

              if (fp->crestlen > 0 && fp->d_stream.avail_in == 0)

              {

-                 zzip_size_t cl = ( fp->crestlen < ZZIP_32K ?

-				    fp->crestlen : ZZIP_32K );

-             /*  zzip_size_t cl = fp->crestlen > 128 ? 128 : fp->crestlen; */

+                 int cl = fp->crestlen > ZZIP_32K ? ZZIP_32K : fp->crestlen;

+             /*  int cl = fp->crestlen > 128? 128: fp->crestlen; */

-                 zzip_ssize_t i = fp->io->read(dir->fd, fp->buf32k, cl);

+                 int i = fp->io->read(dir->fd, fp->buf32k, cl);

                  if (i <= 0)

                  {

                      dir->errcode = ZZIP_DIR_READ; /* or ZZIP_DIR_READ_EOF ? */

@@ -410,14 +412,14 @@ zzip_file_read(ZZIP_FILE * fp, char * buf, zzip_size_t len)

  * perform a normal => read(2)-call, otherwise => zzip_file_read is called

  * to decompress the data stream and any error is mapped to => errno(3).

  */

-zzip_ssize_t

-zzip_read(ZZIP_FILE * fp, char * buf, zzip_size_t len)

+int 

+zzip_read(ZZIP_FILE * fp, char * buf, int len)

 {

     if (! fp) return 0;

     if (! fp->dir) 

       { return fp->io->read(fp->fd, buf, len); } /* stat fd */

     else

-    {   register zzip_ssize_t v;

+    {   register int v;

         v = zzip_file_read(fp, buf, len);

         if (v == -1) { errno = zzip_errno(fp->dir->errcode); }

         return v;

@@ -426,8 +428,8 @@ zzip_read(ZZIP_FILE * fp, char * buf, zzip_size_t len)

 /** => zzip_read

  */

-zzip_size_t

-zzip_fread(void *ptr, zzip_size_t size, zzip_size_t nmemb, ZZIP_FILE *file)

+int 

+zzip_fread(void *ptr, int size, int nmemb, ZZIP_FILE *file)

 {

     if (! size) size=1;

     return zzip_read (file, ptr, size*nmemb)/size;

@@ -712,7 +714,7 @@ zzip_open_shared_io (ZZIP_FILE* stream,

       /* see if we can share the same zip directory */

       if (stream && stream->dir && stream->dir->realname)

       {

-	  zzip_size_t len = strlen (stream->dir->realname);

+	  int len = strlen (stream->dir->realname);

 	  if (! memcmp (filename, stream->dir->realname, len) &&

 	      filename[len] == '/' && filename[len+1])

 	  {

@@ -862,10 +864,10 @@ zzip_rewind(ZZIP_FILE *fp)

  * how gzio implements it, so I'm not sure there is a better way

  * without using the internals of the algorithm.

  */

-zzip_off_t

-zzip_seek(ZZIP_FILE * fp, zzip_off_t offset, int whence)

+int

+zzip_seek(ZZIP_FILE * fp, int offset, int whence)

 {

-    zzip_off_t cur_pos, rel_ofs, read_size, ofs;

+    int cur_pos, rel_ofs, read_size, ofs;

     ZZIP_DIR *dir;

     if (! fp)

@@ -873,7 +875,7 @@ zzip_seek(ZZIP_FILE * fp, zzip_off_t offset, int whence)

     if (! fp->dir) 

     { /* stat fd */

-        return fp->io->seeks(fp->fd, offset, whence);

+        return fp->io->seeks(fp->fd,offset,whence);

     }

     cur_pos = zzip_tell(fp);

@@ -912,7 +914,7 @@ zzip_seek(ZZIP_FILE * fp, zzip_off_t offset, int whence)

     if (read_size < 0) /* bad offset, before beginning of file */

         return -1;

-    if (read_size + cur_pos > (zzip_off_t)fp->usize) /* bad offset, past EOF */

+    if (read_size + cur_pos > fp->usize) /* bad offset, past EOF */

         return -1;

     if (read_size == 0) /* nothing to read */

@@ -951,10 +953,10 @@ zzip_seek(ZZIP_FILE * fp, zzip_off_t offset, int whence)

         while (read_size > 0)  

         {

-            zzip_off_t size = ZZIP_32K;

-            if (read_size < size/*32K*/) size = read_size;

+            int size = ZZIP_32K;

+            if (read_size < ZZIP_32K) size = (int)read_size;

-            size = zzip_file_read(fp, buf, (zzip_size_t)size);

+            size = zzip_file_read(fp, buf, size);

             if (size <= 0) { free(buf); return -1; }

             read_size -= size;

@@ -977,7 +979,7 @@ zzip_seek(ZZIP_FILE * fp, zzip_off_t offset, int whence)

  * calculated from the amount of data left and the total uncompressed

  * size;

  */

-zzip_off_t

+int

 zzip_tell(ZZIP_FILE * fp)

 {

     if (! fp)

@@ -65,10 +65,10 @@ struct zzip_file

   struct zzip_dir* dir; 

   int fd;

   int method;

-  zzip_size_t restlen;

-  zzip_size_t crestlen;

-  zzip_size_t usize;

-  zzip_size_t csize;

+  int restlen;

+  int crestlen;

+  int usize;

+  int csize;

   /* added dataoffset member - data offset from start of zipfile*/

   zzip_off_t dataoffset;

   char* buf32k;

@@ -15,6 +15,7 @@

 #include <zzip-io.h>

 #include <string.h>

+#include <sys/types.h>  /* njh@bandsman.co.uk: for icc7.0 */

 #include <sys/stat.h>

 #include <errno.h>

 #include <stdlib.h>

@@ -24,11 +24,8 @@

 #include <sys/stat.h>

 #endif

-

-#define __sizeof(X) ((zzip_ssize_t)(sizeof(X)))

-

-/* per default, we use a little hack to correct bad z_rootseek parts */

-#define ZZIP_CORRECT_ROOTSEEK 1

+//#include "__mmap.h"

+//#include "__debug.h"

 /* ------------------------- fetch helpers --------------------------------- */

@@ -50,86 +47,6 @@ uint16_t __zzip_get16(unsigned char * s)

     return ((uint16_t)s[1] << 8) | (uint16_t)s[0];

 }

-/* ---------------------------  internals  -------------------------------- */

-/* internal functions of zziplib, avoid at all cost, changes w/o warning.

- * we do export them for debugging purpose and special external tools

- * which know what they do and which can adapt from version to version

- */

-

-int __zzip_find_disk_trailer( int fd, zzip_off_t filesize, 

-			      struct zzip_disk_trailer * trailer,

-			      zzip_plugin_io_t io);

-int __zzip_parse_root_directory( int fd, 

-				 struct zzip_disk_trailer * trailer, 

-				 struct zzip_dir_hdr ** hdr_return,

-				 zzip_plugin_io_t io);

-

-_zzip_inline char* __zzip_aligned4(char* p);

-

-/* ------------------------  harden routines ------------------------------ */

-

-#ifdef ZZIP_HARDEN

-/*

- * check for inconsistent values in trailer and prefer lower seek value

- * - we fix values assuming the root directory was written at the end

- * and it is just before the zip trailer. Therefore, ...

- */

-_zzip_inline static void __fixup_rootseek(

-    zzip_off_t offset_of_trailer,

-    struct zzip_disk_trailer* trailer)

-{

-    if (                    (zzip_off_t) ZZIP_GET32(trailer->z_rootseek) >

-	offset_of_trailer - (zzip_off_t) ZZIP_GET32(trailer->z_rootsize) &&

-	offset_of_trailer > (zzip_off_t) ZZIP_GET32(trailer->z_rootsize))

-    {

-	register zzip_off_t offset;

-	offset = offset_of_trailer -  ZZIP_GET32(trailer->z_rootsize); 

-	trailer->z_rootseek[0] = offset & 0xff;

-	trailer->z_rootseek[1] = offset >> 8 & 0xff;

-	trailer->z_rootseek[2] = offset >> 16 & 0xff;

-	trailer->z_rootseek[3] = offset >> 24 & 0xff;

-    }

-}

-#define __correct_rootseek(A,B,C)

-

-#elif defined ZZIP_CORRECT_ROOTSEEK

-/* store the seekvalue of the trailer into the "z_magic" field and with 

- * a 64bit off_t we overwrite z_disk/z_finaldisk as well. If you change

- * anything in zziplib or dump the trailer structure then watch out that

- * these are still unused, so that this code may still (ab)use those. */

-#define __fixup_rootseek(_offset_of_trailer, _trailer)          \

-                      *(zzip_off_t*)_trailer = _offset_of_trailer;

-#define __correct_rootseek( _u_rootseek, _u_rootsize, _trailer) \

-    if (_u_rootseek > *(zzip_off_t*)_trailer - _u_rootsize)     \

-	_u_rootseek = *(zzip_off_t*)_trailer - _u_rootsize;

-#else

-#define __fixup_rootseek(A,B) 

-#define __correct_rootseek(A,B,C)

-#endif

-

-

-#ifdef DEBUG

-_zzip_inline static void __debug_dir_hdr (struct zzip_dir_hdr* hdr)

-{

-    if (sizeof(struct zzip_dir_hdr) > sizeof(struct zzip_root_dirent))

-    { WARN1("internal sizeof-mismatch may break wreakage"); }

-    /*  the internal directory structure is never bigger than the

-     *  external zip central directory space had been beforehand

-     *  (as long as the following assertion holds...) 

-     */

-

-    if (((unsigned)hdr)&3)

-    { NOTE1("this machine's malloc(3) returns sth. not u32-aligned"); }

-    /* we assume that if this machine's malloc has returned a non-aligned 

-     * memory block, then it is actually safe to access misaligned data, and 

-     * since it does only affect the first hdr it should not even bring about

-     * too much of that cpu's speed penalty

-     */

-}

-#else

-#define __debug_dir_hdr(X)

-#endif

-

 /* -------------------------- low-level interface -------------------------- */

 #if defined BUFSIZ 

@@ -153,7 +70,11 @@ __zzip_find_disk_trailer(int fd, zzip_off_t filesize,

 			 struct zzip_disk_trailer * trailer,

 			 zzip_plugin_io_t io)

 {

+#ifdef DEBUG

+#define return(val) { e=val; goto cleanup; }

+#else

 #define return(val) { e=val; goto cleanup; }

+#endif

     register int e;

 #ifndef _LOWSTK

@@ -163,13 +84,13 @@ __zzip_find_disk_trailer(int fd, zzip_off_t filesize,

     char* buf = malloc(2*ZZIP_BUFSIZ);

 #endif

     zzip_off_t offset = 0;

-    zzip_off_t maplen = 0; /* mmap(),read(),getpagesize() use size_t !! */

+    size_t maplen = 0;

     char* fd_map = 0;

     if (!trailer)

         { return(EINVAL); }

-    if (filesize < __sizeof(struct zzip_disk_trailer))

+    if (filesize < sizeof(struct zzip_disk_trailer))

         { return(ZZIP_DIR_TOO_SHORT); }

     if (!buf)

@@ -178,7 +99,8 @@ __zzip_find_disk_trailer(int fd, zzip_off_t filesize,

     offset = filesize; /* a.k.a. old offset */

     while(1) /* outer loop */

     {

-        register unsigned char* mapped;

+        register unsigned char* p;

+        register unsigned char* s;

          if (offset <= 0) { return(ZZIP_DIR_EDH_MISSING); }

@@ -206,40 +128,35 @@ __zzip_find_disk_trailer(int fd, zzip_off_t filesize,

             if (io->seeks(fd, offset, SEEK_SET) < 0)

                 { return(ZZIP_DIR_SEEK); }

-            if (io->read(fd, buf, (zzip_size_t)maplen) < (zzip_ssize_t)maplen)

+            if (io->read(fd, buf, maplen) < (long)maplen)

                 { return(ZZIP_DIR_READ); }

-            mapped = buf; /* success */

+            p = buf; /* success */

-	{/* now, check for the trailer-magic, hopefully near the end of file */

-	    register unsigned char* end = mapped + maplen;

-	    register unsigned char* tail;

-	    for (tail = end-1; (tail >= mapped); tail--)

-	    {

-		if ((*tail == 'P') && /* quick pre-check for trailer magic */

-		    end-tail >= __sizeof(*trailer)-2 &&

-		    ZZIP_DISK_TRAILER_CHECKMAGIC(tail))

-		{

-		    /* if the file-comment is not present, it happens

-		       that the z_comment field often isn't either */

-		    if (end-tail >= __sizeof(*trailer))

-		    {

-			memcpy (trailer, tail, sizeof(*trailer)); 

-		    }else{

-			memcpy (trailer, tail, sizeof(*trailer)-2);

-			trailer->z_comment[0] = 0; 

-			trailer->z_comment[1] = 0;

-		    }

-

-		    __fixup_rootseek (offset + tail-mapped, trailer);

-		    { return(0); }

-		}

-	    }

+	/* now, check for the trailer-magic, hopefully near the end of file */

+        for (s = p + maplen-1; (s >= p); s--)

+        {

+            if (*s == 'P'

+             && p+maplen-1-s > sizeof(*trailer)-2

+             && ZZIP_DISK_TRAILER_CHECKMAGIC(s))

+            {

+                /* if the file-comment is not present, it happens

+                   that the z_comment field often isn't either */

+                if (p+maplen-1-s > sizeof(*trailer))

+                  { memcpy (trailer, s, sizeof(*trailer)); }

+                else

+                {

+                    memcpy (trailer, s, sizeof(*trailer)-2);

+                    trailer->z_comment[0] = 0; trailer->z_comment[1] = 0;

+                }

+                    

+                { return(0); }

+            }

         }

     } /*outer loop*/

-cleanup:

+ cleanup:

 #   ifdef _LOWSTK

     free(buf);

 #   endif

@@ -257,8 +174,8 @@ cleanup:

 _zzip_inline char* __zzip_aligned4(char* p)

 {

 #define aligned4   __zzip_aligned4

-    p += ((long)p)&1;            /* warnings about truncation of a "pointer" */

-    p += ((long)p)&2;            /* to a "long int" may be safely ignored :) */

+    p += ((long)p)&1;

+    p += ((long)p)&2;

     return p;

 }

@@ -279,19 +196,34 @@ __zzip_parse_root_directory(int fd,

     struct zzip_dir_hdr * hdr0;

     uint16_t * p_reclen = 0;

     short entries; 

-    long offset;          /* offset from start of root directory */

-    char* fd_map = 0; 

+    long offset;

+    char* fd_map = 0;

     int32_t  fd_gap = 0;

     uint16_t u_entries  = ZZIP_GET16(trailer->z_entries);   

     uint32_t u_rootsize = ZZIP_GET32(trailer->z_rootsize);  

     uint32_t u_rootseek = ZZIP_GET32(trailer->z_rootseek);

-    __correct_rootseek (u_rootseek, u_rootsize, trailer);

     hdr0 = (struct zzip_dir_hdr*) malloc(u_rootsize);

     if (!hdr0) 

         return ZZIP_DIRSIZE;

-    hdr = hdr0;                  __debug_dir_hdr (hdr);

+    hdr = hdr0;

+#  ifdef DEBUG

+    if (sizeof(struct zzip_dir_hdr) > sizeof(struct zzip_root_dirent))

+    { WARN1("internal sizeof-mismatch may break wreakage"); }

+    /*  the internal directory structure is never bigger than the

+     *  external zip central directory space had been beforehand

+     *  (as long as the following assertion holds...) 

+     */

+

+    if (((unsigned)hdr0)&3)

+    { NOTE1("this machine's malloc(3) returns sth. not u32-aligned"); }

+    /* we assume that if this machine's malloc has returned a non-aligned 

+     * memory block, then it is actually safe to access misaligned data, and 

+     * since it does only affect the first hdr it should not even bring about

+     * too much of that cpu's speed penalty

+     */

+#  endif

     for (entries=u_entries, offset=0; entries > 0; entries--)

     {

@@ -304,13 +236,11 @@ __zzip_parse_root_directory(int fd,

         {

             if (io->seeks(fd, u_rootseek+offset, SEEK_SET) < 0)

                 return ZZIP_DIR_SEEK;

-            if (io->read(fd, &dirent, sizeof(dirent)) < __sizeof(dirent))

+            if (io->read(fd, &dirent, sizeof(dirent)) < sizeof(dirent))

                 return ZZIP_DIR_READ;

             d = &dirent;

         }

-	if (offset+sizeof(*d) > u_rootsize)

-

 #       if 0 && defined DEBUG

         zzip_debug_xbuf ((unsigned char*) d, sizeof(*d) + 8);

 #       endif        

@@ -318,7 +248,8 @@ __zzip_parse_root_directory(int fd,

         u_extras  = ZZIP_GET16(d->z_extras); 

         u_comment = ZZIP_GET16(d->z_comment); 

         u_namlen  = ZZIP_GET16(d->z_namlen); 

-

+    

+    

         /* writes over the read buffer, Since the structure where data is

            copied is smaller than the data in buffer this can be done.

            It is important that the order of setting the fields is considered

@@ -333,11 +264,10 @@ __zzip_parse_root_directory(int fd,

         hdr->d_compr = (uint8_t)ZZIP_GET16(d->z_compr);

         if (hdr->d_compr > 255) hdr->d_compr = 255;

-	if (offset+sizeof(*d) + u_namlen > u_rootsize)

-

-	if (fd_map) 

-	{  memcpy(hdr->d_name, fd_map+fd_gap+offset+sizeof(*d), u_namlen); }

-	else { io->read(fd, hdr->d_name, u_namlen); }

+        if (fd_map) 

+          { memcpy(hdr->d_name, fd_map+fd_gap+offset+sizeof(*d), u_namlen); }

+        else 

+          { io->read(fd, hdr->d_name, u_namlen); }