simplify some bits of code, also simplify includes.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/lib-mime/mime-token.def b/lib-mime/mime-token.def
index 44d9c9e..dcaef9e 100644 (file)
--- a/lib-mime/mime-token.def
+++ b/lib-mime/mime-token.def
@@ -8,6 +8,7 @@ audio
 base64
 bcc
 binary
 base64
 bcc
 binary

+body

 cc
 compose
 composetyped
 cc
 compose
 composetyped

diff --git a/lib-mime/mime-types.h b/lib-mime/mime-types.h
index f04986a..9a32717 100644 (file)
--- a/lib-mime/mime-types.h
+++ b/lib-mime/mime-types.h
@@ -30,10 +30,6 @@
 #ifndef MUTT_LIB_MIME_MIME_TYPES_H
 #define MUTT_LIB_MIME_MIME_TYPES_H
 
 #ifndef MUTT_LIB_MIME_MIME_TYPES_H
 #define MUTT_LIB_MIME_MIME_TYPES_H
 

-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-

 #include <lib-lib/mem.h>
 #include <lib-lib/buffer.h>
 #include <lib-lib/list.h>
 #include <lib-lib/mem.h>
 #include <lib-lib/buffer.h>
 #include <lib-lib/list.h>

diff --git a/lib-mime/mime.c b/lib-mime/mime.c
index 212c24d..7c6a4b6 100644 (file)
--- a/lib-mime/mime.c
+++ b/lib-mime/mime.c
@@ -22,8 +22,6 @@
 
 #include "mime.h"
 
 
 #include "mime.h"
 

-#include "mutt.h"
-

 #define BOUNDARYLEN 16
 
 const char MimeSpecials[] = "@.,;:<>[]\\\"()?/= \t";
 #define BOUNDARYLEN 16
 
 const char MimeSpecials[] = "@.,;:<>[]\\\"()?/= \t";


@@ -217,6 +215,9 @@ void header_wipe(HEADER *h)
     p_delete(&h->data);
 }
 
     p_delete(&h->data);
 }
 

+
+#include "mutt.h"
+

 int url_parse_mailto(ENVELOPE *e, char **body, const char *src)
 {
     char *t;
 int url_parse_mailto(ENVELOPE *e, char **body, const char *src)
 {
     char *t;


@@ -239,11 +240,11 @@ int url_parse_mailto(ENVELOPE *e, char **body, const char *src)
         *headers++ = '\0';
 
     url_decode(tmp);
         *headers++ = '\0';
 
     url_decode(tmp);

-    e->to = rfc822_parse_adrlist (e->to, tmp);
+    e->to = rfc822_parse_adrlist(e->to, tmp);

 
     tag = headers ? strtok (headers, "&") : NULL;
 
 
     tag = headers ? strtok (headers, "&") : NULL;
 

-    for (; tag; tag = strtok (NULL, "&")) {
+    for (; tag; tag = strtok(NULL, "&")) {

         if ((value = strchr (tag, '=')))
             *value++ = '\0';
         if (!value || !*value)
         if ((value = strchr (tag, '=')))
             *value++ = '\0';
         if (!value || !*value)


@@ -252,19 +253,18 @@ int url_parse_mailto(ENVELOPE *e, char **body, const char *src)
         url_decode (tag);
         url_decode (value);
 
         url_decode (tag);
         url_decode (value);
 

-        if (!ascii_strcasecmp (tag, "body")) {
+        if (mime_which_token(tag, -1) == MIME_BODY) {

             if (body)
                 m_strreplace(body, value);
             if (body)
                 m_strreplace(body, value);

-        }
-        else {
-#define SAFEPFX (option (OPTSTRICTMAILTO) ? "" : "X-Mailto-")
-            taglen = m_strlen(tag) + m_strlen(SAFEPFX);
+        } else {
+#define SAFEPFX (option(OPTSTRICTMAILTO) ? "" : "X-Mailto-")
+            taglen = m_strlen(tag) + strlen(SAFEPFX);

             /* mutt_parse_rfc822_line makes some assumptions */
             /* mutt_parse_rfc822_line makes some assumptions */

-            snprintf (scratch, sizeof (scratch), "%s%s: %s", SAFEPFX, tag, value);
+            snprintf(scratch, sizeof(scratch), "%s%s: %s", SAFEPFX, tag, value);

 #undef SAVEPFX
             scratch[taglen] = '\0';
             value = vskipspaces(&scratch[taglen + 1]);
 #undef SAVEPFX
             scratch[taglen] = '\0';
             value = vskipspaces(&scratch[taglen + 1]);

-            last = mutt_parse_rfc822_line (e, NULL, scratch, value, 0, 0, last);
+            last  = mutt_parse_rfc822_line (e, NULL, scratch, value, 0, 0, last);

             /* if $strict_mailto is set, force editing headers to let
              * users have a look at what we got */
             if (!option (OPTSTRICTMAILTO)) {
             /* if $strict_mailto is set, force editing headers to let
              * users have a look at what we got */
             if (!option (OPTSTRICTMAILTO)) {

diff --git a/lib-mime/mime.h b/lib-mime/mime.h
index 84cb041..e39d893 100644 (file)
--- a/lib-mime/mime.h
+++ b/lib-mime/mime.h
@@ -29,6 +29,10 @@
 #ifndef MUTT_LIB_MIME_MIME_H
 #define MUTT_LIB_MIME_MIME_H
 
 #ifndef MUTT_LIB_MIME_MIME_H
 #define MUTT_LIB_MIME_MIME_H
 

+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+

 #include <stdlib.h>
 #include <stdio.h>
 
 #include <stdlib.h>
 #include <stdio.h>
 

diff --git a/lib-mime/rfc3676.c b/lib-mime/rfc3676.c
index 978fa1b..1fdcf0d 100644 (file)
--- a/lib-mime/rfc3676.c
+++ b/lib-mime/rfc3676.c
@@ -28,10 +28,7 @@
 
 #include <lib-ui/curses.h>
 
 
 #include <lib-ui/curses.h>
 

-#include "mutt.h"
-#include "handler.h"

 #include "state.h"
 #include "state.h"

-#include "lib.h"

 
 #define FLOWED_MAX 77
 
 
 #define FLOWED_MAX 77