From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Tue, 18 Dec 2007 10:40:52 +0000 (+0000)
Subject: merge extra MIME parsing
X-Git-Tag: 3.0~205
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/71b70599a2cd81c13cc4326499a5d0c45358cd7d?hp=--cc

merge extra MIME parsing
---

71b70599a2cd81c13cc4326499a5d0c45358cd7d
diff --cc lib/mime.c
index 03aa94b,c8ffe31..5562c7e
--- a/lib/mime.c
+++ b/lib/mime.c
@@@ -224,9 -304,16 +306,16 @@@ static int isfinal(const char *ptr, con
  	  && !strncmp(ptr + 2, boundary, bl)
  	  && ptr[bl + 2] == '-'
  	  && ptr[bl + 3] == '-'
 -	  && iscrlf(ptr + bl + 4));
 +	  && (iscrlf(ptr + bl + 4) || *(ptr + bl + 4) == 0));
  }
  
+ /** @brief Parse a multipart MIME body
+  * @param s Start of message
+  * @param callback CAllback for each part
+  * @param boundary Boundary string
+  * @param u Passed to callback
+  * @return 0 on success, non-0 on error
+  */
  int mime_multipart(const char *s,
  		   int (*callback)(const char *s, void *u),
  		   const char *boundary,