Add TRUSTED_CONFIG_PREFIX_FILE option

[exim.git] / src / src / mime.c

diff --git a/src/src/mime.c b/src/src/mime.c
index ca560d447075f5b1014d2e6453beadcac8cccc70..76783455a8843f174cfd97435950c34f739c392f 100644 (file)
--- a/src/src/mime.c
+++ b/src/src/mime.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/mime.c,v 1.16 2009/11/06 13:29:47 nm4 Exp $ */
+/* $Cambridge: exim/src/src/mime.c,v 1.19 2009/11/11 10:08:02 nm4 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -106,7 +106,7 @@ static int mime_decode_base64(FILE* in, FILE* out, uschar* boundary)
 
   opos = obuf;
 
-  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 @@ static int mime_decode_base64(FILE* in, FILE* out, uschar* boundary)
         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;
     }
@@ -341,7 +341,7 @@ int mime_decode(uschar **listptr) {
   clearerr(mime_stream);
   fseek(mime_stream, f_pos, SEEK_SET);
 
-  if (size_counter < 0 || fclose(decode_file) != 0)
+  if (fclose(decode_file) != 0 || size_counter < 0)
     return DEFER;
 
   /* round up to the next KiB */