]> code.citadel.org Git - citadel.git/commitdiff
* Brought over the new MIME parser from Citadel. WARNING: BROKEN BUILD!!
authorArt Cancro <ajc@citadel.org>
Fri, 25 May 2001 22:39:27 +0000 (22:39 +0000)
committerArt Cancro <ajc@citadel.org>
Fri, 25 May 2001 22:39:27 +0000 (22:39 +0000)
webcit/ChangeLog
webcit/mime_parser.c
webcit/mime_parser.h
webcit/webcit.c
webcit/webcit.h

index e46b0d61234b1397dd51182eda96450105c22e93..c40b8d2ebc1e97792fa07cc558b6a835a4512d9e 100644 (file)
@@ -1,4 +1,7 @@
 $Log$
+Revision 213.16  2001/05/25 22:39:26  ajc
+* Brought over the new MIME parser from Citadel.  WARNING: BROKEN BUILD!!
+
 Revision 213.15  2001/05/23 16:15:23  ajc
 * UI changes (pretty frames with no scrollbars)
 
@@ -553,4 +556,3 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
-
index 5782c5a7269f178ea6ca19e28157277e8682e67f..d197c5cac88feeb3e270478bc7f0fbe579bf6cad 100644 (file)
@@ -1,34 +1,26 @@
 /*
- * mime_parser.c
+ * $Id$
+ *
+ * This is the MIME parser brought over from the Citadel server source code.
+ * We use it to handle HTTP uploads, which are sent in MIME format.  In the
+ * future we'll use it to output MIME messages as well.
+ *
+ * Copyright (c) 1998-2001 by Art Cancro
+ * This code is distributed under the terms of the GNU General Public License.
  *
- * This is a really bad attempt at writing a parser to handle multipart
- * messages -- in the case of WebCit, a form containing uploaded files.
  */
 
-
-
-#include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <fcntl.h>
 #include <signal.h>
 #include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
+#include <ctype.h>
 #include <string.h>
-#include <pwd.h>
+#include <sys/stat.h>
 #include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
-
-
+#include "mime_parser.h"
 
 
 
@@ -54,199 +46,449 @@ void extract_key(char *target, char *source, char *key)
 
 
 
-/*
- * The very back end for the component handler
- * (This function expects to be fed CONTENT ONLY, no headers)
+/* 
+ * Utility function to "readline" from memory
+ * (returns new pointer)
  */
