handle "disposition" field

diff --git a/citadel/mime_parser.c b/citadel/mime_parser.c
index 9b21b25fc67adb6c3cf5b3b99cda7549bdc3564d..12c775512eaf9abe48d4390da0a0266e7aaa854f 100644 (file)
--- a/citadel/mime_parser.c
+++ b/citadel/mime_parser.c
@@ -77,11 +77,13 @@ char *memreadline(char *start, char *buf, int maxlen) {
 void mime_decode(char *partnum,
                char *part_start, size_t length,
                char *content_type, char *encoding,
+               char *disposition,
                char *name, char *filename,
                void (*CallBack)
                        (char *cbname,
                        char *cbfilename,
                        char *cbpartnum,
+                       char *cbdisp,
                        void *cbcontent,
                        char *cbtype,
                        size_t cblength)
@@ -99,7 +101,7 @@ void mime_decode(char *partnum,
 
        /* If this part is not encoded, send as-is */
        if (strlen(encoding)==0) {
-               CallBack(name, filename, partnum, part_start,
+               CallBack(name, filename, partnum, disposition, part_start,
                        content_type, length);
                return;
                }
@@ -140,7 +142,7 @@ void mime_decode(char *partnum,
                close(recvpipe[0]);
                if (!strcasecmp(encoding, "base64"))
                   execlp("./base64", "base64", "-d", NULL);
-               else if (!strcasecmp(encoding, "7bit"))
+               else if (!strcasecmp(encoding, "7bit")) /* just a test */
                   execlp("/bin/dd", "dd", NULL);
                lprintf(5, "ERROR: cannot exec decoder for %s\n", encoding);
                exit(1);
@@ -181,7 +183,7 @@ void mime_decode(char *partnum,
        lprintf(9, "Decoded length = %d\n", bytes_recv);
 
        if (bytes_recv > 0)
-               CallBack(name, filename, partnum, decoded,
+               CallBack(name, filename, partnum, disposition, decoded,
                        content_type, bytes_recv);
        phree(decoded);
        }
@@ -198,6 +200,7 @@ void the_mime_parser(char *partnum,
                        (char *cbname,
                        char *cbfilename,
                        char *cbpartnum,
+                       char *cbdisp,
                        void *cbcontent,
                        char *cbtype,
                        size_t cblength)
@@ -212,6 +215,7 @@ void the_mime_parser(char *partnum,
        char endary[256];
        char content_type[256];
        char encoding[256];
+       char disposition[256];
        char name[256];
        char filename[256];
        int is_multipart;
@@ -243,7 +247,8 @@ void the_mime_parser(char *partnum,
                                extract_key(name, content_type, "name");
                                }
                        if (!strncasecmp(header, "Content-Disposition: ", 21)) {
-                               extract_key(filename, header, "filename");
+                               strcpy(disposition, &header[21]);
+                               extract_key(filename, disposition, "filename");
                                }
                        if (!strncasecmp(header,
                                "Content-transfer-encoding: ", 27))
@@ -256,6 +261,8 @@ void the_mime_parser(char *partnum,
                        strcat(header, buf);
                } while ((strlen(buf) > 0) && (*ptr != 0));
 
+       for (i=0; i<strlen(disposition); ++i) 
+               if (disposition[i]==';') disposition[i] = 0;
        for (i=0; i<strlen(content_type); ++i) 
                if (content_type[i]==';') content_type[i] = 0;
 
@@ -301,7 +308,7 @@ void the_mime_parser(char *partnum,
                        }
                mime_decode(partnum,
                                part_start, length,
-                               content_type, encoding,
+                               content_type, encoding, disposition,
                                name, filename, CallBack);
                }
        
@@ -318,6 +325,7 @@ void mime_parser(char *content_start, char *content_end,
                        (char *cbname,
                        char *cbfilename,
                        char *cbpartnum,
+                       char *cbdisp,
                        void *cbcontent,
                        char *cbtype,
                        size_t cblength)

diff --git a/citadel/mime_parser.h b/citadel/mime_parser.h
index b303d6306861c355b19ee5cc518c7337534cba5e..b7f1c1b7ebc6fa023c0d9c1bb2741051436bc067 100644 (file)
--- a/citadel/mime_parser.h
+++ b/citadel/mime_parser.h
@@ -5,6 +5,7 @@ void mime_parser(char *content_start, char *content_end,
                        (char *cbname,
                        char *cbfilename,
                        char *cbpartnum,
+                       char *cbdisp,
                        void *cbcontent,
                        char *cbtype,
                        size_t cblength)

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 52a0af88258b48077aac3d194da7b0aa9dd0efc1..3a53416dd71be0023af5e66c0f61fb79cfa805dc 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -337,11 +337,11 @@ FMTEND:   cprintf("\n");
 
 /*
  */
-void part_handler(char *name, char *filename, char *partnum,
+void part_handler(char *name, char *filename, char *partnum, char *disp,
                         void *content, char *cbtype, size_t length) {
 
-       cprintf("part=%s|%s|%s|%s|%d\n",
-               name, filename, partnum, cbtype, length);
+       cprintf("part=%s|%s|%s|%s|%s|%d\n",
+               name, filename, partnum, disp, cbtype, length);
        }