@@ -1,3 +1,9 @@

+Mon Apr 10 11:45:07 CEST 2006 (tk)

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

+  * fix other implicit function declarations

+    Thanks to Paul Fisher <pnfisher*berkeley.edu>, Ludwig Nussel

+    <ludwig.nussel*suse.de> and Stephen Gran <steve*lobefin.net>

+

 Mon Apr 10 01:05:28 CEST 2006 (tk)

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

   * libclamav/sis.c: handle pseudo-archives generated by installers

@@ -31,6 +31,8 @@

 #include <sys/stat.h>

 #include <errno.h>

 #include <sys/time.h>

+#include <sys/wait.h>

+

 #if HAVE_SYS_PARAM_H

 #include <sys/param.h>

@@ -70,6 +72,7 @@

 #include "cfgparser.h"

 #include "session.h"

 #include "others.h"

+#include "output.h"

 #define ENV_FILE  "CLAM_VIRUSEVENT_FILENAME"

 #define ENV_VIRUS "CLAM_VIRUSEVENT_VIRUSNAME"

@@ -51,6 +51,8 @@

 #include "../libclamav/others.h"

 #include "../libclamav/str.h" /* cli_strtok */

 #include "dns.h"

+#include "execute.h"

+

 int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, const char *hostname)

@@ -64,6 +64,7 @@ extern int cli_mbox(const char *dir, int desc, unsigned int options); /* FIXME *

 #include "untar.h"

 #include "special.h"

 #include "binhex.h"

+#include "tnef.h"

 #include "sis.h"

 #include "pdf.h"

@@ -320,7 +321,7 @@ static int cli_scanzip(int desc, cli_ctx *ctx, off_t sfx_offset, uint32_t *sfx_c

 	 * Bit 6: Strong encryption was used

 	 * Bit 13: Encrypted central directory

 	 */

-	encrypted = (zdirent.d_flags & 0x2041 != 0);

+	encrypted = ((zdirent.d_flags & 0x2041) != 0);

 	cli_dbgmsg("Zip: %s, crc32: 0x%x, offset: %d, encrypted: %d, compressed: %u, normal: %u, method: %d, ratio: %d (max: %d)\n", zdirent.d_name, zdirent.d_crc32, zdirent.d_off, encrypted, zdirent.d_csize, zdirent.st_size, zdirent.d_compr, zdirent.d_csize ? (zdirent.st_size / zdirent.d_csize) : 0, ctx->limits ? ctx->limits->maxratio : 0);

@@ -1593,8 +1594,7 @@ static int cli_scanraw(int desc, cli_ctx *ctx, cli_file_t type)

 int cli_magic_scandesc(int desc, cli_ctx *ctx)

 {

-	int ret = CL_CLEAN, nret;

-	int bread = 0;

+	int ret = CL_CLEAN;

 	cli_file_t type;

 	struct stat sb;

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

 #include <sys/types.h>

 #include <sys/stat.h>

 #include <fcntl.h>

+#include <ctype.h>

 #include "clamav.h"

 #include "cfgparser.h"