Re: [exim-dev] [exim-cvs] cvs commit: exim/exim-src/src dkim…

> tom         2009/11/09 14:31:24 GMT

>   Modified files:
>     exim-src/src         dkim.c mime.c
>   Log:
>   Make SUN compiler happy. Fixes #902

>   Revision  Changes    Path
>   1.8       +1 -1      exim/exim-src/src/dkim.c
>   1.18      +1 -1      exim/exim-src/src/mime.c

--- exim-4.70/src/mime.c        2009-11-09 15:45:56 +0100
+++ exim-4.70.OK/src/mime.c     2009-11-09 16:04:59 +0100
@@ -106,7 +106,7 @@

-  while (fgets(ibuf, MIME_MAX_LINE_LENGTH, in) != NULL)
+  while (Ufgets(ibuf, MIME_MAX_LINE_LENGTH, in) != NULL)
   {
     if (boundary != NULL
       && Ustrncmp(ibuf, "--", 2) == 0
@@ -153,7 +153,7 @@
         return -1; /* error */
       size += len;
       /* copy incomplete last byte to start of obuf, where we continue */
-      if (bytestate & 3 != 0)
+      if (bytestate & (3 != 0))
         *obuf = *opos;
       opos = obuf;
     }

--- exim-4.70/src/malware.c     2009-11-05 21:58:27 +0100
+++ exim-4.70.OK/src/malware.c  2009-11-09 16:07:27 +0100
@@ -231,7 +231,7 @@
         if ( Ustrstr(buf, US"<detected type=\"") != NULL ) {
           detected = 1;
         } else if ( detected && (strhelper = Ustrstr(buf, US"<name>")) ) {
-          if (strhelper2 = (Ustrstr(buf, US"</name>"))) {
+          if ((strhelper2 = Ustrstr(buf, US"</name>")) != NULL) {
             *strhelper2 = '\0';
             Ustrcpy(malware_name_buffer, strhelper + 6);
           }