X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=remailer.c;h=783ee59da3c264a7360ddc6a9507aec214c497c5;hp=83cb55676de2f32664755e05a78c1fe4dab30f18;hb=a8477ebaa09990b3688164cbe5cf661c4189541d;hpb=c3e57678c8be193fc137854020f3a90887be97c9

diff --git a/remailer.c b/remailer.c
index 83cb556..783ee59 100644
--- a/remailer.c
+++ b/remailer.c
@@ -18,11 +18,15 @@
 #include "mutt.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>
@@ -151,7 +155,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 +164,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 +177,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;
@@ -230,7 +234,7 @@ static void mix_screen_coordinates (REMAILER ** type2_list,
 
   if (i) {
     c =
-      coords[i - 1].c + 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 +245,7 @@ static void mix_screen_coordinates (REMAILER ** type2_list,
 
   for (; i < chain->cl; i++) {
     oc = c;
-    c += 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 +431,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;
   }