@@ -1,3 +1,7 @@

+Tue Mar  6 01:01:32 CET 2007 (tk)

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

+  * libclamav: fix some gcc -W* warnings

+

 Mon Mar  5 21:06:37 CET 2007 (tk)

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

   * sigtool: fix gcc -W* warnings

@@ -401,7 +401,7 @@ int cab_open(int fd, off_t offset, struct cab_archive *cab)

 	cli_dbgmsg("CAB: File record %u\n", i);

 	cli_dbgmsg("CAB: File name: %s\n", file->name);

-	cli_dbgmsg("CAB: File offset: %u\n", file->offset);

+	cli_dbgmsg("CAB: File offset: %u\n", (unsigned int) file->offset);

 	cli_dbgmsg("CAB: File folder index: %u\n", fidx);

 	cli_dbgmsg("CAB: File attribs: 0x%x\n", file->attribs);

 	if(file->attribs & 0x01)

@@ -595,7 +595,7 @@ int cab_extract(struct cab_file *file, const char *name)

     }

     if(lseek(file->fd, file->folder->offset, SEEK_SET) == -1) {

-	cli_errmsg("cab_extract: Can't lseek to %u\n", file->folder->offset);

+	cli_errmsg("cab_extract: Can't lseek to %u\n", (unsigned int) file->folder->offset);

 	return CL_EIO;

     }

@@ -79,7 +79,7 @@ static const unsigned char mszip_bitlen_order[19] = {

 };

 /* ANDing with mszip_bit_mask[n] masks the lower n bits */

-static const unsigned short mszip_bit_mask[17] = {

+static const unsigned short mszip_bit_mask_tab[17] = {

  0x0000, 0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff,

  0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff

 };

@@ -110,7 +110,7 @@ static const unsigned short mszip_bit_mask[17] = {

 } while (0)

 #define MSZIP_PEEK_BITS(nbits)   (bit_buffer & ((1<<(nbits))-1))

-#define MSZIP_PEEK_BITS_T(nbits) (bit_buffer & mszip_bit_mask[(nbits)])

+#define MSZIP_PEEK_BITS_T(nbits) (bit_buffer & mszip_bit_mask_tab[(nbits)])

 #define MSZIP_REMOVE_BITS(nbits) ((bit_buffer >>= (nbits)), (bits_left -= (nbits)))

@@ -1,5 +1,5 @@

 /*

- *  Copyright (C) 2002 - 2006 Tomasz Kojm <tkojm@clamav.net>

+ *  Copyright (C) 2002 - 2007 Tomasz Kojm <tkojm@clamav.net>

  *

  *  This program is free software; you can redistribute it and/or modify

  *  it under the terms of the GNU General Public License as published by

@@ -77,13 +77,18 @@ static pthread_mutex_t cli_ref_mutex = PTHREAD_MUTEX_INITIALIZER;

 #include "matcher-ncore.h"

 #endif

+/* Prototypes for old public functions just to shut up some gcc warnings;

+ * to be removed in 1.0

+ */

+int cl_loaddb(const char *filename, struct cl_engine **engine, unsigned int *signo);

+int cl_loaddbdir(const char *dirname, struct cl_engine **engine, unsigned int *signo);

 /* TODO: clean up the code */

 static int cli_ac_addsig(struct cli_matcher *root, const char *virname, const char *hexsig, int sigid, int parts, int partno, unsigned short type, unsigned int mindist, unsigned int maxdist, const char *offset, unsigned short target)

 {

 	struct cli_ac_patt *new;

-	char *pt, *hex;

+	char *pt, *hex = NULL;

 	int virlen, ret, error = 0;

 	unsigned int i, j, wprefix = 0;

@@ -203,11 +208,9 @@ static int cli_ac_addsig(struct cli_matcher *root, const char *virname, const ch

 	    free(new);

 	    return CL_EMALFDB;

 	}

+    }

-    } else

-	hex = (char *) hexsig;

-

