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 17a652a901ced6dce45cd5fff79c51f1ecea7655..141c6ea16c20e92f4f6722b83c01dc73a3c72768 100644 (file)
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -879,7 +879,7 @@ if (!malware_ok)
 
        for (;;)
          {
 
        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,
          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.  */
 
 * 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];
       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;
       while (isspace(*--p) && (p > av_buffer))
        *p = '\0';
       if (*p) ++p;

-      response_end = p;

 
       /* colon in returned output? */
 
       /* 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));
        return m_errlog_defer(scanent, string_sprintf(
                  "ClamAV returned malformed result (missing colon): %s",
                  av_buffer));