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

+Thu Feb 12 15:22:17 CET 2009 (tk)

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

+ * libclamav: return codes cleanup (bb#1159)

+

 Wed Feb 11 11:08:55 CET 2009 (tk)

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

  * libclamav/cvd.c: fix warning when cvd timestamp is in the future (bb#1381)

@@ -358,13 +358,13 @@ static int ea05(int desc, cli_ctx *ctx, char *tmpd) {

     if((i = open(tempfile, O_RDWR|O_CREAT|O_TRUNC|O_BINARY, S_IRWXU)) < 0) {

       cli_dbgmsg("autoit: Can't create file %s\n", tempfile);

       free(UNP.outputbuf);

-      return CL_EIO;

+      return CL_ECREAT;

     }

     if(cli_writen(i, UNP.outputbuf, UNP.usize) != (int32_t)UNP.usize) {

       cli_dbgmsg("autoit: cannot write %d bytes\n", UNP.usize);

       close(i);

       free(UNP.outputbuf);

-      return CL_EIO;

+      return CL_EWRITE;

     }

     free(UNP.outputbuf);

     if(ctx->engine->keeptmp)

@@ -375,12 +375,12 @@ static int ea05(int desc, cli_ctx *ctx, char *tmpd) {

     if(cli_magic_scandesc(i, ctx) == CL_VIRUS) {

       close(i);

       if(!ctx->engine->keeptmp)

-        if(cli_unlink(tempfile)) return CL_EIO;

+        if(cli_unlink(tempfile)) return CL_EUNLINK;

       return CL_VIRUS;

     }

     close(i);

     if(!ctx->engine->keeptmp) 

-      if (cli_unlink(tempfile)) return CL_EIO;

+      if (cli_unlink(tempfile)) return CL_EUNLINK;

   }

   return ret;

 }

@@ -868,13 +868,13 @@ static int ea06(int desc, cli_ctx *ctx, char *tmpd) {

     if((i = open(tempfile, O_RDWR|O_CREAT|O_TRUNC|O_BINARY, S_IRWXU)) < 0) {

       cli_dbgmsg("autoit: Can't create file %s\n", tempfile);

       free(buf);

-      return CL_EIO;

+      return CL_ECREAT;

     }

     if(cli_writen(i, buf, UNP.cur_output) != (int32_t)UNP.cur_output) {

       cli_dbgmsg("autoit: cannot write %d bytes\n", UNP.usize);

       close(i);

       free(buf);

-      return CL_EIO;

+      return CL_EWRITE;

     }

     free(buf);

     if(ctx->engine->keeptmp)

@@ -885,12 +885,12 @@ static int ea06(int desc, cli_ctx *ctx, char *tmpd) {

     if(cli_magic_scandesc(i, ctx) == CL_VIRUS) {

       close(i);

       if(!ctx->engine->keeptmp) 

-        if (cli_unlink(tempfile)) return CL_EIO;

+        if (cli_unlink(tempfile)) return CL_EUNLINK;

       return CL_VIRUS;

     }

     close(i);

     if(!ctx->engine->keeptmp)

-      if (cli_unlink(tempfile)) return CL_EIO;

+      if (cli_unlink(tempfile)) return CL_EUNLINK;

   }

   return ret;

 }

@@ -908,7 +908,7 @@ int cli_scanautoit(int desc, cli_ctx *ctx, off_t offset) {

   lseek(desc, offset, SEEK_SET);

   if (cli_readn(desc, &version, 1)!=1)

-    return CL_EIO;

+    return CL_EREAD;

   cli_dbgmsg("in scanautoit()\n");

@@ -145,7 +145,7 @@ cli_binhex(const char *dir, int desc)

 	start = buf = mmap(NULL, size, PROT_READ, MAP_PRIVATE, desc, 0);

 	if(buf == MAP_FAILED) {

 		messageDestroy(m);

-		return CL_EMEM;

+		return CL_EMAP;

 	}

 	cli_dbgmsg("mmap'ed binhex file\n");

@@ -211,6 +211,7 @@ cli_binhex(const char *dir, int desc)

 	if(fb)

 		return CL_CLEAN;	/* a lie - but it gets things going */

-	return CL_EIO;	/* probably CL_EMEM, but we can't tell at this layer */

+	/* return CL_EIO; */	/* probably CL_EMEM, but we can't tell at this layer */

+	return CL_EMEM;

 #endif

 }

@@ -104,7 +104,7 @@ static char *cab_readstr(int fd, int *ret)

     if((pos = lseek(fd, 0, SEEK_CUR)) == -1) {

-	*ret = CL_EIO;

+	*ret = CL_ESEEK;

 	return NULL;

     }

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

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

 	cli_errmsg("cab_open: Can't lseek to %u (offset)\n", (unsigned int) offset);

-	return CL_EIO;

+	return CL_ESEEK;

     }

     if(cli_readn(fd, &hdr, sizeof(hdr)) != sizeof(hdr)) {

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

     if(fstat(fd, &sb) == -1) {

 	cli_errmsg("cab_open: Can't fstat descriptor %d\n", fd);

-	return CL_EIO;

+	return CL_ESTAT;

     }

     rsize = sb.st_size;

@@ -577,7 +577,7 @@ static int cab_unstore(struct cab_file *file, int bytes)

 	    return file->error;

 	} else if(cli_writen(file->ofd, buff, bread) != bread) {

 	    cli_warnmsg("cab_unstore: Can't write %d bytes to descriptor %d\n", bread, file->ofd);

-	    return CL_EIO;

+	    return CL_EWRITE;

 	}

 	todo -= bread;

@@ -631,7 +631,7 @@ static int cab_unstore(struct cab_file *file, int bytes)

 	}								\

 	if((file->folder->cmethod & 0x000f) && !file->cab->state->stream) { \

 	    close(file->ofd);						\

-	    return CL_EMSCAB;						\

+	    return CL_EUNPACK;						\

 	}								\

 	file->cab->actfol = file->folder;				\

     } else {								\

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

     file->ofd = open(name, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, S_IRWXU);

     if(file->ofd == -1) {

 	cli_errmsg("cab_extract: Can't open file %s in write mode\n", name);

-	return CL_EIO;

+	return CL_ECREAT;

     }

     switch(file->folder->cmethod & 0x000f) {

@@ -824,12 +824,11 @@ int cli_chm_extract_file(int fd, char *dirname, chm_metadata_t *metadata)

 	snprintf(filename, 1024, "%s/%lu.chm", dirname, (unsigned long int) metadata->file_offset);

 	metadata->ofd = open(filename, O_RDWR|O_CREAT|O_TRUNC|O_BINARY, S_IRWXU);

 	if (metadata->ofd < 0) {

-		return CL_EIO;

+		return CL_ECREAT;

 	}

 	if (chm_copy_file_data(metadata->ufd, metadata->ofd, metadata->file_length) != metadata->file_length) {

 		cli_dbgmsg("failed to copy %lu bytes\n", (unsigned long int) metadata->file_length);

 		close(metadata->ofd);

-		/* return CL_EIO; */

 		return CL_EFORMAT; /* most likely a corrupted file */

 	}

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

 /*

- *  Copyright (C) 2007-2008 Sourcefire, Inc.

+ *  Copyright (C) 2007-2009 Sourcefire, Inc.

  *

  *  Authors: Tomasz Kojm

  *

@@ -32,38 +32,39 @@ extern "C"

 #define CL_COUNT_PRECISION 4096

 /* return codes */

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

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

-#define CL_SUCCESS	CL_CLEAN

-#define CL_BREAK	2

-

-#define CL_EMAXREC	-100 /* (internal) recursion limit exceeded */

-#define CL_EMAXSIZE	-101 /* (internal) size limit exceeded */

-#define CL_EMAXFILES	-102 /* (internal) 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 /* (internal) bad format or broken file */

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

-#define CL_EARJ         -127 /* ARJ handler error */

+typedef enum {

+    /* libclamav specific */

+    CL_CLEAN = 0,

+    CL_SUCCESS = 0,

+    CL_VIRUS,

+    CL_ENULLARG,

+    CL_EMALFDB,

+    CL_ECVD,

+    CL_EVERIFY,

+    CL_EUNPACK,

+

+    /* I/O and memory errors */

+    CL_EOPEN,

+    CL_ECREAT,

+    CL_EUNLINK,

+    CL_ESTAT,

+    CL_EREAD,

+    CL_ESEEK,

+    CL_EWRITE,

+    CL_EDUP,

+    CL_EACCES,

+    CL_ETMPFILE,

+    CL_ETMPDIR,

+    CL_EMAP,

+    CL_EMEM,

+

+    /* internal (not reported outside libclamav) */

+    CL_BREAK,

+    CL_EMAXREC,

+    CL_EMAXSIZE,

+    CL_EMAXFILES,

+    CL_EFORMAT

+} cl_error_t;

 /* db options */

 #define CL_DB_PHISHING	    0x2

@@ -210,19 +210,19 @@ static int cli_tgzload(int fd, struct cl_engine *engine, unsigned int *signo, un

     if((fdd = dup(fd)) == -1) {

 	cli_errmsg("cli_tgzload: Can't duplicate descriptor %d\n", fd);

-	return CL_EIO;

+	return CL_EDUP;

     }

     if(compr) {

 	if((dbio.gzs = gzdopen(fdd, "rb")) == NULL) {

 	    cli_errmsg("cli_tgzload: Can't gzdopen() descriptor %d, errno = %d\n", fdd, errno);

-	    return CL_EIO;

+	    return CL_EOPEN;

 	}

 	dbio.fs = NULL;

     } else {

 	if((dbio.fs = fdopen(fdd, "rb")) == NULL) {

 	    cli_errmsg("cli_tgzload: Can't fdopen() descriptor %d, errno = %d\n", fdd, errno);

-	    return CL_EIO;

+	    return CL_EOPEN;

 	}

 	dbio.gzs = NULL;

     }

@@ -470,14 +470,14 @@ static int cli_cvdverify(FILE *fs, struct cl_cvd *cvdpt, unsigned int cld)

 	cli_dbgmsg("cli_cvdverify: MD5 verification error\n");

 	free(md5);

 	cl_cvdfree(cvd);

-	return CL_EMD5;

+	return CL_EVERIFY;

     }

     if(cli_versig(md5, cvd->dsig)) {

 	cli_dbgmsg("cli_cvdverify: Digital signature verification error\n");

 	free(md5);

 	cl_cvdfree(cvd);

-	return CL_EDSIG;

+	return CL_EVERIFY;

     }

     free(md5);

@@ -549,7 +549,7 @@ int cli_cvdload(FILE *fs, struct cl_engine *engine, unsigned int *signo, unsigne

      */ 

     if(lseek(cfd, 512, SEEK_SET) == -1) {

 	cli_errmsg("cli_cvdload(): lseek(fs, 512, SEEK_SET) failed\n");

-	return CL_EIO;

+	return CL_ESEEK;

     }

     if(daily) {

@@ -575,7 +575,7 @@ int cli_cvdload(FILE *fs, struct cl_engine *engine, unsigned int *signo, unsigne

 	if(cli_untgz(cfd, dir)) {

 	    cli_errmsg("cli_cvdload(): Can't unpack CVD file.\n");

 	    free(dir);

-	    return CL_ECVDEXTR;

+	    return CL_ECVD;

 	}

 	/* load extracted directory */

@@ -111,7 +111,7 @@ int cli_versig(const char *md5, const char *dsig)

     if(strlen(md5) != 32 || !isalnum(md5[0])) {

 	/* someone is trying to fool us with empty/malformed MD5 ? */

 	cli_errmsg("SECURITY WARNING: MD5 basic test failure.\n");

-	return CL_EMD5;

+	return CL_EVERIFY;

     }

     mp_init(&n);

@@ -122,7 +122,7 @@ int cli_versig(const char *md5, const char *dsig)

     if(!(pt = (char *) cli_decodesig(dsig, 16, e, n))) {

 	mp_clear(&n);

 	mp_clear(&e);

-	return CL_EDSIG;

+	return CL_EVERIFY;

     }

     pt2 = cli_str2hex(pt, 16);

@@ -135,7 +135,7 @@ int cli_versig(const char *md5, const char *dsig)

 	free(pt2);

 	mp_clear(&n);

 	mp_clear(&e);

-	return CL_EDSIG;

+	return CL_EVERIFY;

     }

     free(pt2);

@@ -315,7 +315,7 @@ static inline int buf_outc(char c, struct buf *buf)

 {

 	if(buf->pos >= sizeof(buf->buf)) {

 		if(write(buf->outfd, buf->buf, sizeof(buf->buf)) != sizeof(buf->buf))

-			return CL_EIO;

+			return CL_EWRITE;

 		buf->pos = 0;

 	}

 	buf->buf[buf->pos++] = c;

@@ -338,7 +338,7 @@ static inline int buf_outs(const char *s, struct buf *buf)

 		}

 		if(i == buf_len) {

 			if(write(buf->outfd, buf->buf, buf_len) < 0)

-				return CL_EIO;

+				return CL_EWRITE;

 		       i = 0;

 		}

 	}

@@ -61,8 +61,10 @@ int cli_ac_addpatt(struct cli_matcher *root, struct cli_ac_patt *pattern)

 	}

     }

-    if(len < root->ac_mindepth)

-	return CL_EPATSHORT;

+    if(len < root->ac_mindepth) {

+	/* cli_errmsg("cli_ac_addpatt: Signature for %s is too short\n", pattern->virname); */

+	return CL_EMALFDB;

+    }

     pt = root->ac_root;

@@ -1124,8 +1126,11 @@ int cli_ac_addsig(struct cli_matcher *root, const char *virname, const char *hex

 	return CL_ENULLARG;

     }

-    if(strlen(hexsig) / 2 < root->ac_mindepth)

-	return CL_EPATSHORT;

+    if(strlen(hexsig) / 2 < root->ac_mindepth) {

+	cli_errmsg("cli_ac_addsig: Signature for %s is too short\n", virname);

+	return CL_EMALFDB;

+    }

+

     if((new = (struct cli_ac_patt *) mpool_calloc(root->mempool, 1, sizeof(struct cli_ac_patt))) == NULL)

 	return CL_EMEM;

@@ -46,8 +46,8 @@ int cli_bm_addpatt(struct cli_matcher *root, struct cli_bm_patt *pattern)

     if(pattern->length < BM_MIN_LENGTH) {

-	cli_errmsg("Signature for %s is too short\n", pattern->virname);

-	return CL_EPATSHORT;

+	cli_errmsg("cli_bm_addpatt: Signature for %s is too short\n", pattern->virname);

+	return CL_EMALFDB;

     }

 #if BM_MIN_LENGTH == BM_BLOCK_SIZE

@@ -480,7 +480,7 @@ cli_mbox(const char *dir, int desc, cli_ctx *ctx)

 	start = mmap(NULL, size, PROT_READ, MAP_PRIVATE, desc, 0);

 	if(start == MAP_FAILED)

-		return CL_EMEM;

+		return CL_EMAP;

 	cli_dbgmsg("mmap'ed mbox\n");

@@ -1233,7 +1233,7 @@ cli_parse_mbox(const char *dir, int desc, cli_ctx *ctx)

 		/* empty message */

 		fclose(fd);

 #ifdef	SAVE_TMP

-		if (cli_unlink(tmpfilename)) return CL_EIO;

+		if (cli_unlink(tmpfilename)) return CL_EUNLINK;

 #endif

 		return CL_CLEAN;

 	}

