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

+Wed Nov  1 17:03:54 CET 2006 (tk)

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

+  * libclamav: minor clamav.h (and related) cleanup

+

 Mon Oct 30 19:29:36 CET 2006 (tk)

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

   * 0.90RC2 (released with JS and PST code removed)

@@ -28,73 +28,71 @@ extern "C"

 {

 #endif

-

 #define CL_COUNT_PRECISION 4096

 /* return codes */

-#define CL_CLEAN	0   /* virus not found */

-#define CL_VIRUS	1   /* virus found */

+#define CL_CLEAN	0   /* no virus found */

+#define CL_VIRUS	1   /* virus(es) found */

 #define CL_SUCCESS	CL_CLEAN

-#define CL_EMAXREC	10  /* recursion level limit exceeded */

-#define CL_EMAXSIZE	11  /* size limit exceeded */

-#define CL_EMAXFILES	12  /* files limit exceeded */

-#define CL_ERAR		100 /* rar handler error */

-#define CL_EZIP		101 /* zip handler error */

-#define	CL_EMALFZIP	102 /* malformed zip */

-#define CL_EGZIP	103 /* gzip handler error */

-#define CL_EBZIP	104 /* bzip2 handler error */

-#define CL_EOLE2	105 /* OLE2 handler error */

-#define CL_EMSCOMP	106 /* compress.exe handler error */

-#define CL_EMSCAB	107 /* MS CAB module error */

-#define CL_EACCES	200 /* access denied */

-#define CL_ENULLARG	300 /* null argument error */

-

-#define CL_ETMPFILE	-1  /* tmpfile() failed */

-#define CL_EFSYNC	-2  /* fsync() failed */

-#define CL_EMEM		-3  /* memory allocation error */

-#define CL_EOPEN	-4  /* file open error */

-#define CL_EMALFDB	-5  /* malformed database */

-#define CL_EPATSHORT	-6  /* pattern too short */

-#define CL_ETMPDIR	-7  /* mkdir() failed */

-#define CL_ECVD		-8  /* not a CVD file (or broken) */

-#define CL_ECVDEXTR	-9  /* CVD extraction failure */

-#define CL_EMD5		-10 /* MD5 verification error */

-#define CL_EDSIG	-11 /* digital signature verification error */

-#define CL_EIO		-12 /* general I/O error */

-#define CL_EFORMAT	-13 /* bad format or broken file */

-#define CL_ESUPPORT	-14 /* not supported data format */

-

-#define CL_EHWINIT	-15 /* hardware initialization failed */

-#define	CL_EHWLOAD	-16 /* error loading hardware database */

-#define CL_EHWIO	-17 /* general hardware I/O error */

-

+#define CL_EMAXREC	-100 /* recursion limit exceeded */

+#define CL_EMAXSIZE	-101 /* size limit exceeded */

+#define CL_EMAXFILES	-102 /* files limit exceeded */

+#define CL_ERAR		-103 /* rar handler error */

+#define CL_EZIP		-104 /* zip handler error */

+#define CL_EGZIP	-105 /* gzip handler error */

+#define CL_EBZIP	-106 /* bzip2 handler error */

+#define CL_EOLE2	-107 /* OLE2 handler error */

+#define CL_EMSCOMP	-108 /* MS Expand handler error */

+#define CL_EMSCAB	-109 /* MS CAB module error */

+#define CL_EACCES	-110 /* access denied */

+#define CL_ENULLARG	-111 /* null argument */

+#define CL_ETMPFILE	-112 /* tmpfile() failed */

+#define CL_EFSYNC	-113 /* fsync() failed */

+#define CL_EMEM		-114 /* memory allocation error */

+#define CL_EOPEN	-115 /* file open error */

+#define CL_EMALFDB	-116 /* malformed database */

+#define CL_EPATSHORT	-117 /* pattern too short */

+#define CL_ETMPDIR	-118 /* mkdir() failed */

+#define CL_ECVD		-119 /* not a CVD file (or broken) */

+#define CL_ECVDEXTR	-120 /* CVD extraction failure */

+#define CL_EMD5		-121 /* MD5 verification error */

+#define CL_EDSIG	-122 /* digital signature verification error */

+#define CL_EIO		-123 /* general I/O error */

+#define CL_EFORMAT	-124 /* bad format or broken file */

+#define CL_ESUPPORT	-125 /* not supported data format */

+

+/* NodalCore */

+#define CL_ENCINIT	-200 /* NodalCore initialization failed */

+#define	CL_ENCLOAD	-201 /* error loading NodalCore database */

+#define CL_ENCIO	-202 /* general NodalCore I/O error */

 /* db options */

-#define CL_DB_NCORE		1

-#define CL_DB_NOPHISHING	2

-#define CL_DB_ACONLY		4   /* for developers only */

+#define CL_DB_NCORE	    0x1

+#define CL_DB_NOPHISHING    0x2

+#define CL_DB_ACONLY	    0x4 /* WARNING: only for developers */

-#define CL_DB_STDOPT		0

+/* recommended db settings */

+#define CL_DB_STDOPT	    0x0

 /* scan options */

-#define CL_SCAN_RAW		0

-#define CL_SCAN_ARCHIVE		1

-#define CL_SCAN_MAIL		2

-#define CL_SCAN_OLE2		4

-#define CL_SCAN_BLOCKENCRYPTED	8

-#define CL_SCAN_HTML		16

-#define CL_SCAN_PE		32

-#define CL_SCAN_BLOCKBROKEN	64

-#define CL_SCAN_MAILURL		128

-#define CL_SCAN_BLOCKMAX	256

-#define CL_SCAN_ALGO		512

-#define CL_SCAN_NOPHISHING      1024

-#define CL_PHISH_NO_DOMAINLIST  4096

-#define CL_SCAN_ELF		8192

-

-/* recommended options */

-#define CL_SCAN_STDOPT		(CL_SCAN_ARCHIVE | CL_SCAN_MAIL | CL_SCAN_OLE2 | CL_SCAN_HTML | CL_SCAN_PE | CL_SCAN_ALGO) 

+#define CL_SCAN_RAW		0x0

+#define CL_SCAN_ARCHIVE		0x1

+#define CL_SCAN_MAIL		0x2

+#define CL_SCAN_OLE2		0x4

+#define CL_SCAN_BLOCKENCRYPTED	0x8

+#define CL_SCAN_HTML		0x10

+#define CL_SCAN_PE		0x20

+#define CL_SCAN_BLOCKBROKEN	0x40

+#define CL_SCAN_MAILURL		0x80

+#define CL_SCAN_BLOCKMAX	0x100

+#define CL_SCAN_ALGO		0x200

+#define CL_SCAN_NOPHISHING      0x400

+#define CL_PHISH_NO_DOMAINLIST  0x800

+#define CL_SCAN_ELF		0x1000

+

+/* recommended scan settings */

+#define CL_SCAN_STDOPT		(CL_SCAN_ARCHIVE | CL_SCAN_MAIL | CL_SCAN_OLE2 | CL_SCAN_HTML | CL_SCAN_PE | CL_SCAN_ALGO | CL_SCAN_ELF) 

 /* aliases for backward compatibility */

 #define CL_RAW		CL_SCAN_RAW

@@ -104,7 +102,7 @@ extern "C"

 #define CL_ENCRYPTED    CL_SCAN_BLOCKENCRYPTED

 #define cl_node		cl_engine

-

+/* internal structures */

 struct cli_bm_patt {

     char *pattern, *virname, *offset;

     const char *viralias;

@@ -125,7 +123,7 @@ struct cli_ac_patt {

 };

 struct cli_ac_node {

-    char islast;

+    unsigned char islast;

     struct cli_ac_patt *list;

     struct cli_ac_node *trans[256], *fail;

 };

@@ -189,33 +187,33 @@ struct cl_engine {

 };

 struct cl_limits {

-    unsigned int maxreclevel; /* maximal recursion level */

-    unsigned int maxfiles; /* maximal number of files to be

-			    * scanned within an archive

-			    */

-    unsigned int maxratio; /* maximal compression ratio */

-    unsigned short archivememlim; /* limit memory usage for bzip2 (0/1) */

-    unsigned long int maxfilesize; /* files in an archive larger than

-				    * this limit will not be scanned

-				    */

+    unsigned int maxreclevel;	    /* maximum recursion level */

+    unsigned int maxfiles;	    /* maximum number of files to be scanned

+				     * within a single archive

+				     */

+    unsigned int maxratio;	    /* maximum compression ratio */

+    unsigned short archivememlim;   /* limit memory usage for some unpackers */

+    unsigned long int maxfilesize;  /* compressed files larger than this limit

+				     * will not be scanned

+				     */

 };

 struct cl_stat {

     char *dir;

-    int no;

+    unsigned int entries;

     struct stat *stattab;

     char **statdname;

 };

-struct cl_cvd {

-    char *time;	    /* 2 */

-    int version;    /* 3 */

-    int sigs;	    /* 4 */

-    short int fl;   /* 5 */

-    char *md5;	    /* 6 */

-    char *dsig;	    /* 7 */

-    char *builder;  /* 8 */

-    int stime;	    /* 9 */

+struct cl_cvd {		    /* field no. */

+    char *time;		    /* 2 */

+    unsigned int version;   /* 3 */

+    unsigned int sigs;	    /* 4 */

+    unsigned int fl;	    /* 5 */

+    char *md5;		    /* 6 */

+    char *dsig;		    /* 7 */

+    char *builder;	    /* 8 */

+    unsigned int stime;	    /* 9 */

 };

 /* file scanning */

@@ -223,16 +221,14 @@ extern int cl_scandesc(int desc, const char **virname, unsigned long int *scanne

 extern int cl_scanfile(const char *filename, const char **virname, unsigned long int *scanned, const struct cl_engine *engine, const struct cl_limits *limits, unsigned int options);

-/* software versions */

-extern int cl_retflevel(void);

-extern const char *cl_retver(void);

-

-/* database */

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

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

+/* database handling */

 extern int cl_load(const char *path, struct cl_engine **engine, unsigned int *signo, unsigned int options);

 extern const char *cl_retdbdir(void);

+

+/* engine handling */

+extern int cl_build(struct cl_engine *engine);

 extern struct cl_engine *cl_dup(struct cl_engine *engine);

+extern void cl_free(struct cl_engine *engine);

 /* CVD */

 extern struct cl_cvd *cl_cvdhead(const char *file);

@@ -240,23 +236,24 @@ extern struct cl_cvd *cl_cvdparse(const char *head);

 extern int cl_cvdverify(const char *file);

 extern void cl_cvdfree(struct cl_cvd *cvd);

-/* data dir stat functions */

+/* db dir stat functions */

 extern int cl_statinidir(const char *dirname, struct cl_stat *dbstat);

 extern int cl_statchkdir(const struct cl_stat *dbstat);

 extern int cl_statfree(struct cl_stat *dbstat);

-/* enable debug information */

+/* enable debug messages */

 extern void cl_debug(void);

-extern void cl_settempdir(const char *dir, short leavetemps);

-

-extern int cl_build(struct cl_engine *engine);

-extern void cl_free(struct cl_engine *engine);

+/* software versions */

+extern unsigned int cl_retflevel(void);

+extern const char *cl_retver(void);

+/* others */

+extern void cl_settempdir(const char *dir, short leavetemps);

 extern const char *cl_strerror(int clerror);

 #ifdef __cplusplus

 }

 #endif

-#endif

+#endif /* __CLAMAV_H */

@@ -217,7 +217,7 @@ struct cl_cvd *cl_cvdparse(const char *head)

 	free(cvd);

 	return NULL;

     }

-    cvd->fl = (short int) atoi(pt);

+    cvd->fl = atoi(pt);

     free(pt);

     if(!(cvd->md5 = cli_strtok(head, 5, ":"))) {

@@ -77,18 +77,18 @@ int cli_scanbuff(const char *buffer, unsigned int length, const char **virname,

 	/* TODO: Setup proper data bitmask (need specs) */

 	if((hret = sn_sigscan_createstream(engine->ncdb, datamask, 2, &streamhandle)) < 0) {

 	    cli_errmsg("cli_scanbuff: can't create new hardware stream: %d\n", hret);

-	    return CL_EHWIO;

+	    return CL_ENCIO;

 	}

 	if((hret = sn_sigscan_writestream(streamhandle, buffer, length)) < 0) {

 	    cli_errmsg("cli_scanbuff: can't write %u bytes to hardware stream: %d\n", length, hret);

 	    sn_sigscan_closestream(streamhandle, &resulthandle);

-	    return CL_EHWIO;

+	    return CL_ENCIO;

 	}

 	if((hret = sn_sigscan_closestream(streamhandle, &resulthandle)) < 0) {

 	    cli_errmsg("cli_scanbuff: can't close hardware stream: %d\n", hret);

-	    return CL_EHWIO;

+	    return CL_ENCIO;

 	}

 	count = sn_sigscan_resultcount(resulthandle);

@@ -100,7 +100,7 @@ int cli_scanbuff(const char *buffer, unsigned int length, const char **virname,

 	    if((hret = sn_sigscan_resultget_name(resulthandle, i, &matchname) < 0)) {

 		cli_errmsg("cli_scanbuff: sn_sigscan_resultget_name failed for result %d: %d\n", i, hret);

 		sn_sigscan_resultfree(resulthandle);

-		return CL_EHWIO;

+		return CL_ENCIO;

 	    }

 	    if(!matchname) {

 		cli_errmsg("cli_scanbuff: HW Result[%d]: Signature without name\n", i);

@@ -111,7 +111,7 @@ int cli_scanbuff(const char *buffer, unsigned int length, const char **virname,

 	    if((hret = sn_sigscan_resultget_targettype(resulthandle, i, &targettype) < 0)) {

 		cli_errmsg("cli_scanbuff: sn_sigscan_resultget_targettype failed for result %d, signature %s: %d\n", i, matchname, hret);

 		sn_sigscan_resultfree(resulthandle);

-		return CL_EHWIO;

+		return CL_ENCIO;

 	    }

 	    if(targettype && targettab[targettype] != (int) ftype) {

 		cli_dbgmsg("cli_scanbuff: HW Result[%d]: %s: Target type: %d, expected: %d\n", i, matchname, targettab[targettype], ftype);

@@ -121,7 +121,7 @@ int cli_scanbuff(const char *buffer, unsigned int length, const char **virname,

 	    if((hret = sn_sigscan_resultget_offsetstring(resulthandle, i, &offsetstring) < 0)) {

 		cli_errmsg("cli_scanbuff: sn_sigscan_resultget_offsetstring failed for result %d, signature %s: %d\n", i, matchname, hret);

 		sn_sigscan_resultfree(resulthandle);

-		return CL_EHWIO;

+		return CL_ENCIO;

 	    }

 	    if(offsetstring) {

 		cli_dbgmsg("cli_scanbuff: HW Result[%d]: %s: Offset based signature not supported in buffer mode\n", i, matchname);

@@ -131,7 +131,7 @@ int cli_scanbuff(const char *buffer, unsigned int length, const char **virname,

 	    if((hret = sn_sigscan_resultget_extradata(resulthandle, i, &optionalsigdata) < 0)) {

 		cli_errmsg("cli_scanbuff: sn_sigscan_resultget_extradata failed for result %d, signature %s: %d\n", i, matchname, hret);

 		sn_sigscan_resultfree(resulthandle);

-		return CL_EHWIO;

+		return CL_ENCIO;

 	    }

 	    if(optionalsigdata && strlen(optionalsigdata)) {

 		if((pt = cli_strtok(optionalsigdata, 1, ":"))) { /* max version */

@@ -186,7 +186,7 @@ int cli_scanbuff(const char *buffer, unsigned int length, const char **virname,

 	if((hret = sn_sigscan_resultfree(resulthandle)) < 0) {

 	    cli_errmsg("cli_scanbuff: can't free results: %d\n", ret);

-	    return CL_EHWIO;

+	    return CL_ENCIO;

 	}

 	return ret;

@@ -436,7 +436,7 @@ int cli_scandesc(int desc, cli_ctx *ctx, unsigned short otfrec, unsigned short f

 	/* TODO: Setup proper data bitmask (need specs) */

 	if((hret = sn_sigscan_createstream(ctx->engine->ncdb, datamask, 2, &streamhandle)) < 0) {

 	    cli_errmsg("cli_scandesc: can't create new hardware stream: %d\n", hret);

-	    return CL_EHWIO;

+	    return CL_ENCIO;

 	}

 	if(!(buffer = (char *) cli_calloc(HWBUFFSIZE, sizeof(char)))) {

@@ -456,7 +456,7 @@ int cli_scandesc(int desc, cli_ctx *ctx, unsigned short otfrec, unsigned short f

 	while((bytes = cli_readn(desc, buffer, HWBUFFSIZE)) > 0) {

 	    if((hret = sn_sigscan_writestream(streamhandle, buffer, bytes)) < 0) {

 		cli_errmsg("cli_scandesc: can't write to hardware stream: %d\n", hret);

-		ret = CL_EHWIO;

+		ret = CL_ENCIO;

 		break;

 	    } else {

 		if(ctx->scanned)

@@ -471,7 +471,7 @@ int cli_scandesc(int desc, cli_ctx *ctx, unsigned short otfrec, unsigned short f

 	if((hret = sn_sigscan_closestream(streamhandle, &resulthandle)) < 0) {

 	    cli_errmsg("cli_scandesc: can't close hardware stream: %d\n", hret);

-	    return CL_EHWIO;

+	    return CL_ENCIO;

 	}

 	count = sn_sigscan_resultcount(resulthandle);

@@ -484,7 +484,7 @@ int cli_scandesc(int desc, cli_ctx *ctx, unsigned short otfrec, unsigned short f

 	    if((hret = sn_sigscan_resultget_name(resulthandle, i, &matchname) < 0)) {

 		cli_errmsg("cli_scandesc: sn_sigscan_resultget_name failed for result %d: %d\n", i, hret);

 		sn_sigscan_resultfree(resulthandle);

-		return CL_EHWIO;

+		return CL_ENCIO;

 	    }

 	    if(!matchname) {

@@ -496,7 +496,7 @@ int cli_scandesc(int desc, cli_ctx *ctx, unsigned short otfrec, unsigned short f

 	    if((hret = sn_sigscan_resultget_targettype(resulthandle, i, &targettype) < 0)) {

 		cli_errmsg("cli_scandesc: sn_sigscan_resultget_targettype failed for result %d, signature %s: %d\n", i, matchname, hret);

 		sn_sigscan_resultfree(resulthandle);

-		return CL_EHWIO;

+		return CL_ENCIO;

 	    }

 	    if(targettype && targettab[targettype] != (int) ftype) {

 		cli_dbgmsg("cli_scandesc: HW Result[%d]: %s: Target type: %d, expected: %d\n", i, matchname, targettab[targettype], ftype);

@@ -506,12 +506,12 @@ int cli_scandesc(int desc, cli_ctx *ctx, unsigned short otfrec, unsigned short f

 	    if((hret = sn_sigscan_resultget_offsetstring(resulthandle, i, &offsetstring) < 0)) {

 		cli_errmsg("cli_scandesc: sn_sigscan_resultget_offsetstring failed for result %d, signature %s: %d\n", i, matchname, hret);

 		sn_sigscan_resultfree(resulthandle);

-		return CL_EHWIO;

+		return CL_ENCIO;

 	    }

 	    if((hret = sn_sigscan_resultget_startoffset(resulthandle, i, &startoffset) < 0)) {

 		cli_errmsg("cli_scandesc: sn_sigscan_resultget_startoffset failed for result %d, signature %s: %d\n", i, matchname, hret);

 		sn_sigscan_resultfree(resulthandle);

-		return CL_EHWIO;

+		return CL_ENCIO;

 	    }

 	    if(offsetstring && strcmp(offsetstring, "*")) {

 		    long int off = cli_caloff(offsetstring, desc, ftype);

@@ -531,7 +531,7 @@ int cli_scandesc(int desc, cli_ctx *ctx, unsigned short otfrec, unsigned short f

 	    if((hret = sn_sigscan_resultget_extradata(resulthandle, i, &optionalsigdata) < 0)) {

 		cli_errmsg("cli_scandesc: sn_sigscan_resultget_extradata failed for result %d, signature %s: %d\n", i, matchname, hret);

 		sn_sigscan_resultfree(resulthandle);

-		return CL_EHWIO;

+		return CL_ENCIO;

 	    }

 	    if(optionalsigdata && strlen(optionalsigdata)) {

 		if((pt = cli_strtok(optionalsigdata, 1, ":"))) { /* max version */

@@ -586,7 +586,7 @@ int cli_scandesc(int desc, cli_ctx *ctx, unsigned short otfrec, unsigned short f

 	if((hret = sn_sigscan_resultfree(resulthandle)) < 0) {

 	    cli_errmsg("cli_scandesc: can't free results: %d\n", ret);

-	    return CL_EHWIO;

+	    return CL_ENCIO;

 	}

 	if(ctx->engine->md5_hlist) {

@@ -152,7 +152,7 @@ void cl_debug(void)

     cli_debug_flag = 1;

 }

-int cl_retflevel(void)

+unsigned int cl_retflevel(void)

 {

     return CL_FLEVEL;

 }

@@ -179,8 +179,6 @@ const char *cl_strerror(int clerror)

 	    return "RAR module failure";

 	case CL_EZIP:

 	    return "Zip module failure";

-	case CL_EMALFZIP:

-	    return "Malformed Zip detected";

 	case CL_EGZIP:

 	    return "GZip module failure";

 	case CL_EMSCOMP:

@@ -219,12 +217,12 @@ const char *cl_strerror(int clerror)

 	    return "Bad format or broken data";

 	case CL_ESUPPORT:

 	    return "Not supported data format";

-	case CL_EHWINIT:

-	    return "Hardware initialization failure";

-	case CL_EHWLOAD:

-	    return "Error loading hardware database";

-	case CL_EHWIO:

-	    return "Hardware accelerator Input/Output error";

+	case CL_ENCINIT:

+	    return "NodalCore initialization failure";

+	case CL_ENCLOAD:

+	    return "Error loading NodalCore database";

+	case CL_ENCIO:

+	    return "NodalCore accelerator Input/Output error";

 	default:

 	    return "Unknown error code";

     }

@@ -1111,7 +1111,7 @@ static int cli_loadncdb(const char *filename, struct cl_engine **engine, unsigne

     if((ret = sn_sigscan_initdb(&(*engine)->ncdb)) < 0) {

 	cli_errmsg("cli_loadncdb: error initializing the matcher: %d\n", ret);

 	cl_free(*engine);

-	return CL_EHWINIT;

+	return CL_ENCINIT;

     }

     (*engine)->ncore = 1;

@@ -1119,7 +1119,7 @@ static int cli_loadncdb(const char *filename, struct cl_engine **engine, unsigne

     if((ret = sn_sigscan_loaddb((*engine)->ncdb, filename, 0, &newsigs)) < 0) {

 	cli_errmsg("cli_loadncdb: can't load hardware database: %d\n", ret);

 	cl_free(*engine);

-	return CL_EHWLOAD;

+	return CL_ENCLOAD;

     }

     *signo += newsigs;

@@ -1353,7 +1353,7 @@ int cl_statinidir(const char *dirname, struct cl_stat *dbstat)

     if(dbstat) {

-	dbstat->no = 0;

+	dbstat->entries = 0;

 	dbstat->stattab = NULL;

 	dbstat->statdname = NULL;

 	dbstat->dir = strdup(dirname);

@@ -1399,10 +1399,10 @@ int cl_statinidir(const char *dirname, struct cl_stat *dbstat)

 	    cli_strbcasestr(dent->d_name, ".inc")   ||

 	    cli_strbcasestr(dent->d_name, ".cvd"))) {

-		dbstat->no++;

-		dbstat->stattab = (struct stat *) realloc(dbstat->stattab, dbstat->no * sizeof(struct stat));

+		dbstat->entries++;

+		dbstat->stattab = (struct stat *) realloc(dbstat->stattab, dbstat->entries * sizeof(struct stat));

 #if defined(C_INTERIX) || defined(C_OS2)

-		dbstat->statdname = (char **) realloc(dbstat->statdname, dbstat->no * sizeof(char *));

+		dbstat->statdname = (char **) realloc(dbstat->statdname, dbstat->entries * sizeof(char *));

 #endif

                 fname = cli_calloc(strlen(dirname) + strlen(dent->d_name) + 32, sizeof(char));

@@ -1415,10 +1415,10 @@ int cl_statinidir(const char *dirname, struct cl_stat *dbstat)

 		    sprintf(fname, "%s/%s", dirname, dent->d_name);

 		}

 #if defined(C_INTERIX) || defined(C_OS2)

-		dbstat->statdname[dbstat->no - 1] = (char *) cli_calloc(strlen(dent->d_name) + 1, sizeof(char));

-		strcpy(dbstat->statdname[dbstat->no - 1], dent->d_name);

+		dbstat->statdname[dbstat->entries - 1] = (char *) cli_calloc(strlen(dent->d_name) + 1, sizeof(char));

+		strcpy(dbstat->statdname[dbstat->entries - 1], dent->d_name);

 #endif

-		stat(fname, &dbstat->stattab[dbstat->no - 1]);

+		stat(fname, &dbstat->stattab[dbstat->entries - 1]);

 		free(fname);

 	    }

 	}

@@ -1498,7 +1498,7 @@ int cl_statchkdir(const struct cl_stat *dbstat)

 		free(fname);

 		found = 0;

-		for(i = 0; i < dbstat->no; i++)

+		for(i = 0; i < dbstat->entries; i++)

 #if defined(C_INTERIX) || defined(C_OS2)

 		    if(!strcmp(dbstat->statdname[i], dent->d_name)) {

 #else

@@ -1531,7 +1531,7 @@ int cl_statfree(struct cl_stat *dbstat)

 #if defined(C_INTERIX) || defined(C_OS2)

 	    int i;

-	for(i = 0;i < dbstat->no; i++) {

+	for(i = 0;i < dbstat->entries; i++) {

 	    free(dbstat->statdname[i]);

 	    dbstat->statdname[i] = NULL;

 	}

@@ -1541,7 +1541,7 @@ int cl_statfree(struct cl_stat *dbstat)

 	free(dbstat->stattab);

 	dbstat->stattab = NULL;

-	dbstat->no = 0;

+	dbstat->entries = 0;

 	if(dbstat->dir) {

 	    free(dbstat->dir);

 	    dbstat->dir = NULL;

@@ -492,11 +492,6 @@ static int cli_scanzip(int desc, cli_ctx *ctx, off_t sfx_offset, uint32_t *sfx_c

 	    cli_dbgmsg("Zip: Infected with %s\n", *ctx->virname);

 	    ret = CL_VIRUS;

 	    break;

-	} else if(ret == CL_EMALFZIP) {

-	    cli_dbgmsg("Zip: Malformed Zip file, scanning stopped.\n");

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

-	    ret = CL_VIRUS;

-	    break;

 	}

 	if(tmp) {