X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-mime%2Fmime.h;h=4e678e4dd64d4c08731d88cbe1b4b4fa147aaa10;hb=801673291bea7eb323063711349a820f6ea34bff;hp=498473cb395892eb31e76b58a8c4ae124365e19e;hpb=d5fc962299f48696697e29f323e78c8bba6ca2d1;p=apps%2Fmadmutt.git

diff --git a/lib-mime/mime.h b/lib-mime/mime.h
index 498473c..4e678e4 100644
--- a/lib-mime/mime.h
+++ b/lib-mime/mime.h
@@ -31,8 +31,10 @@
 #define MUTT_LIB_MIME_MIME_H
 
 #include <stdlib.h>
+#include <stdio.h>
 
 #include "mime-types.h"
+#include "mime-token.h"
 
 extern const char MimeSpecials[];
 extern const char *BodyTypes[];
@@ -42,8 +44,10 @@ extern const char *BodyEncodings[];
 
 #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)]
 
@@ -52,6 +56,25 @@ extern const char *BodyEncodings[];
 /*                Standard for ARPA Internet Text Messages                  */
 /****************************************************************************/
 
+extern const char RFC822Specials[];
+
+ssize_t mutt_read_rfc822_line(FILE*, char**, ssize_t*);
+LIST *mutt_parse_references(char *, int);
+int mutt_check_encoding(const char *);
+int mutt_check_mime_type(const char *);
+void mutt_parse_content_type(char *, BODY *);
+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);
+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 ***/
+
+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 *);
@@ -62,8 +85,6 @@ ssize_t rfc822_write_address(char *, ssize_t, address_t *, int);
 ssize_t rfc822_write_address_single(char *, ssize_t, address_t *, int);
 ssize_t rfc822_strcpy(char *, ssize_t, const char *, const char *);
 
-extern const char RFC822Specials[];
-
 /****************************************************************************/
 /* RFC 2047                                                                 */
 /*       MIME (Multipurpose Internet Mail Extensions) Part Three:           */