Merge branch 'master' into exeicons

ChangeLog

@@ -1,3 +1,11 @@
+Fri Dec  4 15:55:51 CET 2009 (tk)
+---------------------------------
+ * freshclam/manager.c: improve handling of problematic mirrors (bb#1758)
+
+Fri Dec  4 14:19:23 CET 2009 (tk)
+---------------------------------
+ * clamscan: properly describe --include/exclude (bb#1765)
+
 Wed Dec  2 23:17:27 CET 2009 (tk)
 ---------------------------------
  * libclamav/qsort.c: fix CMP1 macro (bb#1769)

clamscan/clamscan.c

@@ -209,17 +209,10 @@ void help(void)
     mprintf("    --remove[=yes/no(*)]                 Remove infected files. Be careful!\n");
     mprintf("    --move=DIRECTORY                     Move infected files into DIRECTORY\n");
     mprintf("    --copy=DIRECTORY                     Copy infected files into DIRECTORY\n");
-#ifdef HAVE_REGEX_H
     mprintf("    --exclude=REGEX                      Don't scan file names matching REGEX\n");
     mprintf("    --exclude-dir=REGEX                  Don't scan directories matching REGEX\n");
     mprintf("    --include=REGEX                      Only scan file names matching REGEX\n");
     mprintf("    --include-dir=REGEX                  Only scan directories matching REGEX\n");
-#else
-    mprintf("    --exclude=PATT                       Don't scan file names containing PATT\n");
-    mprintf("    --exclude-dir=PATT                   Don't scan directories containing PATT\n");
-    mprintf("    --include=PATT                       Only scan file names containing PATT\n");
-    mprintf("    --include-dir=PATT                   Only scan directories containing PATT\n");
-#endif
     mprintf("\n");
     mprintf("    --detect-pua[=yes/no(*)]             Detect Possibly Unwanted Applications\n");
     mprintf("    --exclude-pua=CAT                    Skip PUA sigs of category CAT\n");

docs/man/clamscan.1.in

@@ -60,11 +60,11 @@ Sound bell on virus detection.
 \fB\-\-no\-summary\fR
 Do not display summary at the end of scanning.
 .TP 
-\fB\-\-exclude=PATT, \-\-exclude\-dir=PATT\fR
-Don't scan file/directory names containing PATT. It may be used multiple times.
+\fB\-\-exclude=REGEX, \-\-exclude\-dir=REGEX\fR
+Don't scan file/directory names matching regular expression. These options can be used multiple times.
 .TP 
-\fB\-\-include=PATT, \-\-include\-dir=PATT\fR
-Only scan file/directory names containing PATT. It may be used multiple times.
+\fB\-\-include=REGEX, \-\-include\-dir=REGEX\fR
+Only scan file/directory matching regular expression. These options can be used multiple times.
 .TP 
 \fB\-i, \-\-infected\fR
 Only print infected files.

freshclam/manager.c

@@ -1126,10 +1126,9 @@ static int getfile(const char *srcfile, const char *destfile, const char *hostna
 	    return 57; /* FIXME */
 	}
 
-        if(totalsize > 0) {
-	    totaldownloaded += bread;
+	totaldownloaded += bread;
+        if(totalsize > 0)
             percentage = (int) (100 * (float) totaldownloaded / totalsize);
-	}
 
         if(!mprintf_quiet) {
             if(totalsize > 0) {
@@ -1145,9 +1144,9 @@ static int getfile(const char *srcfile, const char *destfile, const char *hostna
     closesocket(sd);
     close(fd);
 
-    if(bread == -1) {
+    if(bread == -1 || !totaldownloaded) {
 	logg("%cgetfile: Download interrupted: %s (IP: %s)\n", logerr ? '!' : '^', strerror(errno), ipaddr);
-	mirman_update(mdat->currip, mdat->af, mdat, 1);
+	mirman_update(mdat->currip, mdat->af, mdat, 2);
 	return 52;
     }