From: Andreas Metzler <ametzler@downhill.at.eu.org>
Date: Sun, 7 Jun 2015 14:16:35 +0000 (+0100)
Subject: Content scan: Use ETIMEDOUT not ETIME, as having better portability.  Bug 1640
X-Git-Tag: exim-4_86_RC2~10
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/80591636e0439c7bc83b1fb322fd110b397f4217

Content scan: Use ETIMEDOUT not ETIME, as having better portability.  Bug 1640
---

diff --git a/src/src/malware.c b/src/src/malware.c
index 17a652a90..141c6ea16 100644
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -879,7 +879,7 @@ if (!malware_ok)
 
 	for (;;)
 	  {
-	  errno = ETIME;
+	  errno = ETIMEDOUT;
 	  i =  av_buffer+sizeof(av_buffer)-p;
 	  if ((bread= ip_recv(sock, p, i-1, tmo-time(NULL))) < 0)
 	    return m_errlog_defer_3(scanent,
@@ -1212,7 +1212,7 @@ if (!malware_ok)
 * WITH_OLD_CLAMAV_STREAM is defined.
 * See Exim bug 926 for details.  */
 
-      uschar *p, *vname, *result_tag, *response_end;
+      uschar *p, *vname, *result_tag;
       int bread=0;
       uschar * file_name;
       uschar av_buffer[1024];
@@ -1614,10 +1614,9 @@ if (!malware_ok)
       while (isspace(*--p) && (p > av_buffer))
 	*p = '\0';
       if (*p) ++p;
-      response_end = p;
 
       /* colon in returned output? */
-      if((p = Ustrchr(av_buffer,':')) == NULL)
+      if(!(p = Ustrchr(av_buffer,':')))
 	return m_errlog_defer(scanent, string_sprintf(
 		  "ClamAV returned malformed result (missing colon): %s",
 		  av_buffer));