Rocco Rutte:

[apps/madmutt.git] / remailer.c

diff --git a/remailer.c b/remailer.c
index ee5182e..70b31ac 100644 (file)
--- a/remailer.c
+++ b/remailer.c
@@ -16,13 +16,18 @@
 #endif
 
 #include "mutt.h"
+#include "recvattach.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
-#include "mutt_regex.h"
 #include "mapping.h"
 
 #include "remailer.h"
 
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+#include "lib/rx.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -96,7 +101,7 @@ static void mix_add_entry (REMAILER *** type2_list, REMAILER * entry,
 {
   if (*used == *slots) {
     *slots += 5;
-    safe_realloc (type2_list, sizeof (REMAILER *) * (*slots));
+    mem_realloc (type2_list, sizeof (REMAILER *) * (*slots));
   }
 
   (*type2_list)[(*used)++] = entry;
@@ -106,16 +111,16 @@ static void mix_add_entry (REMAILER *** type2_list, REMAILER * entry,
 
 static REMAILER *mix_new_remailer (void)
 {
-  return safe_calloc (1, sizeof (REMAILER));
+  return mem_calloc (1, sizeof (REMAILER));
 }
 
 static void mix_free_remailer (REMAILER ** r)
 {
-  FREE (&(*r)->shortname);
-  FREE (&(*r)->addr);
-  FREE (&(*r)->ver);
+  mem_free (&(*r)->shortname);
+  mem_free (&(*r)->addr);
+  mem_free (&(*r)->ver);
 
-  FREE (r);
+  mem_free (r);
 }
 
 /* parse the type2.list as given by mixmaster -T */
@@ -151,7 +156,7 @@ static REMAILER **mix_type2_list (size_t * l)
   /* first, generate the "random" remailer */
 
   p = mix_new_remailer ();
-  p->shortname = safe_strdup ("<random>");
+  p->shortname = str_dup ("<random>");
   mix_add_entry (&type2_list, p, &slots, &used);
 
   while (fgets (line, sizeof (line), fp)) {
@@ -160,12 +165,12 @@ static REMAILER **mix_type2_list (size_t * l)
     if (!(t = strtok (line, " \t\n")))
       goto problem;
 
-    p->shortname = safe_strdup (t);
+    p->shortname = str_dup (t);
 
     if (!(t = strtok (NULL, " \t\n")))
       goto problem;
 
-    p->addr = safe_strdup (t);
+    p->addr = str_dup (t);
 
     if (!(t = strtok (NULL, " \t\n")))
       goto problem;
@@ -173,7 +178,7 @@ static REMAILER **mix_type2_list (size_t * l)
     if (!(t = strtok (NULL, " \t\n")))
       goto problem;
 
-    p->ver = safe_strdup (t);
+    p->ver = str_dup (t);
 
     if (!(t = strtok (NULL, " \t\n")))
       goto problem;
@@ -205,7 +210,7 @@ static void mix_free_type2_list (REMAILER *** ttlp)
   for (i = 0; type2_list[i]; i++)
     mix_free_remailer (&type2_list[i]);
 
-  FREE (type2_list);
+  mem_free (type2_list);
 }
 
 
@@ -224,13 +229,13 @@ static void mix_screen_coordinates (REMAILER ** type2_list,
   if (!chain->cl)
     return;
 
-  safe_realloc (coordsp, sizeof (struct coord) * chain->cl);
+  mem_realloc (coordsp, sizeof (struct coord) * chain->cl);
 
   coords = *coordsp;
 
   if (i) {
     c =
-      coords[i - 1].c + mutt_strlen (type2_list[chain->ch[i - 1]]->shortname) + 2;
+      coords[i - 1].c + str_len (type2_list[chain->ch[i - 1]]->shortname) + 2;
     r = coords[i - 1].r;
   }
   else {
@@ -241,7 +246,7 @@ static void mix_screen_coordinates (REMAILER ** type2_list,
 
   for (; i < chain->cl; i++) {
     oc = c;
-    c += mutt_strlen (type2_list[chain->ch[i]]->shortname) + 2;
+    c += str_len (type2_list[chain->ch[i]]->shortname) + 2;
 
     if (c >= COLS) {
       oc = c = MIX_HOFFSET;
@@ -427,7 +432,7 @@ static int mix_chain_add (MIXCHAIN * chain, const char *s,
   if (chain->cl >= MAXMIXES)
     return -1;
 
-  if (!mutt_strcmp (s, "0") || !ascii_strcasecmp (s, "<random>")) {
+  if (!str_cmp (s, "0") || !ascii_strcasecmp (s, "<random>")) {
     chain->ch[chain->cl++] = 0;
     return 0;
   }
@@ -486,7 +491,7 @@ void mix_make_chain (LIST ** chainp, int *redraw)
 
   *redraw = REDRAW_FULL;
 
-  chain = safe_calloc (sizeof (MIXCHAIN), 1);
+  chain = mem_calloc (sizeof (MIXCHAIN), 1);
   for (p = *chainp; p; p = p->next)
     mix_chain_add (chain, (char *) p->data, type2_list);
 
@@ -653,8 +658,8 @@ void mix_make_chain (LIST ** chainp, int *redraw)
   }
 
   mix_free_type2_list (&type2_list);
-  FREE (&coords);
-  FREE (&chain);
+  mem_free (&coords);
+  mem_free (&chain);
 }
 
 /* some safety checks before piping the message to mixmaster */