* mime_parser.c: handle multipart *much* more efficiently now. Instead

  of scanning line by line, we snag the boundaries using the Boyer-Moore
  algorithm.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 0be03cebe929742426ceb92025459d0bf56fa0fa..09e6189434d7f26d67bbf8f255052c325daaedbc 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,9 @@
  $Log$
+ Revision 611.5  2003/11/13 04:25:38  ajc
+ * mime_parser.c: handle multipart *much* more efficiently now.  Instead
+   of scanning line by line, we snag the boundaries using the Boyer-Moore
+   algorithm.
+
  Revision 611.4  2003/11/12 04:28:22  ajc
  * Replaced bmstrcasestr() with a more generic function, bmstrstr(), which
    can be supplied with *any* strncmp()-compatible compare function.
@@ -5073,3 +5078,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
+

diff --git a/citadel/mime_parser.c b/citadel/mime_parser.c
index ff206dbcd8c9c2371c0b3b690cae938f9e401be6..c77e1cd61c857ddb5481cd1362417ea593e85da8 100644 (file)
--- a/citadel/mime_parser.c
+++ b/citadel/mime_parser.c
@@ -275,6 +275,7 @@ void the_mime_parser(char *partnum,
        char *boundary;
        char *startary;
        char *endary;
+       char *next_boundary;
        char *content_type;
        size_t content_length;
        char *encoding;
@@ -394,46 +395,53 @@ void the_mime_parser(char *partnum,
                /* Figure out where the boundaries are */
                snprintf(startary, SIZ, "--%s", boundary);
                snprintf(endary, SIZ, "--%s--", boundary);
+
+               part_start = NULL;
                do {
-                       if ( (!strncasecmp(ptr, startary, strlen(startary)))
-                          || (!strncasecmp(ptr, endary, strlen(endary))) ) {
-                               if (part_start != NULL) {
-                                       if (strlen(partnum) > 0) {
-                                               snprintf(nested_partnum,
-                                                        sizeof nested_partnum,
-                                                        "%s.%d", partnum,
-                                                        ++part_seq);
-                                       }
-                                       else {
-                                               snprintf(nested_partnum,
-                                                        sizeof nested_partnum,
-                                                        "%d", ++part_seq);
-                                       }
-                                       the_mime_parser(nested_partnum,
-                                                   part_start, part_end,
-                                                       CallBack,
-                                                       PreMultiPartCallBack,
-                                                       PostMultiPartCallBack,
-                                                       userdata,
-                                                       dont_decode);
+                       next_boundary = bmstrstr(ptr, startary, strncmp);
+                       if ( (part_start != NULL) && (next_boundary != NULL) ) {
+                               part_end = next_boundary;
+                               --part_end;
+
+                               if (strlen(partnum) > 0) {
+                                       snprintf(nested_partnum,
+                                                sizeof nested_partnum,
+                                                "%s.%d", partnum,
+                                                ++part_seq);
                                }
-                               ptr = memreadline(ptr, buf, SIZ);
-                               part_start = ptr;
-                       }
-                       else {
-                               part_end = ptr;
-                               ++ptr;
+                               else {
+                                       snprintf(nested_partnum,
+                                                sizeof nested_partnum,
+                                                "%d", ++part_seq);
+                               }
+                               the_mime_parser(nested_partnum,
+                                           part_start, part_end,
+                                               CallBack,
+                                               PreMultiPartCallBack,
+                                               PostMultiPartCallBack,
+                                               userdata,
+                                               dont_decode);
                        }
-                       /* If we pass out of scope in the MIME multipart (by
-                        * hitting the end boundary), force the pointer out
-                        * of scope so this loop ends.
-                        */
-                       if (ptr < content_end) {
-                               if (!strcasecmp(ptr, endary)) {
-                                       ptr = content_end++;
+
+                       if (next_boundary != NULL) {
+                               /* If we pass out of scope, don't attempt to read
+                                * past the end boundary. */
+                               if (!strcmp(next_boundary, endary)) {
+                                       ptr = content_end;
                                }
+                               else {
+                                       /* Set up for the next part. */
+                                       part_start = strstr(next_boundary, "\n");
+                                       ++part_start;
+                                       ptr = part_start;
+                               }
+                       }
+                       else {
+                               /* Invalid end of multipart.  Bail out! */
+                               ptr = content_end;
                        }
-               } while (ptr <= content_end);
+               } while ( (ptr < content_end) && (next_boundary != NULL) );
+
                if (PostMultiPartCallBack != NULL) {
                        PostMultiPartCallBack("", "", partnum, "", NULL,
                                content_type, 0, encoding, userdata);