cleanup

git-svn: trunk@894

clamav-devel/ChangeLog

@@ -1,3 +1,7 @@
+Sat Sep 18 02:09:52 CEST 2004 (tk)
+----------------------------------
+  * libclamav/scanners.c: honour return code of cli_mbox
+
 Sat Sep 18 01:13:21 CEST 2004 (tk)
 ----------------------------------
   * libclamav: add support for new signature format (*.ndb; not yet documented)

clamav-devel/etc/freshclam.conf

@@ -24,6 +24,9 @@
 # for facility names. Default is LOG_LOCAL6.
 #LogFacility LOG_MAIL
 
+# This option allows you to save the process identifier of the daemon
+#PidFile /var/run/freshclam.pid
+
 # By default when freshclam is started by root it drops privileges and
 # switches to the "clamav" user. You can change this behaviour here.
 #DatabaseOwner clamav

clamav-devel/libclamav/matcher.c

@@ -104,8 +104,10 @@ static long int cli_caloff(const char *offstr, int fd)
 	    return -1;
 	}
 	lseek(fd, 0, SEEK_SET);
-	if(cli_peheader(fd, &peinfo))
+	if(cli_peheader(fd, &peinfo)) {
+	    lseek(fd, n, SEEK_SET);
 	    return -1;
+	}
 	free(peinfo.section);
 	lseek(fd, n, SEEK_SET);
 	return peinfo.ep + atoi(offstr + 3);
@@ -115,8 +117,10 @@ static long int cli_caloff(const char *offstr, int fd)
 	    return -1;
 	}
 	lseek(fd, 0, SEEK_SET);
-	if(cli_peheader(fd, &peinfo))
+	if(cli_peheader(fd, &peinfo)) {
+	    lseek(fd, n, SEEK_SET);
 	    return -1;
+	}
 	lseek(fd, n, SEEK_SET);
 
 	if(sscanf(offstr, "S%d+%ld", &n, &offset) != 2)
@@ -235,7 +239,6 @@ int cli_scandesc(int desc, const char **virname, long int *scanned, const struct
 	    free(buffer);
 	    free(partcnt);
 	    free(partoff);
-
 	    return CL_VIRUS;
 
 	} else if(otfrec && ret >= CL_TYPENO) {

clamav-devel/libclamav/scanners.c

@@ -1087,6 +1087,7 @@ static int cli_scanscrenc(int desc, const char **virname, long int *scanned, con
     free(tempname);
     return ret;
 }
+
 static int cli_scanmail(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)
 {
 	const char *tmpdir;
@@ -1113,8 +1114,8 @@ static int cli_scanmail(int desc, const char **virname, long int *scanned, const
 	/*
 	 * Extract the attachments into the temporary directory
 	 */
-	ret = cli_mbox(dir, desc, options);
-	/* FIXME: check mbox return code */
+	if((ret = cli_mbox(dir, desc, options)))
+	    return ret;
 
 	ret = cli_scandir(dir, virname, scanned, root, limits, options, arec, mrec);