more moves and dead code

[apps/madmutt.git] / lib-mime / rfc822address.c

diff --git a/lib-mime/rfc822address.c b/lib-mime/rfc822address.c
index 0b06c05..6c11e63 100644 (file)
--- a/lib-mime/rfc822address.c
+++ b/lib-mime/rfc822address.c
@@ -26,14 +26,7 @@
  * please see the file GPL in the top level source directory.
  */
 
  * please see the file GPL in the top level source directory.
  */
 

-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>

 
 #include "mutt_idna.h"
 
 
 #include "mutt_idna.h"
 


@@ -73,6 +66,26 @@ address_t *address_list_dup(const address_t *addr)
     return res;
 }
 
     return res;
 }
 

+/* given a list of addresses, return a list of unique addresses */
+void address_list_uniq(address_t *a)
+{
+    for (; a; a = a->next) {
+        address_t **b = &a->next;
+
+        if (!a->mailbox)
+            continue;
+
+        while (*b) {
+            if ((*b)->mailbox && !ascii_strcasecmp((*b)->mailbox, a->mailbox))
+            {
+                address_t *pop = address_list_pop(b);
+                address_delete(&pop);
+            } else {
+                b = &(*b)->next;
+            }
+        }
+    }
+}

 
 /****************************************************************************/
 /* Parsing functions                                                        */
 
 /****************************************************************************/
 /* Parsing functions                                                        */


@@ -242,7 +255,7 @@ parse_address(const char *s, static_buf *comment, address_t *cur)
     return s;
 }
 
     return s;
 }
 

-address_t **rfc822_eotoken(address_t **last, static_buf *phrase, static_buf *comment)
+static address_t **rfc822_eotoken(address_t **last, static_buf *phrase, static_buf *comment)

 {
     if (phrase->len) {
         const char *s;
 {
     if (phrase->len) {
         const char *s;


@@ -250,7 +263,7 @@ address_t **rfc822_eotoken(address_t **last, static_buf *phrase, static_buf *com
 
         s = parse_address(phrase->buf, comment, cur);
         if (s && *s && *s != ',' && *s != ';') {
 
         s = parse_address(phrase->buf, comment, cur);
         if (s && *s && *s != ',' && *s != ';') {

-            address_delete(&cur);
+            address_list_wipe(&cur);

             return last;
         }
 
             return last;
         }
 


@@ -281,7 +294,7 @@ address_t *rfc822_parse_adrlist(address_t *top, const char *s)
                 stbuf_append_sp(&phrase);
             s = next_phrase(s, &phrase);
             if (!s) {
                 stbuf_append_sp(&phrase);
             s = next_phrase(s, &phrase);
             if (!s) {

-                address_delete(&top);
+                address_list_wipe(&top);

                 return NULL;
             }
             continue;
                 return NULL;
             }
             continue;


@@ -290,7 +303,7 @@ address_t *rfc822_parse_adrlist(address_t *top, const char *s)
             stbuf_append_sp(&comment);
             s = parse_comment(s + 1, &comment);
             if (!s) {
             stbuf_append_sp(&comment);
             s = parse_comment(s + 1, &comment);
             if (!s) {

-                address_delete(&top);
+                address_list_wipe(&top);

                 return NULL;
             }
             continue;
                 return NULL;
             }
             continue;


@@ -305,8 +318,8 @@ address_t *rfc822_parse_adrlist(address_t *top, const char *s)
 
             s = parse_address(skipspaces(s + 1), &comment, cur);
             if (!s || *s != '>' || !cur->mailbox) {
 
             s = parse_address(skipspaces(s + 1), &comment, cur);
             if (!s || *s != '>' || !cur->mailbox) {

-                address_delete(&top);
-                address_delete(&cur);
+                address_list_wipe(&top);
+                address_list_wipe(&cur);

                 return NULL;
             }
 
                 return NULL;
             }