@@ -1251,7 +1251,7 @@ cli_parse_mbox(const char *dir, int desc, cli_ctx *ctx)

 #endif

 			fclose(fd);

 #ifdef	SAVE_TMP

-			if (cli_unlink(tmpfilename)) return CL_EIO;

+			if (cli_unlink(tmpfilename)) return CL_EUNLINK;

 #endif

 			return CL_EMEM;

 		}

@@ -1312,7 +1312,7 @@ cli_parse_mbox(const char *dir, int desc, cli_ctx *ctx)

 			signal(SIGSEGV, segv);

 #endif

 #ifdef	SAVE_TMP

-			if (cli_unlink(tmpfilename)) return CL_EIO;

+			if (cli_unlink(tmpfilename)) return CL_EUNLINK;

 #endif

 			return CL_EMEM;

 		}

@@ -1472,7 +1472,7 @@ cli_parse_mbox(const char *dir, int desc, cli_ctx *ctx)

 #endif

 #ifdef	SAVE_TMP

-	if (cli_unlink(tmpfilename)) return CL_EIO;

+	if (cli_unlink(tmpfilename)) return CL_EUNLINK;

 #endif

 	return retcode;

 }

@@ -73,7 +73,7 @@ struct msexp_hdr {

 #define READBYTES				\

     ret = cli_readn(fd, rbuff, RWBUFF);		\

     if(ret == -1)				\

-	return CL_EIO;				\

+	return CL_EREAD;			\

     if(!ret)					\

 	break;					\

     rbytes = (unsigned int) ret;		\

@@ -82,7 +82,7 @@ struct msexp_hdr {

 #define WRITEBYTES				\

     ret = cli_writen(ofd, wbuff, w);		\

     if(ret == -1 || (unsigned int) ret != w)	\

-	return CL_EIO;				\

+	return CL_EWRITE;			\

     wbytes += w;				\

     if(wbytes >= EC32(hdr.fsize))		\

 	return CL_SUCCESS;			\

@@ -99,7 +99,7 @@ int cli_msexpand(int fd, int ofd, cli_ctx *ctx)

     if(cli_readn(fd, &hdr, sizeof(hdr)) == -1)

-	return CL_EIO;

+	return CL_EREAD;

     if(EC32(hdr.magic1) != MAGIC1 || EC32(hdr.magic2) != MAGIC2 || EC16(hdr.magic3) != MAGIC3) {

 	cli_dbgmsg("MSEXPAND: Not supported file format\n");

@@ -624,7 +624,7 @@ int mszip_decompress(struct mszip_stream *zip, off_t out_bytes) {

   if ((off_t) i > out_bytes) i = (int) out_bytes;

   if (i) {

     if (zip->wflag && cli_writen(zip->ofd, zip->o_ptr, i) != i) {

-      return zip->error = CL_EIO;

+      return zip->error = CL_EWRITE;

     }

     zip->o_ptr  += i;

     out_bytes   -= i;

@@ -670,7 +670,7 @@ int mszip_decompress(struct mszip_stream *zip, off_t out_bytes) {

     i = (out_bytes < (off_t)zip->bytes_output) ?

       (int)out_bytes : zip->bytes_output;

     if (zip->wflag && cli_writen(zip->ofd, zip->o_ptr, i) != i) {

-      return zip->error = CL_EIO;

+      return zip->error = CL_EWRITE;

     }

     /* mspack errors (i.e. read errors) are fatal and can't be recovered */

@@ -766,7 +766,7 @@ static int lzx_read_input(struct lzx_stream *lzx) {

   if (bread == 0) {

     if (lzx->input_end) {

       cli_dbgmsg("lzx_read_input: out of input bytes\n");

-      return lzx->error = CL_EIO;

+      return lzx->error = CL_EREAD;

     }

     else {

       bread = 2;

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

   if ((off_t) i > out_bytes) i = (int) out_bytes;

   if (i) {

     if (lzx->wflag && cli_writen(lzx->ofd, lzx->o_ptr, i) != i) {

-      return lzx->error = CL_EIO;

+      return lzx->error = CL_EWRITE;

     }

     lzx->o_ptr  += i;

     lzx->offset += i;

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

     /* write a frame */

     i = (out_bytes < (off_t)frame_size) ? (unsigned int)out_bytes : frame_size;

     if (lzx->wflag && cli_writen(lzx->ofd, lzx->o_ptr, i) != i) {

-      return lzx->error = CL_EIO;

+      return lzx->error = CL_EWRITE;

     }

     lzx->o_ptr  += i;

     lzx->offset += i;

@@ -1810,7 +1810,7 @@ int qtm_decompress(struct qtm_stream *qtm, off_t out_bytes) {

   if ((off_t) i > out_bytes) i = (int) out_bytes;

   if (i) {

     if (qtm->wflag && cli_writen(qtm->ofd, qtm->o_ptr, i) != i) {

-      return qtm->error = CL_EIO;

+      return qtm->error = CL_EWRITE;

     }

     qtm->o_ptr  += i;

     out_bytes   -= i;

@@ -1929,7 +1929,7 @@ int qtm_decompress(struct qtm_stream *qtm, off_t out_bytes) {

 	/* flush all currently stored data */

 	i = (qtm->o_end - qtm->o_ptr);

 	if (qtm->wflag && cli_writen(qtm->ofd, qtm->o_ptr, i) != i) {

-	  return qtm->error = CL_EIO;

+	  return qtm->error = CL_EWRITE;

 	}

 	out_bytes -= i;

 	qtm->o_ptr = &window[0];

@@ -1945,7 +1945,7 @@ int qtm_decompress(struct qtm_stream *qtm, off_t out_bytes) {

   if (out_bytes) {

     i = (int) out_bytes;

     if (qtm->wflag && cli_writen(qtm->ofd, qtm->o_ptr, i) != i) {

-      return qtm->error = CL_EIO;

+      return qtm->error = CL_EWRITE;

     }

     qtm->o_ptr += i;

   }

@@ -93,7 +93,7 @@ static int nsis_init(struct nsis_st *n) {

   case COMP_BZIP2:

     memset(&n->bz, 0, sizeof(nsis_bzstream));

     if (nsis_BZ2_bzDecompressInit(&n->bz, 0, 0)!=BZ_OK)

-      return CL_EBZIP;

+      return CL_EUNPACK;

     n->freecomp=1;

     break;

   case COMP_LZMA:

@@ -203,7 +203,7 @@ static int nsis_unpack_next(struct nsis_st *n, cli_ctx *ctx) {

   if ((n->ofd=open(n->ofn, O_RDWR|O_CREAT|O_TRUNC|O_BINARY, 0600))==-1) {

     cli_errmsg("NSIS: unable to create output file %s - aborting.", n->ofn);

-    return CL_EIO;

+    return CL_ECREAT;

   }

   if (!n->solid) {

@@ -232,7 +232,7 @@ static int nsis_unpack_next(struct nsis_st *n, cli_ctx *ctx) {

     if ((ret=cli_checklimits("NSIS", ctx, size, 0, 0))!=CL_CLEAN) {

       close(n->ofd);

-      if (lseek(n->ifd, size, SEEK_CUR)==-1) return CL_EIO;

+      if (lseek(n->ifd, size, SEEK_CUR)==-1) return CL_ESEEK;

       return ret;

     }

     if (!(ibuf= (unsigned char *) cli_malloc(size))) {

@@ -244,14 +244,14 @@ static int nsis_unpack_next(struct nsis_st *n, cli_ctx *ctx) {

       cli_dbgmsg("NSIS: cannot read %u bytes"__AT__"\n", size);

       free(ibuf);

       close(n->ofd);

-      return CL_EIO;

+      return CL_EREAD;

     }

     if (loops==size) {

       if (cli_writen(n->ofd, ibuf, size) != (ssize_t) size) {

 	cli_dbgmsg("NSIS: cannot write output file"__AT__"\n");

 	free(ibuf);

 	close(n->ofd);

-	return CL_EIO;

+	return CL_EWRITE;

       }

     } else {

       if ((ret=nsis_init(n))!=CL_SUCCESS) {

@@ -275,7 +275,7 @@ static int nsis_unpack_next(struct nsis_st *n, cli_ctx *ctx) {

 	    free(ibuf);

 	    close(n->ofd);

 	    nsis_shutdown(n);

-	    return CL_EIO;

+	    return CL_EWRITE;

 	  }

 	  n->nsis.next_out = obuf;

 	  n->nsis.avail_out = BUFSIZ;

@@ -301,7 +301,7 @@ static int nsis_unpack_next(struct nsis_st *n, cli_ctx *ctx) {

 	  cli_dbgmsg("NSIS: cannot write output file"__AT__"\n");

 	  free(ibuf);

 	  close(n->ofd);

-	  return CL_EIO;

+	  return CL_EWRITE;

 	}

       }

@@ -333,7 +333,7 @@ static int nsis_unpack_next(struct nsis_st *n, cli_ctx *ctx) {

       if((n->freeme= (unsigned char *)mmap(NULL, n->fullsz, PROT_READ, MAP_PRIVATE, n->ifd, 0))==MAP_FAILED) {

 	cli_dbgmsg("NSIS: mmap() failed"__AT__"\n");

 	close(n->ofd);

-	return CL_EIO;

+	return CL_EMAP;

       }

       n->nsis.next_in = n->freeme+n->off+0x1c;

 #else /* HAVE_MMAP */

@@ -350,7 +350,7 @@ static int nsis_unpack_next(struct nsis_st *n, cli_ctx *ctx) {

       if (cli_readn(n->ifd, n->freeme, n->asz) != (ssize_t) n->asz) {

 	cli_dbgmsg("NSIS: cannot read %u bytes"__AT__"\n", n->asz);

 	close(n->ofd);

-	return CL_EIO;

+	return CL_EREAD;

       }

       n->nsis.next_in = n->freeme;

 #endif /* HAVE_MMAP */

@@ -398,7 +398,7 @@ static int nsis_unpack_next(struct nsis_st *n, cli_ctx *ctx) {

 	if (cli_writen(n->ofd, obuf, wsz) != (ssize_t) wsz) {

 	  cli_dbgmsg("NSIS: cannot write output file"__AT__"\n");

 	  close(n->ofd);

-	  return CL_EIO;

+	  return CL_EWRITE;

 	}

 	size-=wsz;

 	loops=0;

@@ -416,7 +416,7 @@ static int nsis_unpack_next(struct nsis_st *n, cli_ctx *ctx) {

       if (cli_writen(n->ofd, obuf, n->nsis.next_out - obuf) != n->nsis.next_out - obuf) {

 	cli_dbgmsg("NSIS: cannot write output file"__AT__"\n");

 	close(n->ofd);

-	return CL_EIO;

+	return CL_EWRITE;

       }

     }

@@ -456,7 +456,7 @@ static int nsis_headers(struct nsis_st *n, cli_ctx *ctx) {

   if (fstat(n->ifd, &st)==-1 ||

       lseek(n->ifd, n->off, SEEK_SET)==-1 ||

       cli_readn(n->ifd, buf, 28) != 28)

-    return CL_EIO;

+    return CL_EREAD;

   n->hsz = (uint32_t)cli_readint32(buf+0x14);

   n->asz = (uint32_t)cli_readint32(buf+0x18);

@@ -477,12 +477,12 @@ static int nsis_headers(struct nsis_st *n, cli_ctx *ctx) {

   /* Guess if solid */

   for (i=0, pos=0;pos < n->asz-4;i++) {

     int32_t nextsz;

-    if (cli_readn(n->ifd, buf+4, 4)!=4) return CL_EIO;

+    if (cli_readn(n->ifd, buf+4, 4)!=4) return CL_EREAD;

     nextsz=cli_readint32(buf+4);

     if (!i) n->comp = nsis_detcomp(buf+4);

     if (nextsz&0x80000000) {

       nextsz&=~0x80000000;

-      if (cli_readn(n->ifd, buf+4, 4)!=4) return CL_EIO;

+      if (cli_readn(n->ifd, buf+4, 4)!=4) return CL_EREAD;

       comps[nsis_detcomp(buf+4)]++;

       nextsz-=4;

       pos+=4;

@@ -492,7 +492,7 @@ static int nsis_headers(struct nsis_st *n, cli_ctx *ctx) {

       break;

     }

-    if (lseek(n->ifd, nextsz, SEEK_CUR)==-1) return CL_EIO;

+    if (lseek(n->ifd, nextsz, SEEK_CUR)==-1) return CL_ESEEK;

   }

   if (trunc && i>=2) n->solid=0;

@@ -505,7 +505,7 @@ static int nsis_headers(struct nsis_st *n, cli_ctx *ctx) {

     n->comp = (comps[1]<comps[2]) ? (comps[2]<comps[3] ? COMP_ZLIB : COMP_LZMA) : (comps[1]<comps[3] ? COMP_ZLIB : COMP_BZIP2);

   }

-  if (lseek(n->ifd, n->off+0x1c, SEEK_SET)==-1) return CL_EIO;

+  if (lseek(n->ifd, n->off+0x1c, SEEK_SET)==-1) return CL_ESEEK;

   return nsis_unpack_next(n, ctx);

 }

@@ -558,7 +558,7 @@ int cli_scannulsft(int desc, cli_ctx *ctx, off_t offset) {

 	    ret=cli_magic_scandesc(nsist.ofd, ctx);

 	  close(nsist.ofd);

 	  if(!ctx->engine->keeptmp)

-	    if(cli_unlink(nsist.ofn)) ret = CL_EIO;

+	    if(cli_unlink(nsist.ofn)) ret = CL_EUNLINK;

 	} else if(ret == CL_EMAXSIZE) {

 	    ret = nsist.solid ? CL_BREAK : CL_SUCCESS;

 	}

@@ -721,7 +721,7 @@ static int handler_otf(int fd, ole2_header_t *hdr, property_t *prop, const char

   if((ofd = open(tempfile, O_RDWR|O_CREAT|O_TRUNC|O_BINARY, S_IRWXU)) < 0) {

     cli_dbgmsg("OLE2: Can't create file %s\n", tempfile);

     free(tempfile);

-    return CL_EIO;

+    return CL_ECREAT;

   }

   current_block = prop->start_block;

@@ -743,7 +743,7 @@ static int handler_otf(int fd, ole2_header_t *hdr, property_t *prop, const char

     close(ofd);

     if (cli_unlink(tempfile)) {

         free(tempfile);

-	return CL_EIO;

+	return CL_EUNLINK;

     }

     free(tempfile);

     return CL_BREAK;

@@ -777,7 +777,7 @@ static int handler_otf(int fd, ole2_header_t *hdr, property_t *prop, const char

 	cli_bitset_free(blk_bitset);

 	if (cli_unlink(tempfile)) {

 	  free(tempfile);

-	  return CL_EIO;

+	  return CL_EUNLINK;

         }

 	free(tempfile);

 	return CL_BREAK;

@@ -797,10 +797,10 @@ static int handler_otf(int fd, ole2_header_t *hdr, property_t *prop, const char

 	cli_bitset_free(blk_bitset);

 	if (cli_unlink(tempfile)) {

 	  free(tempfile);

-	  return CL_EIO;

+	  return CL_EUNLINK;

         }

 	free(tempfile);

-	return CL_EIO;

+	return CL_EWRITE;

       }

       current_block = ole2_get_next_block_number(fd, hdr, current_block);

@@ -816,7 +816,7 @@ static int handler_otf(int fd, ole2_header_t *hdr, property_t *prop, const char

   if(ctx && !ctx->engine->keeptmp) {

     if (cli_unlink(tempfile)) {

       free(tempfile);

-      return CL_EIO;

+      return CL_EUNLINK;

     }

   }

   free(tempfile);

@@ -958,13 +958,13 @@ int cli_ole2_extract(int fd, const char *dirname, cli_ctx *ctx, struct uniq **vb

 	hdr.bitset = cli_bitset_init();

 	if (!hdr.bitset) {

-		ret=CL_EOLE2;

+		ret=CL_EMEM;

 		goto abort;

 	}

 	if (memcmp(hdr.magic, magic_id, 8) != 0) {

 		cli_dbgmsg("OLE2 magic failed!\n");

-		ret=CL_EOLE2;

+		ret=CL_EFORMAT;

 		goto abort;

 	}

@@ -139,58 +139,49 @@ unsigned int cl_retflevel(void)

 const char *cl_strerror(int clerror)

 {

     switch(clerror) {

+	/* libclamav specific codes */

 	case CL_CLEAN:

 	    return "No viruses detected";

 	case CL_VIRUS:

 	    return "Virus(es) detected";

-	case CL_EMAXREC:

-	    return "Recursion limit exceeded";

-	case CL_EMAXSIZE:

-	    return "File size limit exceeded";

-	case CL_EMAXFILES:

-	    return "Files number limit exceeded";

-	case CL_ERAR:

-	    return "RAR module failure";

-	case CL_EZIP:

-	    return "Zip module failure";

-	case CL_EGZIP:

-	    return "GZip module failure";

-	case CL_EMSCOMP:

-	    return "MS Expand module failure";

-	case CL_EMSCAB:

-	    return "MS CAB module failure";

-	case CL_EOLE2:

-	    return "OLE2 module failure";

-	case CL_ETMPFILE:

-	    return "Unable to create temporary file";

-	case CL_ETMPDIR:

-	    return "Unable to create temporary directory";

-	case CL_EMEM:

-	    return "Unable to allocate memory";

-	case CL_EOPEN:

-	    return "Unable to open file or directory";

+	case CL_ENULLARG:

+	    return "Null argument passed to function";

 	case CL_EMALFDB:

 	    return "Malformed database";

-	case CL_EPATSHORT:

-	    return "Too short pattern detected";

 	case CL_ECVD:

 	    return "Broken or not a CVD file";

-	case CL_ECVDEXTR:

-	    return "CVD extraction failure";

-	case CL_EMD5:

-	    return "MD5 verification error";

-	case CL_EDSIG:

-	    return "Digital signature verification error";

-	case CL_ENULLARG:

-	    return "Null argument passed while initialized is required";

-	case CL_EIO:

-	    return "Input/Output error";

-	case CL_EFORMAT:

-	    return "Bad format or broken data";

-	case CL_ESUPPORT:

-	    return "Not supported data format";

-	case CL_EARJ:

-	    return "ARJ module failure";

+	case CL_EVERIFY:

+	    return "Can't verify database integrity";

+	case CL_EUNPACK:

+	    return "Can't unpack some data";

+

+	/* I/O and memory errors */

+	case CL_EOPEN:

+	    return "Can't open file or directory";

+	case CL_ECREAT:

+	    return "Can't create new file";

+	case CL_EUNLINK:

+	    return "Can't unlink file";

+	case CL_ESTAT:

+	    return "Can't get file status";

+	case CL_EREAD:

+	    return "Can't read file";

+	case CL_ESEEK:

+	    return "Can't set file offset";

+	case CL_EWRITE:

+	    return "Can't write to file";

+	case CL_EDUP:

+	    return "Can't duplicate file descriptor";

+	case CL_EACCES:

+	    return "Can't access file";

+	case CL_ETMPFILE:

+	    return "Can't create temporary file";

+	case CL_ETMPDIR:

+	    return "Can't create temporary directory";

+	case CL_EMAP:

+	    return "Can't map file into memory";

+	case CL_EMEM:

+	    return "Can't allocate memory";

 	default:

 	    return "Unknown error code";

     }

@@ -599,7 +590,7 @@ int cli_gentempfd(const char *dir, char **name, int *fd)

    if(*fd == -1) {

 	cli_errmsg("cli_gentempfd: Can't create temporary file %s: %s\n", *name, strerror(errno));

 	free(*name);

-	return CL_EIO;

+	return CL_ECREAT;

     }

     return CL_SUCCESS;

@@ -108,7 +108,7 @@ cli_pdf(const char *dir, int desc, cli_ctx *ctx, off_t offset)

 	p = buf = mmap(NULL, size, PROT_READ, MAP_PRIVATE, desc, offset);

 	if(buf == MAP_FAILED) {

 		cli_errmsg("cli_pdf: mmap() failed\n");

-		return CL_EMEM;

+		return CL_EMAP;

 	}

 	cli_dbgmsg("cli_pdf: scanning %lu bytes\n", (unsigned long)size);

@@ -417,7 +417,7 @@ cli_pdf(const char *dir, int desc, cli_ctx *ctx, off_t offset)

 			close(fout);

 			cli_dbgmsg("cli_pdf: Empty stream\n");

 			if (cli_unlink(fullname)) {

-				rc = CL_EIO;

+				rc = CL_EUNLINK;

 				break;

 			}

 			continue;

@@ -448,7 +448,7 @@ cli_pdf(const char *dir, int desc, cli_ctx *ctx, off_t offset)

 			if(ret != CL_CLEAN) {

 				close(fout);

 				if (cli_unlink(fullname)) {

-					rc = CL_EIO;

+					rc = CL_EUNLINK;

 					break;

 				}

 				continue;

@@ -459,7 +459,7 @@ cli_pdf(const char *dir, int desc, cli_ctx *ctx, off_t offset)

 			if(tmpbuf == NULL) {

 				close(fout);