-    if((new->pattern = cli_hex2si(hex)) == NULL) {

+    if((new->pattern = cli_hex2si(new->alt ? hex : hexsig)) == NULL) {

 	FREE_ALT;

 	if(new->offset)

 	    free(new->offset);

@@ -215,7 +218,7 @@ static int cli_ac_addsig(struct cli_matcher *root, const char *virname, const ch

 	return CL_EMALFDB;

     }

-    new->length = strlen(hex) / 2;

+    new->length = strlen(new->alt ? hex : hexsig) / 2;

     for(i = 0; i < AC_DEFAULT_DEPTH; i++) {

 	if(new->pattern[i] == CLI_IGN || new->pattern[i] == CLI_ALT) {

@@ -1,5 +1,5 @@

 /*

- *  Copyright (C) 2002 - 2005 Tomasz Kojm <tkojm@clamav.net>

+ *  Copyright (C) 2002 - 2007 Tomasz Kojm <tkojm@clamav.net>

  *

  *  This program is free software; you can redistribute it and/or modify

  *  it under the terms of the GNU General Public License as published by

@@ -118,10 +118,10 @@ static int cli_unrar_scanmetadata(int desc, rar_metadata_t *metadata, cli_ctx *c

 	    *sfx_check = metadata->crc;

     }

-    cli_dbgmsg("RAR: %s, crc32: 0x%x, encrypted: %d, compressed: %u, normal: %u, method: %d, ratio: %d (max: %d)\n",

-	metadata->filename, metadata->crc, metadata->encrypted, metadata->pack_size,

-	metadata->unpack_size, metadata->method,

-	metadata->pack_size ? ((unsigned int) metadata->unpack_size / (unsigned int) metadata->pack_size) : 0, ctx->limits ? ctx->limits->maxratio : 0);

+    cli_dbgmsg("RAR: %s, crc32: 0x%x, encrypted: %u, compressed: %u, normal: %u, method: %u, ratio: %u (max: %u)\n",

+	metadata->filename, metadata->crc, metadata->encrypted, (unsigned int) metadata->pack_size,

+	(unsigned int) metadata->unpack_size, metadata->method,

+	metadata->pack_size ? (unsigned int) (metadata->unpack_size / metadata->pack_size) : 0, ctx->limits ? ctx->limits->maxratio : 0);

     /* Scan metadata */

     mdata = ctx->engine->rar_mlist;

@@ -187,7 +187,7 @@ static int cli_unrar_checklimits(const cli_ctx *ctx, const rar_metadata_t *metad

     if(ctx->limits) {

 	if(ctx->limits->maxratio && metadata->unpack_size && metadata->pack_size) {

 	    if(metadata->unpack_size / metadata->pack_size >= ctx->limits->maxratio) {

-		cli_dbgmsg("RAR: Max ratio reached (normal: %Lu, compressed: %Lu, max: %u)\n", metadata->unpack_size, metadata->pack_size, ctx->limits->maxratio);

+		cli_dbgmsg("RAR: Max ratio reached (%u, max: %u)\n", (unsigned int) (metadata->unpack_size / metadata->pack_size), ctx->limits->maxratio);

 		if(BLOCKMAX) {

 		    *ctx->virname = "Oversized.RAR";

 		    return CL_VIRUS;

@@ -197,7 +197,7 @@ static int cli_unrar_checklimits(const cli_ctx *ctx, const rar_metadata_t *metad

 	}

 	if(ctx->limits->maxfilesize && (metadata->unpack_size > ctx->limits->maxfilesize)) {

-	    cli_dbgmsg("RAR: %s: Size exceeded (%Lu, max: %lu)\n", metadata->filename, metadata->unpack_size, ctx->limits->maxfilesize);

+	    cli_dbgmsg("RAR: %s: Size exceeded (%lu, max: %lu)\n", metadata->filename, (unsigned long int) metadata->unpack_size, ctx->limits->maxfilesize);

 	    if(BLOCKMAX) {

 		*ctx->virname = "RAR.ExceededFileSize";

 		return CL_VIRUS;

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

 	 */

 	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);

+	cli_dbgmsg("Zip: %s, crc32: 0x%x, offset: %u, encrypted: %u, compressed: %u, normal: %u, method: %u, ratio: %u (max: %u)\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);

 	if(!zdirent.st_size) {

 	    if(zdirent.d_crc32) {

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

 	if(ctx->limits) {

 	    if(ctx->limits->maxfilesize && ((unsigned int) zdirent.st_size > ctx->limits->maxfilesize)) {

-		cli_dbgmsg("Zip: %s: Size exceeded (%d, max: %ld)\n", zdirent.d_name, zdirent.st_size, ctx->limits->maxfilesize);

+		cli_dbgmsg("Zip: %s: Size exceeded (%u, max: %lu)\n", zdirent.d_name, zdirent.st_size, ctx->limits->maxfilesize);

 		/* ret = CL_EMAXSIZE; */

 		if(BLOCKMAX) {

 		    *ctx->virname = "Zip.ExceededFileSize";

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

 	    }

 	    if(ctx->limits->maxfiles && (files > ctx->limits->maxfiles)) {

-		cli_dbgmsg("Zip: Files limit reached (max: %d)\n", ctx->limits->maxfiles);

+		cli_dbgmsg("Zip: Files limit reached (max: %u)\n", ctx->limits->maxfiles);

 		if(BLOCKMAX) {

 		    *ctx->virname = "Zip.ExceededFilesLimit";

 		    ret = CL_VIRUS;

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

 	    if(!encrypted) {

 		if(size != zdirent.st_size) {

-		    cli_dbgmsg("Zip: Incorrectly decompressed (%d != %d)\n", size, zdirent.st_size);

+		    cli_dbgmsg("Zip: Incorrectly decompressed (%lu != %lu)\n", size, (unsigned long int) zdirent.st_size);

 		    if(zfp->bf[0] == -1) {

 			ret = CL_EZIP;

 			break;

@@ -613,7 +613,7 @@ static int cli_scangzip(int desc, cli_ctx *ctx)

     fd = fileno(tmp);

     if(!(buff = (char *) cli_malloc(FILEBUFF))) {

-	cli_dbgmsg("GZip: Unable to malloc %d bytes.\n", FILEBUFF);

+	cli_dbgmsg("GZip: Unable to malloc %u bytes.\n", FILEBUFF);

 	gzclose(gd);

 	fclose(tmp);

 	if(!cli_leavetemps_flag)

@@ -882,7 +882,7 @@ static int cli_scanmscab(int desc, cli_ctx *ctx, off_t sfx_offset)

 	files++;

 	if(ctx->limits && ctx->limits->maxfilesize && (file->length > ctx->limits->maxfilesize)) {

-	    cli_dbgmsg("CAB: %s: Size exceeded (%u, max: %u)\n", file->name, file->length, ctx->limits->maxfilesize);

+	    cli_dbgmsg("CAB: %s: Size exceeded (%u, max: %lu)\n", file->name, file->length, ctx->limits->maxfilesize);

 	    if(BLOCKMAX) {

 		*ctx->virname = "CAB.ExceededFileSize";

 		cab_free(&cab);

@@ -1651,7 +1651,7 @@ static int cli_scanmail(int desc, cli_ctx *ctx)

 	int ret;

-    cli_dbgmsg("Starting cli_scanmail(), mrec == %d, arec == %d\n", ctx->mrec, ctx->arec);

+    cli_dbgmsg("Starting cli_scanmail(), mrec == %u, arec == %u\n", ctx->mrec, ctx->arec);

     /* generate the temporary directory */

     dir = cli_gentemp(NULL);

@@ -1732,15 +1732,15 @@ static int cli_scanraw(int desc, cli_ctx *ctx, cli_file_t type)

 			fpt = ftoffset;

 			while(fpt) {

 			    if(fpt->type == CL_TYPE_RARSFX && (DCONF_ARCH & ARCH_CONF_RAR)) {

-				cli_dbgmsg("RAR-SFX signature found at %d\n", fpt->offset);

+				cli_dbgmsg("RAR-SFX signature found at %u\n", (unsigned int) fpt->offset);

 				if((nret = cli_scanrar(desc, ctx, fpt->offset, &lastrar)) == CL_VIRUS)

 				    break;

 			    } else if(fpt->type == CL_TYPE_ZIPSFX && (DCONF_ARCH & ARCH_CONF_ZIP)) {

-				cli_dbgmsg("ZIP-SFX signature found at %d\n", fpt->offset);

+				cli_dbgmsg("ZIP-SFX signature found at %u\n", (unsigned int) fpt->offset);

 				if((nret = cli_scanzip(desc, ctx, fpt->offset, &lastzip)) == CL_VIRUS)

 				    break;

 			    } else if(fpt->type == CL_TYPE_CABSFX && (DCONF_ARCH & ARCH_CONF_CAB)) {

-				cli_dbgmsg("CAB-SFX signature found at %d\n", fpt->offset);

+				cli_dbgmsg("CAB-SFX signature found at %u\n", (unsigned int) fpt->offset);

 				if((nret = cli_scanmscab(desc, ctx, fpt->offset)) == CL_VIRUS)

 				    break;

 			    }

@@ -1783,7 +1783,7 @@ int cli_magic_scandesc(int desc, cli_ctx *ctx)

     }

     if(sb.st_size <= 5) {

-	cli_dbgmsg("Small data (%d bytes)\n", sb.st_size);

+	cli_dbgmsg("Small data (%u bytes)\n", (unsigned int) sb.st_size);

 	return CL_CLEAN;

     }

@@ -1801,7 +1801,7 @@ int cli_magic_scandesc(int desc, cli_ctx *ctx)

     if(SCAN_ARCHIVE && ctx->limits && ctx->limits->maxreclevel)

 	if(ctx->arec > ctx->limits->maxreclevel) {

-	    cli_dbgmsg("Archive recursion limit exceeded (arec == %d).\n", ctx->arec);

+	    cli_dbgmsg("Archive recursion limit exceeded (arec == %u).\n", ctx->arec);

 	    if(BLOCKMAX) {

 		*ctx->virname = "Archive.ExceededRecursionLimit";

 		return CL_VIRUS;

@@ -1811,7 +1811,7 @@ int cli_magic_scandesc(int desc, cli_ctx *ctx)

     if(SCAN_MAIL)

 	if(ctx->mrec > MAX_MAIL_RECURSION) {

-	    cli_dbgmsg("Mail recursion level exceeded (mrec == %d).\n", ctx->mrec);

+	    cli_dbgmsg("Mail recursion level exceeded (mrec == %u).\n", ctx->mrec);

 	    /* return CL_EMAXREC; */

 	    return CL_CLEAN;

 	}

@@ -271,11 +271,11 @@ static int sis_extract_simple(int fd, char *mfile, uint32_t length, uint32_t off

 		continue;

 	    }

-	    cli_dbgmsg("SIS: Compressed size: %d\n", csize);

-	    cli_dbgmsg("SIS: Original size: %d\n", osize);

+	    cli_dbgmsg("SIS: Compressed size: %u\n", (unsigned int) csize);

+	    cli_dbgmsg("SIS: Original size: %u\n", (unsigned int) osize);

 	    if(ctx->limits && ctx->limits->maxfilesize && osize > ctx->limits->maxfilesize) {

-		cli_dbgmsg("SIS: Size exceeded (%d, max: %ld)\n", osize, ctx->limits->maxfilesize);

+		cli_dbgmsg("SIS: Size exceeded (%u, max: %lu)\n", (unsigned int) osize, ctx->limits->maxfilesize);

 		if(BLOCKMAX) {

 		    *ctx->virname = "SIS.ExceededFileSize";

 		    free(subdir);

@@ -304,7 +304,7 @@ static int sis_extract_simple(int fd, char *mfile, uint32_t length, uint32_t off

 	    }

 	    if(osize != (uLongf) filelen) {

-		cli_dbgmsg("SIS: WARNING: Real original size: %u\n", osize);

+		cli_dbgmsg("SIS: WARNING: Real original size: %u\n", (unsigned int) osize);

 		filelen = (uint32_t) osize;

 	    }

@@ -372,7 +372,7 @@ int cli_scansis(int desc, cli_ctx *ctx)

 	return CL_EIO;

     }

-    if(sb.st_size < sizeof(struct sis_file_hdr)) {

+    if(sb.st_size < (off_t) sizeof(struct sis_file_hdr)) {

 	cli_dbgmsg("SIS: Broken or not a SIS file (too small)\n");

 	return CL_CLEAN;

     }

@@ -426,7 +426,7 @@ int cli_scansis(int desc, cli_ctx *ctx)

     if(nlangs && nlangs < 100) {

-	if(EC32(file_hdr.plangs) >= length || EC32(file_hdr.plangs) + nlangs * 2 >= sb.st_size) {

+	if(EC32(file_hdr.plangs) >= length || EC32(file_hdr.plangs) + nlangs * 2 >= (uint32_t) sb.st_size) {

 	    cli_errmsg("SIS: Broken file structure (language records)\n");

 	    munmap(mfile, length);

 	    return CL_EFORMAT;

@@ -60,13 +60,13 @@ int cli_check_mydoom_log(int desc, const char **virname)

 	/* Decode the key */

 	record[0] = ~ntohl(record[0]);

-	cli_dbgmsg("Mydoom: key: %lu\n", record[0]);

+	cli_dbgmsg("Mydoom: key: %d\n", record[0]);

 	check = 0;

 	for (i=1 ; i<8; i++) {

 	    record[i] = ntohl(record[i]) ^ record[0];

 	    check += record[i];

 	}

-	cli_dbgmsg("Mydoom: check: %lu\n", ~check);

+	cli_dbgmsg("Mydoom: check: %d\n", ~check);

 	if ((~check) != record[0]) {

 	    return CL_CLEAN;

 	}

@@ -110,7 +110,7 @@ static int __zip_find_disk_trailer(int fd, off_t filesize, struct zip_disk_trail

 	}

         if(cli_readn(fd, buf, (size_t) bufsize) < (ssize_t) bufsize) {

-	    cli_errmsg("Unzip: __zip_find_disk_trailer: Can't read %d bytes\n", bufsize);

+	    cli_errmsg("Unzip: __zip_find_disk_trailer: Can't read %u bytes\n", (unsigned int) bufsize);

 	    free(buf);

 	    return CL_EIO;

 	}

@@ -141,7 +141,7 @@ static int __zip_find_disk_trailer(int fd, off_t filesize, struct zip_disk_trail

 			}

 			if(cli_readn(fd, &dirent, sizeof(dirent)) < __sizeof(dirent)) {

-			    cli_errmsg("Unzip: __zip_find_disk_trailer: Can't read %d bytes\n", bufsize);

+			    cli_errmsg("Unzip: __zip_find_disk_trailer: Can't read %u bytes\n", (unsigned int) bufsize);

 			    free(buf);

 			    return CL_EIO;

 			}