[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Tomasz Kojm]

The following commit has been merged in the debian/unstable branch:
commit 4aa1842a1c9fd09cb2988dd1ef7b00447224822a
Author: Tomasz Kojm <tkojm at clamav.net>
Date:   Mon Aug 3 15:23:35 2009 +0200

    freshclam/manager.c: fix confusing error message (bb#1648)

diff --git a/ChangeLog b/ChangeLog
index 396cfd7..66a68c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Aug  3 15:22:42 CEST 2009 (tk)
+----------------------------------
+ * freshclam/manager.c: fix confusing error message (bb#1648)
+
 Mon Aug  3 14:48:27 CEST 2009 (tk)
 ----------------------------------
  * libclamav/unzip.c: fix detection of encrypted zip files embedded into
diff --git a/freshclam/manager.c b/freshclam/manager.c
index b4177da..d89f675 100644
--- a/freshclam/manager.c
+++ b/freshclam/manager.c
@@ -1066,7 +1066,7 @@ static int getfile(const char *srcfile, const char *destfile, const char *hostna
 #else
 	if((i >= sizeof(buffer) - 1) || recv(sd, buffer + i, 1, 0) == -1) {
 #endif
-	    logg("%cgetfile: Error while reading database from %s (IP: %s)\n", logerr ? '!' : '^', hostname, ipaddr);
+	    logg("%cgetfile: Error while reading database from %s (IP: %s): %s\n", logerr ? '!' : '^', hostname, ipaddr, strerror(errno));
 	    mirman_update(mdat->currip, mdat->af, mdat, 1);
 	    closesocket(sd);
 	    return 52;
@@ -1156,6 +1156,12 @@ static int getfile(const char *srcfile, const char *destfile, const char *hostna
     closesocket(sd);
     close(fd);
 
+    if(bread == -1) {
+	logg("%cgetfile: Download interrupted: %s (IP: %s)\n", logerr ? '!' : '^', strerror(errno), ipaddr);
+	mirman_update(mdat->currip, mdat->af, mdat, 1);
+	return 52;
+    }
+
     if(totalsize > 0)
         logg("Downloading %s [%i%%]\n", srcfile, percentage);
     else

-- 
Debian repository for ClamAV