@@ -28,6 +28,6 @@ pkgconfig_DATA = libclamav.pc

 # don't complain that configuration files and databases are not removed, this is intended

 distuninstallcheck_listfiles = find . -type f ! -name clamd.conf ! -name freshclam.conf ! -name daily.cvd ! -name main.cvd -print

 DISTCLEANFILES = target.h

-

+DISTCHECK_CONFIGURE_FLAGS=--enable-milter CFLAGS="-Wno-pointer-sign -Wno-error=attributes -Werror-implicit-function-declaration -Werror -Wextra -Wall -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wundef -Wwrite-strings -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wpadded -Wno-error=type-limits -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-error=unused-parameter -Wpacked -Wno-error=packed -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=padded"

 lcov:

 	($(MAKE); cd unit_tests; $(MAKE) lcov)

@@ -263,6 +263,7 @@ pkgconfig_DATA = libclamav.pc

 # don't complain that configuration files and databases are not removed, this is intended

 distuninstallcheck_listfiles = find . -type f ! -name clamd.conf ! -name freshclam.conf ! -name daily.cvd ! -name main.cvd -print

 DISTCLEANFILES = target.h

+DISTCHECK_CONFIGURE_FLAGS = --enable-milter CFLAGS="-Wno-pointer-sign -Wno-error=attributes -Werror-implicit-function-declaration -Werror -Wextra -Wall -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wundef -Wwrite-strings -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wpadded -Wno-error=type-limits -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-error=unused-parameter -Wpacked -Wno-error=packed -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=padded"

 all: clamav-config.h

 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

@@ -790,7 +791,6 @@ uninstall-am: uninstall-binSCRIPTS uninstall-pkgconfigDATA

 	tags tags-recursive uninstall uninstall-am \

 	uninstall-binSCRIPTS uninstall-pkgconfigDATA

-

 lcov:

 	($(MAKE); cd unit_tests; $(MAKE) lcov)

 # Tell versions [3.59,3.63) of GNU make to not export all variables.

