X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mime%2Fmime.h;h=0ff5bce940a1935c4a1d76ec3ef6e0c049c82f9a;hp=51585a0704326ed7c4c9e4d4be151a2642106129;hb=16534e98723674fa391e3fc29d2a07ce419c13dd;hpb=89a7d4396b35e8047cbe519e81e22d99a1efd018

diff --git a/lib-mime/mime.h b/lib-mime/mime.h
index 51585a0..0ff5bce 100644
--- a/lib-mime/mime.h
+++ b/lib-mime/mime.h
@@ -16,7 +16,6 @@
  *
  *  Copyright © 2006 Pierre Habouzit
  */
-
 /*
  * Copyright notice from original mutt:
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
@@ -30,10 +29,8 @@
 #ifndef MUTT_LIB_MIME_MIME_H
 #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[];
@@ -43,11 +40,44 @@ 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)]
 
+/****************************************************************************/
+/* RFC 1524                                                                 */
+/*                   A User Agent Configuration Mechanism                   */
+/*                  For Multimedia Mail Format Information                  */
+/****************************************************************************/
+
+typedef struct rfc1524_entry {
+    char *command;
+    char *testcommand;
+    char *composecommand;
+    char *composetypecommand;
+    char *editcommand;
+    char *printcommand;
+    char *nametemplate;
+    char *convert;
+
+    unsigned needsterminal:1; /* endwin() and system */
+    unsigned copiousoutput:1; /* needs pager, basically */
+} rfc1524_entry;
+
+DO_INIT(rfc1524_entry, rfc1524_entry);
+void rfc1524_entry_wipe(rfc1524_entry *);
+
+DO_NEW(rfc1524_entry, rfc1524_entry);
+DO_DELETE(rfc1524_entry, rfc1524_entry);
+
+int rfc1524_expand_command(BODY *, const char *, const char *, char *, int);
+int rfc1524_expand_filename(char *, char *, char *, ssize_t);
+int rfc1524_mailcap_lookup(BODY *, char *, rfc1524_entry *, int);
+int rfc1524_mailcap_isneeded(BODY *);
+
 /****************************************************************************/
 /* RFC 822                                                                  */
 /*                Standard for ARPA Internet Text Messages                  */
@@ -56,17 +86,40 @@ extern const char *BodyEncodings[];
 extern const char RFC822Specials[];
 
 ssize_t mutt_read_rfc822_line(FILE*, char**, ssize_t*);
+string_list_t *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);
+string_list_t **mutt_parse_rfc822_line(ENVELOPE *, HEADER *, char *line, char *p,
+                                       short weed, short do_2047, string_list_t **);
+ENVELOPE *mutt_read_rfc822_header(FILE *, HEADER *, short, short);
+int mutt_count_body_parts (HEADER *hdr, int flags);
+
+int mutt_is_message_type(BODY *);
+int mutt_is_multipart_encrypted(BODY *);
+int mutt_is_multipart_signed(BODY *);
+int mutt_is_application_pgp(BODY *);
+int mutt_is_application_smime(BODY *);
+int mutt_is_text_part(BODY *);
+time_t mutt_parse_date(const char *, HEADER *);
 
 /*** addresses ***/
 
-address_t *address_dup(address_t *addr);
-address_t *address_list_dup(address_t *addr);
+address_t *mutt_parse_adrlist(address_t *, const char *);
+address_t *address_dup(const address_t *addr);
+address_t *address_list_dup(const address_t *addr);
+
+void address_list_uniq(address_t *);
 void rfc822_qualify(address_t *, const char *);
 
 address_t *rfc822_parse_adrlist(address_t *, const char *s);
 
-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_addrcat(char *, ssize_t, address_t *, int);
+ssize_t rfc822_addrcpy(char *, ssize_t, address_t *, int);
 ssize_t rfc822_strcpy(char *, ssize_t, const char *, const char *);
 
 /****************************************************************************/
@@ -92,6 +145,6 @@ void rfc2047_decode_envelope(ENVELOPE* e);
 /****************************************************************************/
 
 int  rfc2231_encode_string(char **);
-void rfc2231_decode_parameters(PARAMETER **);
+void rfc2231_decode_parameters(parameter_t **);
 
 #endif /* MUTT_LIB_MIME_MIME_H */