* tiny tool for message retrieval, first draft.

[citadel.git] / webcit / mime_parser.c

diff --git a/webcit/mime_parser.c b/webcit/mime_parser.c
index ccefb2214fa536f92e3aa6b50dadb108b07f86ad..c41fb26ad5cc628092c14a0e6c9b02690a762878 100644 (file)
--- a/webcit/mime_parser.c
+++ b/webcit/mime_parser.c
@@ -17,6 +17,7 @@ void extract_key(char *target, char *source, char *key)
 {
        char *ptr;
        char looking_for[256];
+       int double_quotes = 0;
 
        snprintf(looking_for, sizeof looking_for, "%s=", key);
 
@@ -28,8 +29,21 @@ void extract_key(char *target, char *source, char *key)
        strcpy(target, (ptr + strlen(looking_for)));
 
        for (ptr=target; (*ptr != 0); ++ptr) {
+
+               /* A semicolon means we've hit the end of the key, unless we're inside double quotes */
+               if ( (double_quotes != 1) && (*ptr == ';')) {
+                       *ptr = 0;
+               }
+
+               /* if we find double quotes, we've got a great set of string boundaries */
                if (*ptr == '\"') {
-                       strcpy(ptr, ptr+1);
+                       ++double_quotes;
+                       if (double_quotes == 1) {
+                               strcpy(ptr, ptr+1);
+                       }
+                       else {
+                               *ptr = 0;
+                       }
                }
        }
 }
@@ -41,49 +55,12 @@ void extract_key(char *target, char *source, char *key)
  */
 char *fixed_partnum(char *supplied_partnum) {
        if (supplied_partnum == NULL) return "1";
-       if (IsEmptyStr(supplied_partnum)) return "1";
+       if (strlen(supplied_partnum)==0) return "1";
        return supplied_partnum;
 }
 
 
 
-/*
- * Convert "quoted-printable" to binary.  Returns number of bytes decoded.
- * according to RFC2045 section 6.7
- */
-int CtdlDecodeQuotedPrintable(char *decoded, char *encoded, int sourcelen) {
-       unsigned int ch;
-       int decoded_length = 0;
-       int pos = 0;
-
-       while (pos < sourcelen)
-       {
-               if (!strncmp(&encoded[pos], "=\r\n", 3))
-               {
-                       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;
-               }
-       }
-       decoded[decoded_length] = 0;
-       return(decoded_length);
-}
-
-
 /*
  * Given a message or message-part body and a length, handle any necessary
  * decoding and pass the request up the stack.
@@ -143,7 +120,7 @@ void mime_decode(char *partnum,
                strcpy(encoding, "");
 
        /* If this part is not encoded, send as-is */
-       if ( (IsEmptyStr(encoding)) || (dont_decode)) {
+       if ( (strlen(encoding) == 0) || (dont_decode)) {
                if (CallBack != NULL) {
                        CallBack(name, filename, fixed_partnum(partnum),
                                disposition, part_start,
@@ -257,6 +234,8 @@ void the_mime_parser(char *partnum,
        char nested_partnum[256];
        int crlf_in_use = 0;
        char *evaluate_crlf_ptr = NULL;
+       int buflen = 0;
+       int headerlen = 0;
 
        ptr = content_start;
        content_length = 0;
@@ -301,15 +280,14 @@ void the_mime_parser(char *partnum,
 
        /* Learn interesting things from the headers */
        strcpy(header, "");
+       headerlen = 0;
        do {
-               int len;
-               ptr = memreadline(ptr, buf, SIZ);
+               ptr = memreadlinelen(ptr, buf, SIZ, &buflen);
                if (ptr >= content_end) {
                        goto end_parser;
                }
 
-               len = strlen (buf);
-               for (i = 0; i < len; ++i) {
+               for (i = 0; i < buflen; ++i) {
                        if (isspace(buf[i])) {
                                buf[i] = ' ';
                        }
@@ -321,6 +299,7 @@ void the_mime_parser(char *partnum,
                                striplt(content_type);
                                extract_key(content_type_name, content_type, "name");
                                extract_key(charset, content_type, "charset");
+                               extract_key(boundary, header, "boundary");
                                /* Deal with weird headers */
                                if (strchr(content_type, ' '))
                                        *(strchr(content_type, ' ')) = '\0';
@@ -343,12 +322,13 @@ void the_mime_parser(char *partnum,
                                strcpy(encoding, &header[26]);
                                striplt(encoding);
                        }
-                       if (IsEmptyStr(boundary))
-                               extract_key(boundary, header, "boundary");
                        strcpy(header, "");
+                       headerlen = 0;
                }
-               if ((strlen(header) + strlen(buf) + 2) < SIZ) {
-                       strcat(header, buf);
+               if ((headerlen + buflen + 2) < SIZ) {
+                       memcpy(&header[headerlen], buf, buflen);
+                       headerlen += buflen;
+                       header[headerlen] = '\0';
                }
        } while ((!IsEmptyStr(buf)) && (*ptr != 0));
 
@@ -514,7 +494,7 @@ void the_mime_parser(char *partnum,
                                        0, encoding, userdata);
                        }
                        if (CallBack != NULL) {
-                               if (!IsEmptyStr(partnum)) {
+                               if (strlen(partnum) > 0) {
                                        snprintf(nested_partnum,
                                                 sizeof nested_partnum,
                                                 "%s.%d", partnum,
@@ -616,5 +596,3 @@ void mime_parser(char *content_start,
                        PostMultiPartCallBack,
                        userdata, dont_decode);
 }
-
-/*@}*/