Rounded buttons under IE using CSS3PIE (not working yet)

[citadel.git] / libcitadel / lib / mime_parser.c

diff --git a/libcitadel/lib/mime_parser.c b/libcitadel/lib/mime_parser.c
index 6b207c92679552e1a451010662836bfad971585d..43f499838cd6410a07b4f6ef7c7b6408a2604a2a 100644 (file)
--- a/libcitadel/lib/mime_parser.c
+++ b/libcitadel/lib/mime_parser.c
@@ -1,9 +1,7 @@
 /*
- * $Id$
- *
  * This is the MIME parser for Citadel.
  *
- * Copyright (c) 1998-2007 by the citadel.org development team.
+ * Copyright (c) 1998-2010 by the citadel.org development team.
  * This code is distributed under the GNU General Public License v3.
  *
  */
@@ -26,7 +24,7 @@
 
 void extract_key(char *target, char *source, long sourcelen, char *key, long keylen, char KeyEnd)
 {
-       char *sptr, *ptr;
+       char *sptr, *ptr = NULL;
        int double_quotes = 0;
        long RealKeyLen = keylen;
 
@@ -59,7 +57,7 @@ void extract_key(char *target, char *source, long sourcelen, char *key, long key
        }
        strcpy(target, (ptr + RealKeyLen));
 
-       for (ptr=target; (*ptr != 0); ++ptr) {
+       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 == ';')) {
@@ -174,45 +172,11 @@ void mime_decode(char *partnum,
                 char *disposition,
                 char *id,
                 char *name, char *filename,
-                void (*CallBack)
-                 (char *cbname,
-                  char *cbfilename,
-                  char *cbpartnum,
-                  char *cbdisp,
-                  void *cbcontent,
-                  char *cbtype,
-                  char *cbcharset,
-                  size_t cblength,
-                  char *cbencoding,
-                  char *cbid,
-                  void *cbuserdata),
-                void (*PreMultiPartCallBack)
-                 (char *cbname,
-                  char *cbfilename,
-                  char *cbpartnum,
-                  char *cbdisp,
-                  void *cbcontent,
-                  char *cbtype,
-                  char *cbcharset,
-                  size_t cblength,
-                  char *cbencoding,
-                  char *cbid,
-                  void *cbuserdata),
-                void (*PostMultiPartCallBack)
-                 (char *cbname,
-                  char *cbfilename,
-                  char *cbpartnum,
-                  char *cbdisp,
-                  void *cbcontent,
-                  char *cbtype,
-                  char *cbcharset,
-                  size_t cblength,
-                  char *cbencoding,
-                  char *cbid,
-                  void *cbuserdata),
-                 void *userdata,
-                 int dont_decode
-)
+                MimeParserCallBackType CallBack,
+                MimeParserCallBackType PreMultiPartCallBack,
+                MimeParserCallBackType PostMultiPartCallBack,
+                void *userdata,
+                int dont_decode)
 {
 
        char *decoded;
@@ -277,45 +241,11 @@ void mime_decode(char *partnum,
  */
 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,
-                      char *cbcharset,
-                      size_t cblength,
-                      char *cbencoding,
-                      char *cbid,
-                      void *cbuserdata),
-                    void (*PreMultiPartCallBack)
-                     (char *cbname,
-                      char *cbfilename,
-                      char *cbpartnum,
-                      char *cbdisp,
-                      void *cbcontent,
-                      char *cbtype,
-                      char *cbcharset,
-                      size_t cblength,
-                      char *cbencoding,
-                      char *cbid,
-                      void *cbuserdata),
-                    void (*PostMultiPartCallBack)
-                     (char *cbname,
-                      char *cbfilename,
-                      char *cbpartnum,
-                      char *cbdisp,
-                      void *cbcontent,
-                      char *cbtype,
-                      char *cbcharset,
-                      size_t cblength,
-                      char *cbencoding,
-                      char *cbid,
-                      void *cbuserdata),
-                     void *userdata,
-                     int dont_decode
-)
+                    MimeParserCallBackType CallBack,
+                    MimeParserCallBackType PreMultiPartCallBack,
+                    MimeParserCallBackType PostMultiPartCallBack,
+                    void *userdata,
+                    int dont_decode)
 {
 
        char *ptr;
@@ -653,50 +583,12 @@ end_parser:       /* free the buffers!  end the oppression!! */
  * considered to have ended when the parser encounters a 0x00 byte.
  */
 void mime_parser(char *content_start,
-               char *content_end,
-
-                void (*CallBack)
-                 (char *cbname,
-                  char *cbfilename,
-                  char *cbpartnum,
-                  char *cbdisp,
-                  void *cbcontent,
-                  char *cbtype,
-                  char *cbcharset,
-                  size_t cblength,
-                  char *cbencoding,
-                  char *cbid,
-                  void *cbuserdata),
-
-                void (*PreMultiPartCallBack)
-                 (char *cbname,
-                  char *cbfilename,
-                  char *cbpartnum,
-                  char *cbdisp,
-                  void *cbcontent,
-                  char *cbtype,
-                  char *cbcharset,
-                  size_t cblength,
-                  char *cbencoding,
-                  char *cbid,
-                  void *cbuserdata),
-
-                void (*PostMultiPartCallBack)
-                 (char *cbname,
-                  char *cbfilename,
-                  char *cbpartnum,
-                  char *cbdisp,
-                  void *cbcontent,
-                  char *cbtype,
-                  char *cbcharset,
-                  size_t cblength,
-                  char *cbencoding,
-                  char *cbid,
-                  void *cbuserdata),
-
-                 void *userdata,
-                 int dont_decode
-)
+                char *content_end,
+                MimeParserCallBackType CallBack,
+                MimeParserCallBackType PreMultiPartCallBack,
+                MimeParserCallBackType PostMultiPartCallBack,
+                void *userdata,
+                int dont_decode)
 {
 
        the_mime_parser("", content_start, content_end,
@@ -781,6 +673,8 @@ const char* GuessMimeByFilename(const char *what, size_t len)
                return "text/plain";
        else if ((len > 3) && !strncasecmp(&what[len - 4], ".css", 4))
                return "text/css";
+       else if ((len > 3) && !strncasecmp(&what[len - 4], ".htc", 4))
+               return "text/x-component";
        else if ((len > 3) && !strncasecmp(&what[len - 4], ".jpg", 4))
                return "image/jpeg";
        else if ((len > 3) && !strncasecmp(&what[len - 4], ".png", 4))