[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit b99bfadf3ac46ace4470189764c277739847b70e
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:52 2008 +0100

    Revert "some messages were being printed twice (bb#884)"
    
    This reverts commit d8aeca746a7120ed755dc687a43272810aa4acd4.

diff --git a/ChangeLog b/ChangeLog
index 6c9330a..06ae3ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-Thu Mar 20 12:16:13 CET 2008 (tk)
----------------------------------
-  * clamdscan/client.c: some messages were being printed twice (bb#884)
-
 Tue Mar 18 23:55:49 EET 2008 (edwin)
 ------------------------------------
   * libclamav/scanners.c: debug message for html tempfiles
diff --git a/clamdscan/client.c b/clamdscan/client.c
index d8b696e..879cab6 100644
--- a/clamdscan/client.c
+++ b/clamdscan/client.c
@@ -81,18 +81,20 @@ static int dsresult(int sockd, const struct optstruct *opt)
 		    *pt = 0;
 		    move_infected(buff, opt);
 		} else {
-		    logg("!Incorrect output from clamd. File not %s.\n", opt_check(opt, "move") ? "moved" : "copied");
+		    mprintf("@Broken data format. File not %s.\n", opt_check(opt, "move") ? "moved" : "copied");
 		}
 
 	    } else if(opt_check(opt, "remove")) {
 		if(!(pt = strrchr(buff, ':'))) {
-		    logg("!Incorrect output from clamd. File not removed.\n");
+		    mprintf("@Broken data format. File not removed.\n");
 		} else {
 		    *pt = 0;
 		    if(unlink(buff)) {
-			logg("!%s: Can't remove.\n", buff);
+			mprintf("~%s: Can't remove.\n", buff);
+			logg("~%s: Can't remove.\n", buff);
 			notremoved++;
 		    } else {
+			mprintf("~%s: Removed.\n", buff);
 			logg("~%s: Removed.\n", buff);
 		    }
 		}
@@ -100,7 +102,7 @@ static int dsresult(int sockd, const struct optstruct *opt)
 	}
 
 	if(strstr(buff, "ERROR\n")) {
-	    logg("~%s", buff);
+	    logg("%s", buff);
 	    waserror = 1;
 	}
     }
@@ -194,7 +196,7 @@ static int dsstream(int sockd, const struct optstruct *opt)
 	    server.sin_addr.s_addr = peer.sin_addr.s_addr;
 	    break;
 	default:
-	    logg("^Unexpected socket type: %d.\n", peer.sin_family);
+	    mprintf("^Unexpected socket type: %d.\n", peer.sin_family);
 	    return -1;
     }
 

-- 
Debian repository for ClamAV