Update and enable NNTP patch

[software/mutt-debian.git] / rfc822.h

diff --git a/rfc822.h b/rfc822.h
index 5cabdf3147dcaa102c213bb55aeee42e08e7f7a9..0c48f75a9a4c46765e296fb55d9c15336baef1c4 100644 (file)
--- a/rfc822.h
+++ b/rfc822.h
@@ -19,6 +19,8 @@
 #ifndef rfc822_h
 #define rfc822_h
 
 #ifndef rfc822_h
 #define rfc822_h
 

+#include "lib.h"
+

 /* possible values for RFC822Error */
 enum
 {
 /* possible values for RFC822Error */
 enum
 {


@@ -39,25 +41,29 @@ typedef struct address_t
   char *mailbox;       /* mailbox and host address */
   int group;           /* group mailbox? */
   struct address_t *next;
   char *mailbox;       /* mailbox and host address */
   int group;           /* group mailbox? */
   struct address_t *next;

+  unsigned is_idn      : 1;
+  unsigned idn_checked : 1;

 }
 ADDRESS;
 
 }
 ADDRESS;
 

+void rfc822_dequote_comment (char *s);

 void rfc822_free_address (ADDRESS **);
 void rfc822_qualify (ADDRESS *, const char *);
 ADDRESS *rfc822_parse_adrlist (ADDRESS *, const char *s);
 void rfc822_free_address (ADDRESS **);
 void rfc822_qualify (ADDRESS *, const char *);
 ADDRESS *rfc822_parse_adrlist (ADDRESS *, const char *s);

-ADDRESS *rfc822_cpy_adr (ADDRESS *addr);
+ADDRESS *rfc822_cpy_adr (ADDRESS *addr, int);

 ADDRESS *rfc822_cpy_adr_real (ADDRESS *addr);
 ADDRESS *rfc822_cpy_adr_real (ADDRESS *addr);

-ADDRESS *rfc822_append (ADDRESS **a, ADDRESS *b);
+ADDRESS *rfc822_append (ADDRESS **a, ADDRESS *b, int);

 int rfc822_write_address (char *, size_t, ADDRESS *, int);
 void rfc822_write_address_single (char *, size_t, ADDRESS *, int);
 void rfc822_free_address (ADDRESS **addr);
 void rfc822_cat (char *, size_t, const char *, const char *);
 int rfc822_valid_msgid (const char *msgid);
 int rfc822_write_address (char *, size_t, ADDRESS *, int);
 void rfc822_write_address_single (char *, size_t, ADDRESS *, int);
 void rfc822_free_address (ADDRESS **addr);
 void rfc822_cat (char *, size_t, const char *, const char *);
 int rfc822_valid_msgid (const char *msgid);

+int rfc822_remove_from_adrlist (ADDRESS **a, const char *mailbox);

 
 extern int RFC822Error;
 extern const char *RFC822Errors[];
 
 #define rfc822_error(x) RFC822Errors[x]
 
 extern int RFC822Error;
 extern const char *RFC822Errors[];
 
 #define rfc822_error(x) RFC822Errors[x]

-#define rfc822_new_address() calloc(1,sizeof(ADDRESS))
+#define rfc822_new_address() safe_calloc(1,sizeof(ADDRESS))

 
 #endif /* rfc822_h */
 
 #endif /* rfc822_h */