X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=unmime.c;h=070d7945aee16f0c4cad27e53e3cd66fb6dfb02f;hb=a23a8cf8ee1da51c4392b9f52e6b72b0c01e3b5e;hp=67028e770494542f1c8638020ed0f7c149ec03cc;hpb=28efe765578c7bf75fea29c6d827b1925a0b3525;p=~andy%2Ffetchmail

diff --git a/unmime.c b/unmime.c
index 67028e77..070d7945 100644
--- a/unmime.c
+++ b/unmime.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include "fetchmail.h"
-#include "i18n.h"
+#include "gettext.h"
 
 static unsigned char unhex(unsigned char c)
 {
@@ -292,7 +292,7 @@ static char *GetBoundary(char *CntType)
   do {
     p2 = strchr(p1, ';'); 
     if (p2)
-      for (p2++; isspace((unsigned char)*p2); p2++);
+      for (p2++; isspace((unsigned char)*p2); p2++) { }
 
     p1 = p2;
   } while ((p1) && (strncasecmp(p1, "boundary", 8) != 0));
@@ -418,7 +418,7 @@ int MimeBodyType(char *hdrs, int WantDecode)
 	     */
 
 	    /* Skip the "Content-Type:" part and whitespace after it */
-	    for (NxtHdr += 13; ((*NxtHdr == ' ') || (*NxtHdr == '\t')); NxtHdr++);
+	    for (NxtHdr += 13; ((*NxtHdr == ' ') || (*NxtHdr == '\t')); NxtHdr++) { }
 
 	    /* 
 	     * Get the full value of the Content-Type header;
@@ -459,7 +459,7 @@ int MimeBodyType(char *hdrs, int WantDecode)
 
 	/* Check Content-Type to see if this is a multipart message */
 	if ( (CntType != NULL) &&
-		((strncasecmp(CntType, "multipart/mixed", 16) == 0) ||
+		((strncasecmp(CntType, "multipart/mixed", 15) == 0) ||
 		 (strncasecmp(CntType, "message/", 8) == 0)) ) {
 
 	    char *p1 = GetBoundary(CntType);
@@ -469,7 +469,6 @@ int MimeBodyType(char *hdrs, int WantDecode)
 		   the boundary string */
 		strcpy(MultipartDelimiter, "--");
 		strlcat(MultipartDelimiter, p1, sizeof(MultipartDelimiter));
-		MultipartDelimiter[sizeof(MultipartDelimiter)-1] = '\0';
 		BodyType = (MSG_IS_8BIT | MSG_NEEDS_DECODE);
 	    }
 	}