-void do_something_with_it(char *content,
-                         int length,
-                         char *content_type,
-                         char *content_disposition,
-                         void (*CallBack)
-                          (char *cbname,
-                           char *cbfilename,
-                           char *cbencoding,
-                           void *cbcontent,
-                           char *cbtype,
-                           size_t cblength)
-)
+char *memreadline(char *start, char *buf, int maxlen)
 {
-       char name[256];
-       char filename[256];
+       char ch;
+       char *ptr;
+       int len = 0;    /* tally our own length to avoid strlen() delays */
 
-       extract_key(name, content_disposition, " name");
-       extract_key(filename, content_disposition, "filename");
+       ptr = start;
+       memset(buf, 0, maxlen);
 
-       /* Nested multipart gets recursively fed back into the parser */
-       if (!strncasecmp(content_type, "multipart", 9)) {
-               mime_parser(content, length, content_type, CallBack);
+       while (1) {
+               ch = *ptr++;
+               if ( (len < (maxlen - 1)) && (ch != 13) && (ch != 10) ) {
+                       buf[strlen(buf) + 1] = 0;
+                       buf[strlen(buf)] = ch;
+                       ++len;
+               }
+               if ((ch == 10) || (ch == 0)) {
+                       return ptr;
+               }
        }
-/**** OTHERWISE, HERE'S WHERE WE HANDLE THE STUFF!! *****/
-
-       CallBack(name, filename, "", content, content_type, length);
+}
 
-/**** END OF STUFF-HANDLER ****/
 
+/*
+ * For non-multipart messages, we need to generate a quickie partnum of "1"
+ * to return to callback functions.  Some callbacks demand it.
+ */
+char *fixed_partnum(char *supplied_partnum) {
+       if (supplied_partnum == NULL) return "1";
+       if (strlen(supplied_partnum)==0) return "1";
+       return supplied_partnum;
 }
 
 
 /*
- * Take a part, figure out its length, and do something with it
- * (This function expects to be fed HEADERS+CONTENT)
+ * Given a message or message-part body and a length, handle any necessary
+ * decoding and pass the request up the stack.
  */
-void handle_part(char *content,
-                int part_length,
-                char *supplied_content_type,
+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,
                   char *cbencoding,
+                  void *cbuserdata),
+                void (*PreMultiPartCallBack)
+                 (char *cbname,
+                  char *cbfilename,
+                  char *cbpartnum,
+                  char *cbdisp,
                   void *cbcontent,
                   char *cbtype,
-                  size_t cblength)
+                  size_t cblength,
+                  char *cbencoding,
+                  void *cbuserdata),
+                void (*PostMultiPartCallBack)
+                 (char *cbname,
+                  char *cbfilename,
+                  char *cbpartnum,
+                  char *cbdisp,
+                  void *cbcontent,
+                  char *cbtype,
+                  size_t cblength,
+                  char *cbencoding,
+                  void *cbuserdata),
+                 void *userdata,
+                 int dont_decode
 )
 {
-       char content_type[256];
-       char content_disposition[256];
-       char *start;
-       char buf[512];
-       int crlf = 0;           /* set to 1 for crlf-style newlines */
-       int actual_length;
-
-       strcpy(content_type, supplied_content_type);
-
-       /* Strip off any leading blank lines. */
-       start = content;
-       while ((!strncmp(start, "\r", 1)) || (!strncmp(start, "\n", 1))) {
-               ++start;
-               --part_length;
+
+       char *decoded;
+       struct stat statbuf;
+       int sendpipe[2];
+       int recvpipe[2];
+       int childpid;
+       size_t bytes_sent = 0;
+       size_t bytes_recv = 0;
+       size_t blocksize;
+       int write_error = 0;
+
+       fprintf(stderr, "mime_decode() called\n");
+
+       /* Some encodings aren't really encodings */
+       if (!strcasecmp(encoding, "7bit"))
+               strcpy(encoding, "");
+       if (!strcasecmp(encoding, "8bit"))
+               strcpy(encoding, "");
+       if (!strcasecmp(encoding, "binary"))
+               strcpy(encoding, "");
+
+       /* If this part is not encoded, send as-is */
+       if ( (strlen(encoding) == 0) || (dont_decode)) {
+               if (CallBack != NULL) {
+                       CallBack(name, filename, fixed_partnum(partnum),
+                               disposition, part_start,
+                               content_type, length, encoding, userdata);
+                       }
+               return;
+       }
+       if ((strcasecmp(encoding, "base64"))
+           && (strcasecmp(encoding, "quoted-printable"))) {
+               fprintf(stderr, "ERROR: unknown MIME encoding '%s'\n", encoding);
+               return;
+       }
+       /*
+        * Allocate a buffer for the decoded data.  The output buffer is the
+        * same size as the input buffer; this assumes that the decoded data
+        * will never be larger than the encoded data.  This is a safe
+        * assumption with base64, uuencode, and quoted-printable.  Just to
+        * be safe, we still pad the buffer a bit.
+        */
+       decoded = malloc(length + 1024);
+       if (decoded == NULL) {
+               fprintf(stderr, "ERROR: cannot allocate memory.\n");
+               return;
+       }
+       if (pipe(sendpipe) != 0)
+               return;
+       if (pipe(recvpipe) != 0)
+               return;
+
+       childpid = fork();
+       if (childpid < 0) {
+               free(decoded);
+               return;
+       }
+       if (childpid == 0) {
+               close(2);
+               /* send stdio to the pipes */
+               if (dup2(sendpipe[0], 0) < 0)
+                       fprintf(stderr, "ERROR dup2()\n");
+               if (dup2(recvpipe[1], 1) < 0)
+                       fprintf(stderr, "ERROR dup2()\n");
+               close(sendpipe[1]);     /* Close the ends we're not using */
+               close(recvpipe[0]);
+               if (!strcasecmp(encoding, "base64"))
+                       execlp("./base64", "base64", "-d", NULL);
+               else if (!strcasecmp(encoding, "quoted-printable"))
+                       execlp("./qpdecode", "qpdecode", NULL);
+               fprintf(stderr, "ERROR: cannot exec decoder for %s\n", encoding);
+               exit(1);
+       }
+       close(sendpipe[0]);     /* Close the ends we're not using  */
+       close(recvpipe[1]);
+
+       while ((bytes_sent < length) && (write_error == 0)) {
+               /* Empty the input pipe FIRST */
+               while (fstat(recvpipe[0], &statbuf), (statbuf.st_size > 0)) {
+                       blocksize = read(recvpipe[0], &decoded[bytes_recv],
+                                        statbuf.st_size);
+                       if (blocksize < 0)
+                               fprintf(stderr, "ERROR: cannot read from pipe\n");
+                       else
+                               bytes_recv = bytes_recv + blocksize;
+               }
+               /* Then put some data into the output pipe */
+               blocksize = length - bytes_sent;
+               if (blocksize > 2048)
+                       blocksize = 2048;
+               if (write(sendpipe[1], &part_start[bytes_sent], blocksize) < 0) {
+                       fprintf(stderr, "ERROR: cannot write to pipe: %s\n",
+                               strerror(errno));
+                       write_error = 1;
+               }
+               bytes_sent = bytes_sent + blocksize;
+       }
+       close(sendpipe[1]);
+       /* Empty the input pipe */
+       while ((blocksize = read(recvpipe[0], &decoded[bytes_recv], 1)),
+              (blocksize > 0)) {
+               bytes_recv = bytes_recv + blocksize;
        }
 
-       /* At this point all we have left is the headers and the content. */
+       if (bytes_recv > 0) if (CallBack != NULL) {
+               CallBack(name, filename, fixed_partnum(partnum),
+                       disposition, decoded,
+                       content_type, bytes_recv, "binary", userdata);
+       }
+
+       free(decoded);
+}
+
+/*
+ * Break out the components of a multipart message
+ * (This function expects to be fed HEADERS + CONTENT)
+ * Note: NULL can be supplied as content_end; in this case, the message is
+ * considered to have ended when the parser encounters a 0x00 byte.
+ */
+void the_mime_parser(char *partnum,
+                    char *content_start, char *content_end,
+                    void (*CallBack)
+                     (char *cbname,
+                      char *cbfilename,
+                      char *cbpartnum,
+                      char *cbdisp,
+                      void *cbcontent,
+                      char *cbtype,
+                      size_t cblength,
+                      char *cbencoding,
+                      void *cbuserdata),
+                    void (*PreMultiPartCallBack)
+                     (char *cbname,
+                      char *cbfilename,
+                      char *cbpartnum,
+                      char *cbdisp,
+                      void *cbcontent,
+                      char *cbtype,
+                      size_t cblength,
+                      char *cbencoding,
+                      void *cbuserdata),
+                    void (*PostMultiPartCallBack)
+                     (char *cbname,
+                      char *cbfilename,
+                      char *cbpartnum,
+                      char *cbdisp,
+                      void *cbcontent,
+                      char *cbtype,
+                      size_t cblength,
+                      char *cbencoding,
+                      void *cbuserdata),
+                     void *userdata,
+                     int dont_decode
+)
+{
+
+       char *ptr;
+       char *part_start, *part_end;
+       char buf[SIZ];
+       char header[SIZ];
+       char boundary[SIZ];
+       char startary[SIZ];
+       char endary[SIZ];
+       char content_type[SIZ];
+       char encoding[SIZ];
+       char disposition[SIZ];
+       char name[SIZ];
+       char filename[SIZ];
+       int is_multipart;
+       int part_seq = 0;
+       int i;
+       size_t length;
+       char nested_partnum[SIZ];
+
+       fprintf(stderr, "the_mime_parser() called\n");
+       ptr = content_start;
+       memset(boundary, 0, sizeof boundary);
+       memset(content_type, 0, sizeof content_type);
+       memset(encoding, 0, sizeof encoding);
+       memset(name, 0, sizeof name);
+       memset(filename, 0, sizeof filename);
+       memset(disposition, 0, sizeof disposition);
+
+       /* Learn interesting things from the headers */
+       strcpy(header, "");
        do {
-               strcpy(buf, "");
-               do {
-                       buf[strlen(buf) + 1] = 0;
-                       if (strlen(buf) < ((sizeof buf) - 1)) {
-                               strncpy(&buf[strlen(buf)], start, 1);
+               ptr = memreadline(ptr, buf, sizeof buf);
+               if (*ptr == 0)
+                       return; /* premature end of message */
+               if (content_end != NULL)
+                       if (ptr >= content_end)
+                               return;
+
+               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(name, content_type, "name");
                        }
-                       ++start;
-                       --part_length;
-               } while ((buf[strlen(buf) - 1] != 10) && (part_length > 0));
-               if (part_length <= 0)
-                       return;
-               buf[strlen(buf) - 1] = 0;
-               if (buf[strlen(buf) - 1] == 13) {
-                       buf[strlen(buf) - 1] = 0;
-                       crlf = 1;
+                       if (!strncasecmp(header, "Content-Disposition: ", 21)) {
+                               strcpy(disposition, &header[21]);
+                               extract_key(filename, disposition, "filename");
+                       }
+                       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) < sizeof(header))
+                       strcat(header, buf);
+       } while ((strlen(buf) > 0) && (*ptr != 0));
+
+       for (i = 0; i < strlen(disposition); ++i)
+               if (disposition[i] == ';')
+                       disposition[i] = 0;
+       while (isspace(disposition[0]))
+               strcpy(disposition, &disposition[1]);
+       for (i = 0; i < strlen(content_type); ++i)
+               if (content_type[i] == ';')
+                       content_type[i] = 0;
+       while (isspace(content_type[0]))
+               strcpy(content_type, &content_type[1]);
+
+       if (strlen(boundary) > 0) {
+               is_multipart = 1;
+       } else {
+               is_multipart = 0;
+       }
+
+       /* If this is a multipart message, then recursively process it */
+       part_start = NULL;
+       if (is_multipart) {
+
+               /* Tell the client about this message's multipartedness */
+               if (PreMultiPartCallBack != NULL) {
+                       PreMultiPartCallBack("", "", partnum, "",
+                               NULL, content_type,
+                               0, encoding, userdata);
                }
-               if (!strncasecmp(buf, "Content-type: ", 14)) {
-                       strcpy(content_type, &buf[14]);
+               /*
+               if (CallBack != NULL) {
+                       CallBack("", "", fixed_partnum(partnum),
+                               "", NULL, content_type,
+                               0, encoding, userdata);
                }
-               if (!strncasecmp(buf, "Content-disposition: ", 21)) {
-                       strcpy(content_disposition, &buf[21]);
+                */
+
+               /* Figure out where the boundaries are */
+               sprintf(startary, "--%s", boundary);
+               sprintf(endary, "--%s--", boundary);
+               do {
+                       part_end = ptr;
+                       ptr = memreadline(ptr, buf, sizeof buf);
+                       if (content_end != NULL)
+                               if (ptr >= content_end) goto END_MULTI;
+
+                       if ( (!strcasecmp(buf, startary))
+                          || (!strcasecmp(buf, endary)) ) {
+                               if (part_start != NULL) {
+                                       if (strlen(partnum) > 0) {
+                                               sprintf(nested_partnum, "%s.%d",
+                                                       partnum, ++part_seq);
+                                       }
+                                       else {
+                                               sprintf(nested_partnum, "%d",
+                                                       ++part_seq);
+                                       }
+                                       the_mime_parser(nested_partnum,
+                                                   part_start, part_end,
+                                                       CallBack,
+                                                       PreMultiPartCallBack,
+                                                       PostMultiPartCallBack,
+                                                       userdata,
+                                                       dont_decode);
+                               }
+                               part_start = ptr;
+                       }
+               } while ( (strcasecmp(buf, endary)) && (ptr != 0) );
+END_MULTI:     if (PostMultiPartCallBack != NULL) {
+                       PostMultiPartCallBack("", "", partnum, "", NULL,
+                               content_type, 0, encoding, userdata);
                }
-       } while (strlen(buf) > 0);
+               return;
+       }
 
-       if (crlf)
-               actual_length = part_length - 2;
-       else
-               actual_length = part_length - 1;
+       /* If it's not a multipart message, then do something with it */
+       if (!is_multipart) {
+               part_start = ptr;
+               length = 0;
+               while ((*ptr != 0)
+                     && ((content_end == NULL) || (ptr < content_end))) {
+                       ++length;
+                       part_end = ptr++;
+               }
+               mime_decode(partnum,
+                           part_start, length,
+                           content_type, encoding, disposition,
+                           name, filename,
+                           CallBack, NULL, NULL,
+                           userdata, dont_decode);
+       }
 
-       /* Now that we've got this component isolated, what to do with it? */
-       do_something_with_it(start, actual_length,
-                            content_type, content_disposition, CallBack);
 
 }
 
 
