* MSG4 (and CtdlOutputMsg() as well) now accepts an optional MIME part

[citadel.git] / citadel / mime_parser.c

diff --git a/citadel/mime_parser.c b/citadel/mime_parser.c
index fa691c37029b02ffade24adbd765b6e808e6a7ba..edbdc52cb0bc0773d17ad246128d9e7ebac32ccf 100644 (file)
--- a/citadel/mime_parser.c
+++ b/citadel/mime_parser.c
@@ -1,17 +1,13 @@
 /*
  * $Id$
  *
- * This is the MIME parser for Citadel.  Sometimes it actually works.
+ * This is the MIME parser for Citadel.
  *
- * Copyright (c) 1998-2002 by Art Cancro
+ * Copyright (c) 1998-2005 by Art Cancro
  * This code is distributed under the terms of the GNU General Public License.
  *
  */
 
-#ifdef DLL_EXPORT
-#define IN_LIBCIT
-#endif
-
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -134,7 +130,7 @@ int CtdlDecodeQuotedPrintable(char *decoded, char *encoded, int sourcelen) {
  */
 void mime_decode(char *partnum,
                 char *part_start, size_t length,
-                char *content_type, char *encoding,
+                char *content_type, char *charset, char *encoding,
                 char *disposition,
                 char *name, char *filename,
                 void (*CallBack)
@@ -144,6 +140,7 @@ void mime_decode(char *partnum,
                   char *cbdisp,
                   void *cbcontent,
                   char *cbtype,
+                  char *cbcharset,
                   size_t cblength,
                   char *cbencoding,
                   void *cbuserdata),
@@ -154,6 +151,7 @@ void mime_decode(char *partnum,
                   char *cbdisp,
                   void *cbcontent,
                   char *cbtype,
+                  char *cbcharset,
                   size_t cblength,
                   char *cbencoding,
                   void *cbuserdata),
@@ -164,6 +162,7 @@ void mime_decode(char *partnum,
                   char *cbdisp,
                   void *cbcontent,
                   char *cbtype,
+                  char *cbcharset,
                   size_t cblength,
                   char *cbencoding,
                   void *cbuserdata),
@@ -188,7 +187,7 @@ void mime_decode(char *partnum,
                if (CallBack != NULL) {
                        CallBack(name, filename, fixed_partnum(partnum),
                                disposition, part_start,
-                               content_type, length, encoding, userdata);
+                               content_type, charset, length, encoding, userdata);
                        }
                return;
        }
@@ -219,7 +218,7 @@ void mime_decode(char *partnum,
        if (bytes_decoded > 0) if (CallBack != NULL) {
                CallBack(name, filename, fixed_partnum(partnum),
                        disposition, decoded,
-                       content_type, bytes_decoded, "binary", userdata);
+                       content_type, charset, bytes_decoded, "binary", userdata);
        }
 
        free(decoded);
@@ -240,6 +239,7 @@ void the_mime_parser(char *partnum,
                       char *cbdisp,
                       void *cbcontent,
                       char *cbtype,
+                      char *cbcharset,
                       size_t cblength,
                       char *cbencoding,
                       void *cbuserdata),
@@ -250,6 +250,7 @@ void the_mime_parser(char *partnum,
                       char *cbdisp,
                       void *cbcontent,
                       char *cbtype,
+                      char *cbcharset,
                       size_t cblength,
                       char *cbencoding,
                       void *cbuserdata),
@@ -260,6 +261,7 @@ void the_mime_parser(char *partnum,
                       char *cbdisp,
                       void *cbcontent,
                       char *cbtype,
+                      char *cbcharset,
                       size_t cblength,
                       char *cbencoding,
                       void *cbuserdata),
@@ -269,14 +271,17 @@ void the_mime_parser(char *partnum,
 {
 
        char *ptr;
+       char *srch = NULL;
        char *part_start, *part_end = NULL;
        char buf[SIZ];
        char *header;
        char *boundary;
        char *startary;
+       size_t startary_len = 0;
        char *endary;
        char *next_boundary;
        char *content_type;
+       char *charset;
        size_t content_length;
        char *encoding;
        char *disposition;
@@ -308,6 +313,9 @@ void the_mime_parser(char *partnum,
        content_type = malloc(SIZ);
        memset(content_type, 0, SIZ);
 
+       charset = malloc(SIZ);
+       memset(charset, 0, SIZ);
+
        encoding = malloc(SIZ);
        memset(encoding, 0, SIZ);
 
@@ -336,13 +344,17 @@ void the_mime_parser(char *partnum,
                        goto end_parser;
                }
 
-               for (i = 0; i < strlen(buf); ++i)
-                       if (isspace(buf[i]))
+               for (i = 0; i < strlen(buf); ++i) {
+                       if (isspace(buf[i])) {
                                buf[i] = ' ';
+                       }
+               }
+
                if (!isspace(buf[0])) {
                        if (!strncasecmp(header, "Content-type: ", 14)) {
                                strcpy(content_type, &header[14]);
                                extract_key(content_type_name, content_type, "name");
+                               extract_key(charset, content_type, "charset");
                                /* Deal with weird headers */
                                if (strchr(content_type, ' '))
                                        *(strchr(content_type, ' ')) = '\0';
@@ -388,17 +400,25 @@ void the_mime_parser(char *partnum,
                /* Tell the client about this message's multipartedness */
                if (PreMultiPartCallBack != NULL) {
                        PreMultiPartCallBack("", "", partnum, "",
-                               NULL, content_type,
+                               NULL, content_type, charset,
                                0, encoding, userdata);
                }
 
                /* Figure out where the boundaries are */
                snprintf(startary, SIZ, "--%s", boundary);
                snprintf(endary, SIZ, "--%s--", boundary);
+               startary_len = strlen(startary);
 
                part_start = NULL;
                do {
-                       next_boundary = bmstrstr(ptr, startary, strncmp);
+                       next_boundary = NULL;
+                       for (srch=ptr; srch<content_end; ++srch) {
+                               if (!memcmp(srch, startary, startary_len)) {
+                                       next_boundary = srch;
+                                       srch = content_end;
+                               }
+                       }
+
                        if ( (part_start != NULL) && (next_boundary != NULL) ) {
                                part_end = next_boundary;
                                --part_end;
@@ -424,8 +444,8 @@ void the_mime_parser(char *partnum,
                        }
 
                        if (next_boundary != NULL) {
-                               /* If we pass out of scope, don't attempt to read
-                                * past the end boundary. */
+                               /* If we pass out of scope, don't attempt to
+                                * read past the end boundary. */
                                if (!strcmp(next_boundary, endary)) {
                                        ptr = content_end;
                                }
@@ -444,7 +464,7 @@ void the_mime_parser(char *partnum,
 
                if (PostMultiPartCallBack != NULL) {
                        PostMultiPartCallBack("", "", partnum, "", NULL,
-                               content_type, 0, encoding, userdata);
+                               content_type, charset, 0, encoding, userdata);
                }
                goto end_parser;
        }
@@ -458,9 +478,9 @@ void the_mime_parser(char *partnum,
                        ++length;
                }
                part_end = content_end;
-                /* fix an off-by-one error */
-                --part_end;
-                --length;
+               /* fix an off-by-one error */
+               --part_end;
+               --length;
                
                /* Truncate if the header told us to */
                if ( (content_length > 0) && (length > content_length) ) {
@@ -477,13 +497,19 @@ void the_mime_parser(char *partnum,
                else {
                        name = content_type_name;
                }
-               
+       
+               /* lprintf(CTDL_DEBUG, "mime_decode part=%s, len=%d, type=%s, charset=%s, encoding=%s\n",
+                       partnum, length, content_type, charset, encoding); */
+
+               /* Ok, we've got a non-multipart part here, so do something with it.
+                */
                mime_decode(partnum,
-                           part_start, length,
-                           content_type, encoding, disposition,
-                           name, filename,
-                           CallBack, NULL, NULL,
-                           userdata, dont_decode);
+                       part_start, length,
+                       content_type, charset, encoding, disposition,
+                       name, filename,
+                       CallBack, NULL, NULL,
+                       userdata, dont_decode
+               );
        }
 
 end_parser:    /* free the buffers!  end the oppression!! */
@@ -492,6 +518,7 @@ end_parser: /* free the buffers!  end the oppression!! */
        free(endary);   
        free(header);
        free(content_type);
+       free(charset);
        free(encoding);
        free(content_type_name);
        free(content_disposition_name);
@@ -517,6 +544,7 @@ void mime_parser(char *content_start,
                   char *cbdisp,
                   void *cbcontent,
                   char *cbtype,
+                  char *cbcharset,
                   size_t cblength,
                   char *cbencoding,
                   void *cbuserdata),
@@ -528,6 +556,7 @@ void mime_parser(char *content_start,
                   char *cbdisp,
                   void *cbcontent,
                   char *cbtype,
+                  char *cbcharset,
                   size_t cblength,
                   char *cbencoding,
                   void *cbuserdata),
@@ -539,6 +568,7 @@ void mime_parser(char *content_start,
                   char *cbdisp,
                   void *cbcontent,
                   char *cbtype,
+                  char *cbcharset,
                   size_t cblength,
                   char *cbencoding,
                   void *cbuserdata),