Bumped version numbers to 8.11 for upcoming release

[citadel.git] / libcitadel / lib / mime_parser.c

diff --git a/libcitadel/lib/mime_parser.c b/libcitadel/lib/mime_parser.c
index f2aec777ab1b41774aed4cc5ed946fed9197ab79..11f2a27cfb9b3a1938ea7dd87a8742e5ef4fc99a 100644 (file)
--- a/libcitadel/lib/mime_parser.c
+++ b/libcitadel/lib/mime_parser.c
@@ -2,8 +2,20 @@
  * This is the MIME parser for Citadel.
  *
  * Copyright (c) 1998-2010 by the citadel.org development team.
- * This code is distributed under the GNU General Public License v3.
  *
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include <stdlib.h>
@@ -614,16 +626,14 @@ static void recurseable_mime_parser(char *partnum,
                /* Figure out where the boundaries are */
                m->b[startary].len = snprintf(m->b[startary].Key, SIZ, "--%s", m->b[boundary].Key);
                SubMimeHeaders = InitInterestingMimes ();
-               if (*ptr == '\r')
-                       ptr ++;
-               if (*ptr == '\n')
-                       ptr ++;
+
+               while ((*ptr == '\r') || (*ptr == '\n')) ptr ++;
+
                if (strncmp(ptr, m->b[startary].Key, m->b[startary].len) == 0)
                        ptr += m->b[startary].len;
-               if (*ptr == '\r')
-                       ptr ++;
-               if (*ptr == '\n')
-                       ptr ++;
+
+               while ((*ptr == '\r') || (*ptr == '\n')) ptr ++;
+
                part_start = NULL;
                do {
                        char *optr;