+
 /*
- * Break out the components of a multipart message
- * (This function expects to be fed CONTENT ONLY, no headers)
+ * Entry point for the MIME parser.
+ * (This function expects to be fed HEADERS + CONTENT)
+ * Note: NULL can be supplied as content_end; in this case, the message is
+ * considered to have ended when the parser encounters a 0x00 byte.
  */
+void mime_parser(char *content_start,
+               char *content_end,
 
-
-void mime_parser(char *content,
-                int ContentLength,
-                char *ContentType,
                 void (*CallBack)
                  (char *cbname,
                   char *cbfilename,
-                  char *cbencoding,
+                  char *cbpartnum,
+                  char *cbdisp,
                   void *cbcontent,
                   char *cbtype,
-                  size_t cblength)
-)
-{
-       char boundary[256];
-       char endary[256];
-       int have_boundary = 0;
-       int a;
-       char *ptr;
-       char *beginning;
-       int bytes_processed = 0;
-       int part_length;
-
-       /* If it's not multipart, don't process it as multipart */
-       if (strncasecmp(ContentType, "multipart", 9)) {
-               do_something_with_it(content, ContentLength,
-                                    ContentType, "", CallBack);
-               return;
-       }
-       /* Figure out what the boundary is */
-       strcpy(boundary, ContentType);
-       for (a = 0; a < strlen(boundary); ++a) {
-               if (!strncasecmp(&boundary[a], "boundary=", 9)) {
-                       boundary[0] = '-';
-                       boundary[1] = '-';
-                       strcpy(&boundary[2], &boundary[a + 9]);
-                       have_boundary = 1;
-                       a = 0;
-               }
-               if ((boundary[a] == 13) || (boundary[a] == 10)) {
-                       boundary[a] = 0;
-               }
-       }
+                  size_t cblength,
+                  char *cbencoding,
+                  void *cbuserdata),
 
-       /* We can't process multipart messages without a boundary. */
-       if (have_boundary == 0)
-               return;
-       strcpy(endary, boundary);
-       strcat(endary, "--");
+                void (*PreMultiPartCallBack)
+                 (char *cbname,
+                  char *cbfilename,
+                  char *cbpartnum,
+                  char *cbdisp,
+                  void *cbcontent,
+                  char *cbtype,
+                  size_t cblength,
+                  char *cbencoding,
+                  void *cbuserdata),
 
-       ptr = content;
+                void (*PostMultiPartCallBack)
+                 (char *cbname,
+                  char *cbfilename,
+                  char *cbpartnum,
+                  char *cbdisp,
+                  void *cbcontent,
+                  char *cbtype,
+                  size_t cblength,
+                  char *cbencoding,
+                  void *cbuserdata),
 
-       /* Seek to the beginning of the next boundary */
-       while (bytes_processed < ContentLength) {
-               /* && (strncasecmp(ptr, boundary, strlen(boundary))) ) { */
+                 void *userdata,
+                 int dont_decode
+)
+{
 
-               if (strncasecmp(ptr, boundary, strlen(boundary))) {
-                       ++ptr;
-                       ++bytes_processed;
-               }
-               /* See if we're at the end */
-               if (!strncasecmp(ptr, endary, strlen(endary))) {
-                       return;
-               }
-               /* Seek to the end of the boundary string */
-               if (!strncasecmp(ptr, boundary, strlen(boundary))) {
-                       while ((bytes_processed < ContentLength)
-                              && (strncasecmp(ptr, "\n", 1))) {
-                               ++ptr;
-                               ++bytes_processed;
-                       }
-                       beginning = ptr;
-                       part_length = 0;
-                       while ((bytes_processed < ContentLength)
-                              && (strncasecmp(ptr, boundary, strlen(boundary)))) {
-                               ++ptr;
-                               ++bytes_processed;
-                               ++part_length;
-                       }
-                       handle_part(beginning, part_length, "", CallBack);
-                       /* Back off so we can see the next boundary */
-                       --ptr;
-                       --bytes_processed;
-               }
-       }
+       fprintf(stderr, "mime_parser() called\n");
+       the_mime_parser("", content_start, content_end,
+                       CallBack,
+                       PreMultiPartCallBack,
+                       PostMultiPartCallBack,
+                       userdata, dont_decode);
 }