@@ -54,7 +54,6 @@ size_t cli_strlcpy(char *dst, const char *src, size_t siz);

 int

 clamd_fdscan(int s, int fd, char *name, size_t len)

 {

-	struct sockaddr_un addr;

 	struct msghdr msg;

 	struct cmsghdr *cmsg;

 	unsigned char fdbuf[CMSG_SPACE(sizeof(int))];

@@ -62,8 +61,9 @@ clamd_fdscan(int s, int fd, char *name, size_t len)

 	char buf[CLAMD_BUFSIZ], *p, *q;

 	off_t pos;

 	struct iovec iov[1];

+	char dummy[]="";

-	iov[0].iov_base = "";

+	iov[0].iov_base = dummy;

 	iov[0].iov_len = 1;

 	pos = lseek(fd, 0, SEEK_CUR);

@@ -81,7 +81,11 @@ clamd_fdscan(int s, int fd, char *name, size_t len)

 	cmsg->cmsg_type = SCM_RIGHTS;

 	*(int *)CMSG_DATA(cmsg) = fd;

-	write(s, "FILDES\n", sizeof("FILDES\n")-1);

+	if(write(s, "FILDES\n", sizeof("FILDES\n")-1) != sizeof("FILDES\n")-1) {

+		perror("write");

+		close(s);

+		return -1;

+	}

 	if (sendmsg(s, &msg, 0) == -1) {

 		perror("sendmsg");

 		close(s);

@@ -89,7 +93,11 @@ clamd_fdscan(int s, int fd, char *name, size_t len)

 	}

 	sp = fdopen(s,"r");

-	fgets(buf, sizeof(buf), sp);

+	if(!fgets(buf, sizeof(buf), sp)) {

+		fclose(sp);

+		close(s);

+		return -1;

+	}

 	fclose(sp);

 	close(s);

@@ -48,6 +48,7 @@

 #include "misc.h"

 #include "str.h"

 #include "client.h"

+#include "clamd_fdscan.h"

 #ifdef PF_INET

 # define SOCKET_INET	PF_INET

@@ -746,7 +746,9 @@ static void move_infected(const char *filename, const struct optstruct *opt)

 	chmod(movefilename, ofstat.st_mode);

 #ifndef C_OS2

-	chown(movefilename, ofstat.st_uid, ofstat.st_gid);

+	if(chown(movefilename, ofstat.st_uid, ofstat.st_gid) == -1) {

+		logg("!Can't chown '%s': %s\n", movefilename, strerror(errno));

+	}

 #endif

 	ubuf.actime = ofstat.st_atime;

@@ -11289,7 +11289,7 @@ cat >>conftest.$ac_ext <<_ACEOF

 /* (C) Richard Guenther */

 extern void abort(void);

-int try (char *a, int d)

+static int try (char *a, int d)

 {

   return a + d > a;

 }

@@ -11375,7 +11375,7 @@ extern void abort(void);

 int crashtest()

 {

-	unsigned int backsize, dcur,i;

+	unsigned int backsize, dcur;

 	int dval=0x12000, unp_offset;

 	int* dsize = &dval;

 	char* dst = (char*)0x12000;

@@ -11470,14 +11470,14 @@ struct a

    unsigned int bits : 1;

    signed long val : ((sizeof(long) * 8) - 1);

 };

-int Fnegate (struct a b)

+static int Fnegate (struct a b)

 {

   if ((-((long)b.val)) <= ((long) ((1UL << ((sizeof(long) * 8) - 2)) -1UL))

       && (-((long)b.val)) >= (-(((long) ((1UL << ((sizeof(long) * 8) - 2)) -1UL))) - 1))

      return 0 ;

   abort ();

 }

-int main ()

+int main (void)

 {

   struct a b = {1, 1};

   Fnegate (b);

@@ -133,7 +133,7 @@ AC_TRY_RUN(

 /* (C) Richard Guenther */	   

 extern void abort(void);

-int try (char *a, int d)

+static int try (char *a, int d)

 {

   return a + d > a;

 }

@@ -174,7 +174,7 @@ extern void abort(void);

 int crashtest()

 {

-	unsigned int backsize, dcur,i;

+	unsigned int backsize, dcur;

 	int dval=0x12000, unp_offset;

 	int* dsize = &dval;

 	char* dst = (char*)0x12000;

@@ -225,14 +225,14 @@ struct a

    unsigned int bits : 1;

    signed long val : ((sizeof(long) * 8) - 1);

 };

-int Fnegate (struct a b)

+static int Fnegate (struct a b)

 {

   if ((-((long)b.val)) <= ((long) ((1UL << ((sizeof(long) * 8) - 2)) -1UL))

       && (-((long)b.val)) >= (-(((long) ((1UL << ((sizeof(long) * 8) - 2)) -1UL))) - 1))

      return 0 ;

   abort ();

 }

-int main ()

+int main (void)

 {

   struct a b = {1, 1};

   Fnegate (b);

@@ -32,5 +32,6 @@ echo "Downloading updated country-code list from iana.org"

 wget $IANA_CCTLD -O $TMP || exit 2

 echo "Download complete, parsing data"

 cat $TMP | grep country-code|egrep -oi "<a

-href=[^>]+>\\.([a-zA-Z]+).+</a>"|egrep -o ">.[a-zA-Z]+" | colrm 1 2 | tr [A-Z] [a-z]| gperf -C -l -L ANSI-C -E -C -H cctld_hash -N in_cctld_set |grep -v '^#line'|sed -e 's/^const struct/static const struct/' -e 's/register //g' >iana_cctld.h

+href=[^>]+>\\.([a-zA-Z]+).+</a>"|egrep -o ">.[a-zA-Z]+" | colrm 1 2 | tr [A-Z]

+[a-z]| gperf -C -l -L ANSI-C -E -C -H cctld_hash -N in_cctld_set |grep -v '^#line'|sed -e 's/^const struct/static const struct/' -e 's/register //g' -e 's/^const char \*/static const char */' >iana_cctld.h

 echo "Done"

@@ -26,6 +26,7 @@

 #include <stdio.h>

+#include "dns.h"

 #ifdef HAVE_RESOLV_H

 #include <string.h>

@@ -37,7 +38,6 @@

 #include "shared/output.h"

-#include "dns.h"

 #ifndef PACKETSZ

 #define PACKETSZ 512

@@ -41,6 +41,7 @@

 #include "others.h"

 #include "scanners.h"

+#include "autoit.h"

 /* FIXME: use unicode detection and normalization from edwin */

@@ -348,17 +348,6 @@ const struct element* hashtab_insert(struct hashtable *s, const char* key, const

 	return NULL;

 }

-void hashtab_delete(struct hashtable *s, const char* key, const size_t len)

-{

-	struct element* e = hashtab_find(s,key,len);

-	if(e && e->key) {

-		PROFILE_HASH_DELETE(s);

-		free((void *)e->key);

-		e->key = DELETED_KEY;

-		s->used--;

-	}

-}

-

 void hashtab_clear(struct hashtable *s)

 {

 	size_t i;

@@ -302,7 +302,7 @@ static inline void html_output_c(file_buff_t *fbuff1, unsigned char c)

 	}

 }

-static void html_output_str(file_buff_t *fbuff, const unsigned char *str, int len)

+static void html_output_str(file_buff_t *fbuff, const unsigned char *str, size_t len)

 {

 	if (fbuff) {

 		if ((fbuff->length + len) >= HTML_FILE_BUFF_LEN) {

@@ -561,7 +561,7 @@ static void screnc_decode(unsigned char *ptr, struct screnc_state *s)

 			expected += (base64_chars[ptr[5]] >> 4) << 24;

 			ptr += 8;

 			if(s->sum != expected) {

-				cli_dbgmsg("screnc_decode: checksum mismatch: %lu != %lu\n", s->sum, expected);

+				cli_dbgmsg("screnc_decode: checksum mismatch: %u != %u\n", s->sum, expected);

 			} else {

 				if(strncmp(ptr, "^#~@", 4) != 0) {

 					cli_dbgmsg("screnc_decode: terminator not found\n");

@@ -1787,14 +1787,14 @@ int html_screnc_decode(int fd, const char *dirname)

 	while (screnc_state.length && line) {

 		screnc_decode(ptr, &screnc_state);

-		write(ofd, ptr, strlen(ptr));

+		cli_writen(ofd, ptr, strlen(ptr));

 		free(line);

 		if (screnc_state.length) {

 			ptr = line = cli_readchunk(stream_in, NULL, 8192);

 		}

 	}

 	if(screnc_state.length)

-		cli_dbgmsg("html_screnc_decode: missing %lu bytes\n",screnc_state.length);

+		cli_dbgmsg("html_screnc_decode: missing %u bytes\n",screnc_state.length);

 	retval = TRUE;

 abort:

@@ -82,7 +82,7 @@ __inline

 __attribute__ ((__gnu_inline__))

 #endif

 #endif

-const char *

+static const char *

 in_cctld_set (const char *str, unsigned int len)

 {

   enum

@@ -99,7 +99,7 @@ __inline

 __attribute__ ((__gnu_inline__))

 #endif

 #endif

-const char *

+static const char *

 in_tld_set (const char *str, unsigned int len)

 {

   enum

@@ -3293,7 +3293,7 @@ strstrip(char *s)

 	if(s == (char *)NULL)

 		return(0);

-	return(strip(s, (int)strlen(s) + 1));

+	return(strip(s, strlen(s) + 1));

 }

 /*

@@ -1433,7 +1433,7 @@ int lzx_decompress(struct lzx_stream *lzx, off_t out_bytes) {

     /* check that we've used all of the previous frame first */

     if (lzx->o_ptr != lzx->o_end) {

-      cli_dbgmsg("lzx_decompress: %d avail bytes, new %d frame\n", lzx->o_end-lzx->o_ptr, frame_size);

+      cli_dbgmsg("lzx_decompress: %ld avail bytes, new %d frame\n", lzx->o_end-lzx->o_ptr, frame_size);

       return lzx->error = CL_EFORMAT;

     }

@@ -65,7 +65,8 @@ static	char	const	rcsid[] = "$Id: pdf.c,v 1.61 2007/02/12 20:46:09 njh Exp $";

 #endif

 #ifdef	CL_DEBUG

-/*#define	SAVE_TMP	/* Save the file being worked on in tmp */

+/*#define	SAVE_TMP	

+ *Save the file being worked on in tmp */

 #endif

 static	int	try_flatedecode(unsigned char *buf, off_t real_len, off_t calculated_len, int fout, cli_ctx *ctx);

@@ -214,7 +214,7 @@ int petite_inflate2x_1to9(char *buf, uint32_t minrva, uint32_t bufsz, struct cli

       /* Let's compact data */

       for (t = 0; t < j ; t++) {

 	usects[t].raw = (t>0)?(usects[t-1].raw + usects[t-1].rsz):0;

-	if (usects[t].rsz != 0)

+	if (usects[t].rsz != 0) {

 	  if(CLI_ISCONTAINED(buf, bufsz, buf + usects[t].raw, usects[t].rsz)) {

 	    memmove(buf + usects[t].raw, adjbuf + usects[t].rva, usects[t].rsz);

 	  } else {

@@ -222,6 +222,7 @@ int petite_inflate2x_1to9(char *buf, uint32_t minrva, uint32_t bufsz, struct cli

 	    usects[t].raw = t>0 ? usects[t-1].raw : 0;

 	    usects[t].rsz = 0;

 	  }

+	}

       }

       /* Showtime!!! */

@@ -843,22 +843,6 @@ int phishingScan(message* m,const char* dir,cli_ctx* ctx,tag_arguments_t* hrefs)

 	return CL_CLEAN;

 }

-static char* str_compose(const char* a,const char* b,const char* c)

-{

-	const size_t a_len = strlen(a);

-	const size_t b_len = strlen(b);

-	const size_t c_len = strlen(c);

-	const size_t r_len = a_len+b_len+c_len+1;

-	char* concated = cli_malloc(r_len);

-	if(!concated)

-		return NULL;

-	strncpy(concated,a,a_len);

-	strncpy(concated+a_len,b,b_len);

-	strncpy(concated+a_len+b_len,c,c_len);

-	concated[r_len-1]='\0';

-	return concated;

-}

-

 static char hex2int(const unsigned char* src)

 {

 	return (src[0] == '0' && src[1] == '0') ? 

@@ -662,6 +662,7 @@ backref(struct match *m, char *start, char *stop, sopno startst, sopno stopst,

 	/* "can't happen" */

 	assert(nope);

 	/* NOTREACHED */

+	return(NULL);

 }

 /*

@@ -355,7 +355,7 @@ int init_regex_list(struct regex_matcher* matcher)

 	if((rc = cli_ac_init(&matcher->suffixes, 2, 32))) {

 		return rc;

 	}

-	if(rc = cli_bm_init(&matcher->md5_hashes)) {

+	if((rc = cli_bm_init(&matcher->md5_hashes))) {

 		return rc;

 	}

 	SO_init(&matcher->filter);

@@ -423,7 +423,7 @@ static int add_hash(struct regex_matcher *matcher, char* pattern, const char fl)

 	}

 	*pat->virname = fl;

 	SO_preprocess_add(&matcher->md5_filter, pat->pattern, pat->length);

-	if(rc = cli_bm_addpatt(&matcher->md5_hashes, pat)) {

+	if((rc = cli_bm_addpatt(&matcher->md5_hashes, pat))) {

 		cli_errmsg("add_hash: failed to add BM pattern\n");

 		free(pat->pattern);

 		free(pat->virname);

@@ -41,6 +41,7 @@

 #include "others.h"

 #include "clamav.h"

 #include "scanners.h"

+#include "sis.h"

 #define EC32(x) le32_to_host(x)

 #define EC16(x) le16_to_host(x)

@@ -118,7 +118,7 @@ static char *checkpe(char *dst, uint32_t dsize, char *pehdr, uint32_t *valign, u

 static int pefromupx (char *src, uint32_t ssize, char *dst, uint32_t *dsize, uint32_t ep, uint32_t upx0, uint32_t upx1, uint32_t *magic, uint32_t dend)

 {

-  char *imports, *sections, *pehdr=NULL, *newbuf;

+  char *imports, *sections=NULL, *pehdr=NULL, *newbuf;

   unsigned int sectcnt=0, upd=1;

   uint32_t realstuffsz=0, valign=0;

   uint32_t foffset=0xd0+0xf8;

@@ -134,10 +134,10 @@ static int pefromupx (char *src, uint32_t ssize, char *dst, uint32_t *dsize, uin

   }

   if (!valign && ep - upx1 + 0x80 < ssize-8) {

-    char *pt = &src[ep - upx1 + 0x80];

+    const char *pt = &src[ep - upx1 + 0x80];

     cli_dbgmsg("UPX: bad magic - scanning for imports\n");

-    while ((pt=(char *)cli_memstr(pt, ssize - (pt-src) - 8, "\x8d\xbe", 2))) {

+    while ((pt=cli_memstr(pt, ssize - (pt-src) - 8, "\x8d\xbe", 2))) {

       if (pt[6] == '\x8b' && pt[7] == '\x07') { /* lea edi, [esi+imports] / mov eax, [edi] */

 	valign=pt-src+2-ep+upx1;

 	break;

@@ -25,6 +25,7 @@

 #include "cltypes.h"

 #include "others.h"

 #include "execs.h"

+#include "wwunpack.h"

 #if HAVE_STRING_H

 #include <string.h>

@@ -41,84 +41,6 @@

 static void rar_dbgmsg(const char* fmt,...){}

 #endif

-static void dump_tables(unpack_data_t *unpack_data)

-{

-	int i;

-	

-	/* Dump LD table */

-	rar_dbgmsg("LD Table MaxNum=%d\n", unpack_data->LD.MaxNum);

-	rar_dbgmsg("\tDecodeLen:");

-	for (i=0 ; i < 16; i++) {

-		rar_dbgmsg(" %.8d", unpack_data->LD.DecodeLen[i]);

-	}

-	rar_dbgmsg("\n\tDecodePos:");

-	for (i=0 ; i < 16; i++) {

-		rar_dbgmsg(" %.8d", unpack_data->LD.DecodePos[i]);

-	}

-	rar_dbgmsg("\n\tDecodeNum:");

-	for (i=0 ; i < NC; i++) {

-		rar_dbgmsg(" %.8d", unpack_data->LD.DecodeNum[i]);

-	}

-	

-	

-	rar_dbgmsg("\nDD Table MaxNum=%d\n", unpack_data->DD.MaxNum);

-	rar_dbgmsg("\tDecodeLen:");

-	for (i=0 ; i < 16; i++) {

-		rar_dbgmsg(" %.8d", unpack_data->DD.DecodeLen[i]);

-	}

-	rar_dbgmsg("\n\tDecodePos:");

-	for (i=0 ; i < 16; i++) {

-		rar_dbgmsg(" %.8d", unpack_data->DD.DecodePos[i]);

-	}

-	rar_dbgmsg("\n\tDecodeNum:");

-	for (i=0 ; i < DC; i++) {

-		rar_dbgmsg(" %.8d", unpack_data->DD.DecodeNum[i]);

-	}

-	

-	rar_dbgmsg("\nLDD Table MaxNum=%d\n", unpack_data->LDD.MaxNum);

-	rar_dbgmsg("\tDecodeLen:");

-	for (i=0 ; i < 16; i++) {

-		rar_dbgmsg(" %.8d", unpack_data->LDD.DecodeLen[i]);

-	}

-	rar_dbgmsg("\n\tDecodePos:");

-	for (i=0 ; i < 16; i++) {

-		rar_dbgmsg(" %.8d", unpack_data->LDD.DecodePos[i]);

-	}

-	rar_dbgmsg("\n\tDecodeNum:");

-	for (i=0 ; i < LDC; i++) {

-		rar_dbgmsg(" %.8d", unpack_data->LDD.DecodeNum[i]);

-	}

-	

-	rar_dbgmsg("\nRD Table MaxNum=%d\n", unpack_data->RD.MaxNum);

-	rar_dbgmsg("\tDecodeLen:");

-	for (i=0 ; i < 16; i++) {

-		rar_dbgmsg(" %.8d", unpack_data->RD.DecodeLen[i]);

-	}

-	rar_dbgmsg("\n\tDecodePos:");

-	for (i=0 ; i < 16; i++) {

-		rar_dbgmsg(" %.8d", unpack_data->RD.DecodePos[i]);

-	}

-	rar_dbgmsg("\n\tDecodeNum:");

-	for (i=0 ; i < RC; i++) {

-		rar_dbgmsg(" %.8d", unpack_data->RD.DecodeNum[i]);

-	}

-	

-	rar_dbgmsg("\nBD Table MaxNum=%d\n", unpack_data->BD.MaxNum);

-	rar_dbgmsg("\tDecodeLen:");

-	for (i=0 ; i < 16; i++) {

-		rar_dbgmsg(" %.8d", unpack_data->BD.DecodeLen[i]);

-	}

-	rar_dbgmsg("\n\tDecodePos:");

-	for (i=0 ; i < 16; i++) {

-		rar_dbgmsg(" %.8d", unpack_data->BD.DecodePos[i]);

-	}

-	rar_dbgmsg("\n\tDecodeNum:");

-	for (i=0 ; i < BC; i++) {

-		rar_dbgmsg(" %.8d", unpack_data->BD.DecodeNum[i]);

-	}

-	rar_dbgmsg("\n");

-}

-

 static void insert_old_dist(unpack_data_t *unpack_data, unsigned int distance)

 {

 	unpack_data->old_dist[3] = unpack_data->old_dist[2];

@@ -230,8 +152,7 @@ unsigned int rar_get_char(int fd, unpack_data_t *unpack_data)

 static void unp_write_data(unpack_data_t *unpack_data, uint8_t *data, int size)

 {

 	rar_dbgmsg("in unp_write_data length=%d\n", size);

-	write(unpack_data->ofd, data, size);

-	unpack_data->written_size += size;

+	unpack_data->written_size += write(unpack_data->ofd, data, size);

 	unpack_data->unp_crc = rar_crc(unpack_data->unp_crc, data, size);

 }

@@ -23,7 +23,7 @@ void *rar_malloc(size_t size)

     if(!size || size > RAR_MAX_ALLOCATION) {

-	fprintf(stderr, "UNRAR: rar_malloc(): Attempt to allocate %u bytes. Please report to http://bugs.clamav.net\n", size);

+	fprintf(stderr, "UNRAR: rar_malloc(): Attempt to allocate %lu bytes. Please report to http://bugs.clamav.net\n", size);

 	return NULL;

     }

@@ -34,7 +34,7 @@ void *rar_malloc(size_t size)

 #endif

     if(!alloc) {

-	fprintf(stderr, "UNRAR: rar_malloc(): Can't allocate memory (%u bytes).\n", size);

+	fprintf(stderr, "UNRAR: rar_malloc(): Can't allocate memory (%lu bytes).\n", size);

 	perror("malloc_problem");

 	return NULL;

     } else return alloc;

@@ -46,14 +46,14 @@ void *rar_realloc2(void *ptr, size_t size)

     if(!size || size > RAR_MAX_ALLOCATION) {

-	fprintf(stderr, "UNRAR: rar_realloc2(): Attempt to allocate %u bytes. Please report to http://bugs.clamav.net\n", size);

+	fprintf(stderr, "UNRAR: rar_realloc2(): Attempt to allocate %lu bytes. Please report to http://bugs.clamav.net\n", size);

 	return NULL;

     }

     alloc = realloc(ptr, size);

     if(!alloc) {

-	fprintf(stderr, "UNRAR: rar_realloc2(): Can't allocate memory (%u bytes).\n", size);

+	fprintf(stderr, "UNRAR: rar_realloc2(): Can't allocate memory (%lu bytes).\n", size);

 	perror("rar_realloc2");

 	if(ptr)

 	    free(ptr);

@@ -87,20 +87,6 @@ static uint8_t vm_cmdflags[]=

 #define UINT32(x)  (sizeof(uint32_t)==4 ? (uint32_t)(x):((x)&0xffffffff))

-static unsigned int rarvm_get_value(int byte_mode, unsigned int *addr)

-{

-	if (byte_mode) {

-		return *addr;

-	} else {

-#if WORDS_BIGENDIAN == 0

-		return UINT32(*addr);

-#else

-                unsigned char *B = (unsigned char *)addr;

-                return UINT32((uint8_t)B[0]|((uint8_t)B[1]<<8)|((uint8_t)B[2]<<16)|((uint8_t)B[3]<<24));

-#endif

-	}

-}

-

 #if WORDS_BIGENDIAN == 0

 #define GET_VALUE(byte_mode,addr) ((byte_mode) ? (*(unsigned char *)(addr)) : UINT32((*(unsigned int *)(addr))))

 #else

@@ -172,7 +158,7 @@ uint32_t rar_crc(uint32_t start_crc, void *addr, uint32_t size)

 	data = addr;

 #if WORDS_BIGENDIAN == 0

-	while (size > 0 && ((int)data & 7))

+	while (size > 0 && ((long)data & 7))

 	{

 		start_crc = crc_tab[(unsigned char)(start_crc^data[0])]^(start_crc>>8);

 		size--;

@@ -945,7 +931,7 @@ int rarvm_execute(rarvm_data_t *rarvm_data, struct rarvm_prepared_program *prg)

 	return TRUE;

 }

-void rarvm_decode_arg(rarvm_data_t *rarvm_data, rarvm_input_t *rarvm_input,

+static void rarvm_decode_arg(rarvm_data_t *rarvm_data, rarvm_input_t *rarvm_input,

 		struct rarvm_prepared_operand *op, int byte_mode)

 {

 	uint16_t data;

@@ -986,7 +972,7 @@ void rarvm_decode_arg(rarvm_data_t *rarvm_data, rarvm_input_t *rarvm_input,

 	}

 }

-void rarvm_optimize(struct rarvm_prepared_program *prg)

+static void rarvm_optimize(struct rarvm_prepared_program *prg)

 {

 	struct rarvm_prepared_command *code, *cmd;

 	int code_size, i, flags_required, j, flags;

@@ -204,7 +204,7 @@ static unrar_fileheader_t *read_block(int fd, header_type hdr_type)

 static int is_rar_archive(int fd)

 {

 	mark_header_t mark;

-	const mark_header_t rar_hdr[2] = {{0x52, 0x61, 0x72, 0x21, 0x1a, 0x07, 0x00}, {'U', 'n', 'i', 'q', 'u', 'E', '!'}};

+	const mark_header_t rar_hdr[2] = {{{0x52, 0x61, 0x72, 0x21, 0x1a, 0x07, 0x00}}, {{'U', 'n', 'i', 'q', 'u', 'E', '!'}}};

     if(read(fd, &mark, SIZEOF_MARKHEAD) != SIZEOF_MARKHEAD)

@@ -39,4 +39,5 @@ int dircopy(const char *src, const char *dest);

 int cvd_unpack(const char *cvd, const char *destdir);

 int daemonize(void);

 const char *get_version(void);

+int match_regex(const char *filename, const char *pattern);

 #endif

@@ -26,7 +26,11 @@

 #include <stdlib.h>

 #include "cfgparser.h"

+#ifdef __GNUC__

+int mdprintf(int desc, const char *str, ...) __attribute__((format(printf, 2,3)));

+#else

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

+#endif

 #ifdef __GNUC__

 int logg(const char *str, ...)      __attribute__((format(printf, 1, 2)));

@@ -350,7 +350,7 @@ static char *getdsig(const char *host, const char *user, const unsigned char *da

 	    close(sockd);

 	    return NULL;

 	} else {

-	    mprintf("Signature received (length = %u)\n", strlen(buff) - 10);

+	    mprintf("Signature received (length = %lu)\n", strlen(buff) - 10);

 	}

     } else {

 	mprintf("!getdsig: Communication error with remote server\n");

@@ -54,6 +54,7 @@ END_TEST

 /* extern void cl_debug(void); */

 START_TEST (test_cl_debug)

+{

     int old_status = cli_debug_flag;

     cli_debug_flag = 0;

     cl_debug();

@@ -63,6 +64,7 @@ START_TEST (test_cl_debug)

     cl_debug();

     fail_unless(1 == cli_debug_flag, "cl_debug failed when flag was already set");

     cli_debug_flag = old_status;

+}

 END_TEST

 /* extern const char *cl_retdbdir(void); */

@@ -76,10 +78,12 @@ END_TEST

 /* extern const char *cl_retver(void); */

 START_TEST (test_cl_retver)

+{

     const char *ver = cl_retver();

     fail_unless(!strcmp(REPO_VERSION, ver),"cl_retver");

     fail_unless(strcspn(ver,"012345789") < strlen(ver),

 		    "cl_retver must have a number");

+}

 END_TEST

 /* extern void cl_cvdfree(struct cl_cvd *cvd); */

@@ -339,7 +343,6 @@ int open_testfile(const char *name)

 int main(int argc, char **argv)

 {

     int nf;

-    cl_debug();

     Suite *s = test_cl_suite();

     SRunner *sr = srunner_create(s);

 #ifdef CHECK_HAVE_LOOPS

@@ -358,6 +361,7 @@ int main(int argc, char **argv)

     if(freopen("test-stderr.log","w+",stderr) == NULL) {

 	    fputs("Unable to redirect stderr!\n",stderr);

     }

+    cl_debug();

     srunner_run_all(sr, CK_NORMAL);

     nf = srunner_ntests_failed(sr);

@@ -135,7 +135,7 @@ START_TEST (test_token_ival)

 	fail_unless(TOKEN_GET(&tok, string) == NULL, "token ival->string");

 	fail_unless(TOKEN_GET(&tok, cstring) == NULL, "token ival->cstring");

 	fail_unless(TOKEN_GET(&tok, scope) == NULL, "token ival->scope");

-	fail_unless(TOKEN_GET(&tok, dval) == -1, "token ival->dval");

+	fail_unless(TOKEN_GET(&tok, dval) - -1 < 1e-9, "token ival->dval");

 	fail_unless(TOKEN_GET(&tok, ival) == val, "token ival->ival");

 }

 END_TEST

@@ -150,7 +150,7 @@ START_TEST (test_token_dval)

 	fail_unless(TOKEN_GET(&tok, string) == NULL, "token dval->string");

 	fail_unless(TOKEN_GET(&tok, cstring) == NULL, "token dval->cstring");

 	fail_unless(TOKEN_GET(&tok, scope) == NULL, "token dval->scope");

-	fail_unless(TOKEN_GET(&tok, dval) == val, "token dval->dval");

+	fail_unless(TOKEN_GET(&tok, dval) - val < 1e-9, "token dval->dval");

 	fail_unless(TOKEN_GET(&tok, ival) == -1, "token dval->ival");

 }

 END_TEST

@@ -25,6 +25,7 @@

 #include <check.h>

 #include <stdio.h>

+#include <string.h>

 #include "../libclamav/clamav.h"

 #include "../libclamav/readdb.h"