Nico Golde:

[apps/madmutt.git] / rfc822.c

diff --git a/rfc822.c b/rfc822.c
index 6f92f73..f1c86e9 100644 (file)
--- a/rfc822.c
+++ b/rfc822.c
@@ -15,21 +15,13 @@
 #include <ctype.h>
 #include <stdlib.h>
 
-#ifndef TESTING
 #include "mutt.h"
-#else
-#define safe_strdup strdup
-#define safe_malloc malloc
-#define SKIPWS(x) while(isspace(*x))x++
-#define FREE(x) safe_free(x)
-#define ISSPACE isspace
-#define strfcpy(a,b,c) {if (c) {strncpy(a,b,c);a[c-1]=0;}}
-#define STRING 128
-#include "rfc822.h"
-#endif
-
 #include "mutt_idna.h"
 
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+
 #define terminate_string(a, b, c) do { if ((b) < (c)) a[(b)] = 0; else \
        a[(c)] = 0; } while (0)
 
@@ -728,31 +720,3 @@ ADDRESS *rfc822_append (ADDRESS ** a, ADDRESS * b)
     tmp = tmp->next;
   return tmp;
 }
-
-#ifdef TESTING
-int safe_free (void **p)
-{
-  free (*p);                    /* __MEM_CHECKED__ */
-  *p = 0;
-}
-
-int main (int argc, char **argv)
-{
-  ADDRESS *list;
-  char buf[256];
-
-# if 0
-  char *str =
-    "michael, Michael Elkins <me@mutt.org>, testing a really complex address: this example <@contains.a.source.route,@with.multiple.hosts:address@example.com>;, lothar@of.the.hillpeople (lothar)";
-# else
-  char *str = "a b c ";
-# endif
-
-  list = rfc822_parse_adrlist (NULL, str);
-  buf[0] = 0;
-  rfc822_write_address (buf, sizeof (buf), list);
-  rfc822_free_address (&list);
-  puts (buf);
-  exit (0);
-}
-#endif