index 840f8e80fa199800cff6609c1bcee5a6f09cbdcd..9518374bbc89416424925cb1f1dd68225f9cc7cc 100644 (file)
@@ -1,38 +1,44 @@
-void extract_key(char *target, char *source, char *key);
+/*
+ * $Id$
+ *
+ */
+
 
-void do_something_with_it(char *content,
-                         int length,
-                         char *content_type,
-                         char *content_disposition,
-                         void (*CallBack)
-                          (char *cbname,
-                           char *cbfilename,
-                           char *cbencoding,
-                           void *cbcontent,
-                           char *cbtype,
-                           size_t cblength)
-);
+#define SIZ    4096
 
-void handle_part(char *content,
-                int part_length,
-                char *supplied_content_type,
-                void (*CallBack)
-                 (char *cbname,
-                  char *cbfilename,
-                  char *cbencoding,
-                  void *cbcontent,
-                  char *cbtype,
-                  size_t cblength)
-);
+void extract_key(char *target, char *source, char *key);
 
-void mime_parser(char *content,
-                int ContentLength,
-                char *ContentType,
-                void (*CallBack)
-                 (char *cbname,
-                  char *cbfilename,
-                  char *cbencoding,
-                  void *cbcontent,
-                  char *cbtype,
-                  size_t cblength)
-);
+void mime_parser(char *content_start, char *content_end,
+               void (*CallBack)
+                       (char *cbname,
+                       char *cbfilename,
+                       char *cbpartnum,
+                       char *cbdisp,
+                       void *cbcontent,
+                       char *cbtype,
+                       size_t cblength,
+                       char *cbencoding,
+                       void *cbuserdata),
+               void (*PreMultiPartCallBack)
+                       (char *cbname,
+                       char *cbfilename,
+                       char *cbpartnum,
+                       char *cbdisp,
+                       void *cbcontent,
+                       char *cbtype,
+                       size_t cblength,
+                       char *cbencoding,
+                       void *cbuserdata),
+               void (*PostMultiPartCallBack)
+                       (char *cbname,
+                       char *cbfilename,
+                       char *cbpartnum,
+                       char *cbdisp,
+                       void *cbcontent,
+                       char *cbtype,
+                       size_t cblength,
+                       char *cbencoding,
+                       void *cbuserdata),
+               void *userdata,
+               int dont_decode
+               );
index 3bf91b4825770faf3c87aba8bdc65f9d9bd5b30c..0f06876bc6b559b18dc012bffa0c79b3c0f09bf7 100644 (file)
@@ -29,6 +29,7 @@
 #include <pthread.h>
 #include <signal.h>
 #include "webcit.h"
