rfc822 final touch

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

diff --git a/lib-mime/mime.h b/lib-mime/mime.h
index f2e7b6a..6f20910 100644 (file)
--- a/lib-mime/mime.h
+++ b/lib-mime/mime.h
@@ -31,6 +31,9 @@
 
 #include <stdlib.h>
 
+#include <lib-lib/mem.h>
+#include <lib-lib/list.h>
+
 /* Content-Type */
 enum {
     TYPEOTHER,
@@ -87,16 +90,6 @@ extern const char *BodyEncodings[];
 /*                Standard for ARPA Internet Text Messages                  */
 /****************************************************************************/
 
-/* possible values for RFC822Error */
-enum {
-    ERR_MEMORY = 1,
-    ERR_MISMATCH_PAREN,
-    ERR_MISMATCH_QUOTE,
-    ERR_BAD_ROUTE,
-    ERR_BAD_ROUTE_ADDR,
-    ERR_BAD_ADDR_SPEC
-};
-
 typedef struct address_t {
     char *personal;               /* real name of address */
     char *mailbox;                /* mailbox and host address */
@@ -104,22 +97,28 @@ typedef struct address_t {
     struct address_t *next;
 } address_t;
 
-void rfc822_free_address(address_t **);
+DO_INIT(address_t, address);
+void address_wipe(address_t *);
+
+DO_NEW(address_t, address);
+DO_DELETE(address_t, address);
+DO_SLIST(address_t, address);
+
+
+address_t *address_dup(address_t *addr);
+address_t *address_list_dup(address_t *addr);
 void rfc822_qualify(address_t *, const char *);
+
 address_t *rfc822_parse_adrlist(address_t *, const char *s);
-address_t *rfc822_cpy_adr(address_t * addr);
-address_t *rfc822_cpy_adr_real(address_t * addr);
-address_t *rfc822_append(address_t ** a, address_t * b);
-void rfc822_write_address(char *, size_t, address_t *, int);
-void rfc822_write_address_single(char *, size_t, address_t *, int);
-void rfc822_cat(char *, size_t, const char *, const char *);
+
+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 int RFC822Error;
-extern const char *RFC822Errors[];
 extern const char RFC822Specials[];
 
 #define rfc822_error(x) RFC822Errors[x]
-#define rfc822_new_address() calloc(1,sizeof(address_t))
 
 /****************************************************************************/
 /* RFC 2231                                                                 */