Moved to new module init structure.

[citadel.git] / citadel / mime_parser.c

diff --git a/citadel/mime_parser.c b/citadel/mime_parser.c
index 8e6912d39cbe17fdaf1368d0916184840cf70a54..f7b9681a0ad9e40bf62307ea94b513dc7a335cad 100644 (file)
--- a/citadel/mime_parser.c
+++ b/citadel/mime_parser.c
@@ -20,7 +20,6 @@
 
 #include "citadel.h"
 #include "server.h"
-#include "serv_extensions.h"
 #include "sysdep_decls.h"
 #include "tools.h"
 
@@ -66,48 +65,34 @@ char *fixed_partnum(char *supplied_partnum) {
  */
 int CtdlDecodeQuotedPrintable(char *decoded, char *encoded, int sourcelen) {
        unsigned int ch;
-       int destpos = 1;
-       int sourcepos = 1;
-       int ignore_last = 0;
-       char *check;
-
-       decoded[0] = 0;
-       if (sourcelen > 0)
-               decoded[0] = encoded[0];
-       while (sourcepos <= sourcelen){
-               check = &decoded[destpos];
-               decoded[destpos] = encoded[sourcepos];
-               if ((ignore_last == 0) && (decoded[destpos-1] == '='))
+       int decoded_length = 0;
+       int pos = 0;
+
+       while (pos < sourcelen)
+       {
+               if (!strncmp(&encoded[pos], "=\r\n", 3))
                {
-                       if ((*check == '\0') || 
-                           (*check == '\n') ||  
-                           (*check == '\r'))
-                       {
-                               decoded[destpos - 1] = '\0';
-                               destpos-=2;
-                               if ((sourcepos + 1 < sourcelen) && (
-                                   (encoded[sourcepos + 1] == '\n') ||
-                                   (encoded[sourcepos + 1] == '\r')))
-                                       sourcepos ++;
-                                       
-                       }
-                       else if (sourcelen - sourcepos > 2)
-                       {
-                               sscanf(&encoded[sourcepos], "%02x", &ch);
-                               decoded[destpos - 1] = ch;
-                               sourcepos++;
-                               destpos --;
-                               ignore_last = 1;
-                       }
+                       pos += 3;
+               }
+               else if (!strncmp(&encoded[pos], "=\n", 2))
+               {
+                       pos += 2;
+               }
+               else if (encoded[pos] == '=')
+               {
+                       ch = 0;
+                       sscanf(&encoded[pos+1], "%02x", &ch);
+                       pos += 3;
+                       decoded[decoded_length++] = ch;
+               }
+               else
+               {
+                       decoded[decoded_length++] = encoded[pos];
+                       pos += 1;
                }
-               else 
-                       ignore_last = 0;
-               destpos ++;
-               sourcepos ++;
        }
-
-       decoded[destpos] = 0;
-       return(destpos - 1);
+       decoded[decoded_length] = 0;
+       return(decoded_length);
 }
 
 
@@ -281,7 +266,9 @@ void the_mime_parser(char *partnum,
        int part_seq = 0;
        int i;
        size_t length;
-       char nested_partnum[SIZ];
+       char nested_partnum[256];
+       int crlf_in_use = 0;
+       char *evaluate_crlf_ptr = NULL;
 
        ptr = content_start;
        content_length = 0;
@@ -339,8 +326,9 @@ void the_mime_parser(char *partnum,
                }
 
                if (!isspace(buf[0])) {
-                       if (!strncasecmp(header, "Content-type: ", 14)) {
-                               strcpy(content_type, &header[14]);
+                       if (!strncasecmp(header, "Content-type:", 13)) {
+                               strcpy(content_type, &header[13]);
+                               striplt(content_type);
                                extract_key(content_type_name, content_type, "name");
                                extract_key(charset, content_type, "charset");
                                /* Deal with weird headers */
@@ -349,23 +337,29 @@ void the_mime_parser(char *partnum,
                                if (strchr(content_type, ';'))
                                        *(strchr(content_type, ';')) = '\0';
                        }
-                       if (!strncasecmp(header, "Content-Disposition: ", 21)) {
-                               strcpy(disposition, &header[21]);
+                       if (!strncasecmp(header, "Content-Disposition:", 20)) {
+                               strcpy(disposition, &header[20]);
+                               striplt(disposition);
                                extract_key(content_disposition_name, disposition, "name");
                                extract_key(filename, disposition, "filename");
                        }
-                       if (!strncasecmp(header, "Content-length: ", 16)) {
-                               content_length = (size_t) atol(&header[16]);
+                       if (!strncasecmp(header, "Content-length: ", 15)) {
+                               char clbuf[10];
+                               safestrncpy(clbuf, &header[15], sizeof clbuf);
+                               striplt(clbuf);
+                               content_length = (size_t) atol(clbuf);
+                       }
+                       if (!strncasecmp(header, "Content-transfer-encoding: ", 26)) {
+                               strcpy(encoding, &header[26]);
+                               striplt(encoding);
                        }
-                       if (!strncasecmp(header,
-                                     "Content-transfer-encoding: ", 27))
-                               strcpy(encoding, &header[27]);
                        if (strlen(boundary) == 0)
                                extract_key(boundary, header, "boundary");
                        strcpy(header, "");
                }
-               if ((strlen(header) + strlen(buf) + 2) < SIZ)
+               if ((strlen(header) + strlen(buf) + 2) < SIZ) {
                        strcat(header, buf);
+               }
        } while ((strlen(buf) > 0) && (*ptr != 0));
 
        if (strchr(disposition, ';'))
@@ -409,7 +403,10 @@ void the_mime_parser(char *partnum,
 
                        if ( (part_start != NULL) && (next_boundary != NULL) ) {
                                part_end = next_boundary;
-                               --part_end;
+                               --part_end;             /* omit the trailing LF */
+                               if (crlf_in_use) {
+                                       --part_end;     /* omit the trailing CR */
+                               }
 
                                if (strlen(partnum) > 0) {
                                        snprintf(nested_partnum,
@@ -440,6 +437,18 @@ void the_mime_parser(char *partnum,
                                else {
                                        /* Set up for the next part. */
                                        part_start = strstr(next_boundary, "\n");
+                                       
+                                       /* Determine whether newlines are LF or CRLF */
+                                       evaluate_crlf_ptr = part_start;
+                                       --evaluate_crlf_ptr;
+                                       if (!memcmp(evaluate_crlf_ptr, "\r\n", 2)) {
+                                               crlf_in_use = 1;
+                                       }
+                                       else {
+                                               crlf_in_use = 0;
+                                       }
+
+                                       /* Advance past the LF ... now we're in the next part */
                                        ++part_start;
                                        ptr = part_start;
                                }
@@ -466,9 +475,14 @@ void the_mime_parser(char *partnum,
                        ++length;
                }
                part_end = content_end;
-               /* fix an off-by-one error */
+
+               /******
+                * I thought there was an off-by-one error here, but there isn't.
+                * This probably means that there's an off-by-one error somewhere
+                * else ... or maybe only in certain messages?
                --part_end;
                --length;
+               ******/
                
                /* Truncate if the header told us to */
                if ( (content_length > 0) && (length > content_length) ) {