+#include "mime_parser.h"
 
 /*
  * String to unset the cookie.
@@ -561,8 +562,9 @@ void extract_action(char *actbuf, char *cmdbuf)
 }
 
 
-void upload_handler(char *name, char *filename, char *encoding,
-                   void *content, char *cbtype, size_t length)
+void upload_handler(char *name, char *filename, char *partnum, char *disp,
+                       void *content, char *cbtype, size_t length,
+                       char *encoding, void *userdata)
 {
 
        fprintf(stderr, "UPLOAD HANDLER CALLED\n");
@@ -595,6 +597,7 @@ void session_loop(struct httprequest *req)
        int BytesRead;
        char ContentType[512];
        char *content;
+       char *content_end;
        struct httprequest *hptr;
        char browser_host[256];
        char user_agent[256];
@@ -662,8 +665,9 @@ void session_loop(struct httprequest *req)
                              "application/x-www-form-urlencoded", 33)) {
                        addurls(content);
                } else if (!strncasecmp(ContentType, "multipart", 9)) {
-                       mime_parser(content, ContentLength, ContentType,
-                                   *upload_handler);
+                       content_end = content + ContentLength;
+                       mime_parser(content, content_end, *upload_handler,
+                                       NULL, NULL, NULL, 0);
                }
        } else {
                content = NULL;
index e27198a07ce54ee136c3bb71d981661b3b9e8254..f066699fdf55c136af05209d7179b2ff3edd59d9 100644 (file)
@@ -269,15 +269,6 @@ void embed_room_banner(char *);
 void smart_goto(char *);
 void worker_entry(void);
 void session_loop(struct httprequest *);
-void mime_parser(char *content,
-                 int ContentLength,
-                 char *ContentType,
-                 void (*CallBack)
-                  (char *cbname,
-                   char *cbfilename,
-                   char *cbencoding,
-                   void *cbcontent,                                                                char *cbtype,                                                                   size_t cblength)
-);
 void fmt_date(char *buf, time_t thetime);
 void httpdate(char *buf, time_t thetime);
 void end_webcit_session(void);