libclamav: fix some error messages (bb#2083)

ChangeLog

@@ -1,3 +1,7 @@
+Mon Jul  5 17:30:11 CEST 2010 (tk)
+----------------------------------
+ * libclamav: fix some error messages (bb#2083)
+
 Thu Jul  1 18:22:58 CEST 2010 (tk)
 ----------------------------------
  * libclamav/matcher.c: fix counting of logical subsigs matched at boundaries (bb#2053)

libclamav/mspack.c

@@ -1961,7 +1961,7 @@ int qtm_decompress(struct qtm_stream *qtm, off_t out_bytes) {
 
   } /* while (more bytes needed) */
 
-  if (out_bytes) {
+  if (out_bytes > 0) {
     i = (int) out_bytes;
     if (qtm->wflag && (ret = mspack_write(qtm->ofd, qtm->o_ptr, i, qtm->file)) != CL_SUCCESS) {
       return qtm->error = ret;

libclamav/scanners.c

@@ -750,7 +750,7 @@ static int cli_scanmscab(int desc, cli_ctx *ctx, off_t sfx_offset)
 	    ctx->corrupted_input = corrupted_input;
 	}
 	if(!ctx->engine->keeptmp) {
-	    if (cli_unlink(tempname)) {
+	    if (!access(tempname, R_OK) && cli_unlink(tempname)) {
 	    	free(tempname);
 		ret = CL_EUNLINK;
 		break;

libclamav/vba_extract.c

@@ -290,7 +290,7 @@ cli_vba_readdir(const char *dir, struct uniq *U, uint32_t which)
 	j = vba_read_project_strings(fd, FALSE);
 	if(!i && !j) {
 		close(fd);
-		cli_warnmsg("vba_readdir: Unable to guess VBA type\n");
+		cli_dbgmsg("vba_readdir: Unable to guess VBA type\n");
 		return NULL;
 	}
 	if (i > j) {