move debug.c

[apps/madmutt.git] / lib-mime / mime.h

diff --git a/lib-mime/mime.h b/lib-mime/mime.h
index 160a7c9..4e678e4 100644 (file)
--- a/lib-mime/mime.h
+++ b/lib-mime/mime.h
@@ -34,6 +34,7 @@
 #include <stdio.h>
 
 #include "mime-types.h"
 #include <stdio.h>
 
 #include "mime-types.h"

+#include "mime-token.h"

 
 extern const char MimeSpecials[];
 extern const char *BodyTypes[];
 
 extern const char MimeSpecials[];
 extern const char *BodyTypes[];


@@ -43,8 +44,10 @@ extern const char *BodyEncodings[];
 
 #define is_multipart(x) \
     ((x)->type == TYPEMULTIPART \
 
 #define is_multipart(x) \
     ((x)->type == TYPEMULTIPART \

-     || ((x)->type == TYPEMESSAGE && (!strcasecmp((x)->subtype, "rfc822") \
-                                      || !strcasecmp((x)->subtype, "news"))))
+     || ((x)->type == TYPEMESSAGE && \
+         ((!mime_which_token((x)->subtype, -1) == MIME_RFC822) \
+         || !mime_which_token((x)->subtype, -1) == MIME_NEWS)))
+

 #define TYPE(X) ((X->type == TYPEOTHER) && (X->xtype != NULL) ? X->xtype : BodyTypes[(X->type)])
 #define ENCODING(X) BodyEncodings[(X)]
 
 #define TYPE(X) ((X->type == TYPEOTHER) && (X->xtype != NULL) ? X->xtype : BodyTypes[(X->type)])
 #define ENCODING(X) BodyEncodings[(X)]
 


@@ -64,12 +67,14 @@ BODY *mutt_read_mime_header (FILE *, int);
 void mutt_parse_part(FILE *, BODY *);
 BODY *mutt_parse_messageRFC822(FILE *, BODY *);
 BODY *mutt_parse_multipart(FILE *, const char *, off_t, int);
 void mutt_parse_part(FILE *, BODY *);
 BODY *mutt_parse_messageRFC822(FILE *, BODY *);
 BODY *mutt_parse_multipart(FILE *, const char *, off_t, int);

-void mutt_parse_rfc822_line(ENVELOPE *, HEADER *, char *line, char *p,
-                           short user_hdrs, short weed, short do_2047,
-                           LIST **);
+LIST **mutt_parse_rfc822_line(ENVELOPE *, HEADER *, char *line, char *p,
+                              short weed, short do_2047, LIST **);
+ENVELOPE *mutt_read_rfc822_header(FILE *, HEADER *, short, short);
+int mutt_count_body_parts (HEADER *hdr, int flags);

 
 /*** addresses ***/
 
 
 /*** addresses ***/
 

+address_t *mutt_parse_adrlist (address_t *, const char *);

 address_t *address_dup(address_t *addr);
 address_t *address_list_dup(address_t *addr);
 void rfc822_qualify(address_t *, const char *);
 address_t *address_dup(address_t *addr);
 address_t *address_list_dup(address_t *addr);
 void rfc822_qualify(address_t *, const char *);