X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=remailer.c;h=32399936c3ee3bdb681f2561941474ded0ff6c56;hp=927be73f022ae60f84c0ca0dce54993d5bc341ff;hb=9d2f1c9b6d2984bb6ee3e0a6c1709a678a801776;hpb=74a2265af51ce89bca845adc1d68f273c9933c13

diff --git a/remailer.c b/remailer.c
index 927be73..3239993 100644
--- a/remailer.c
+++ b/remailer.c
@@ -18,7 +18,6 @@
 #include "mutt.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
-#include "mutt_regex.h"
 #include "mapping.h"
 
 #include "remailer.h"
@@ -26,6 +25,7 @@
 #include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/str.h"
+#include "lib/rx.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -234,7 +234,7 @@ static void mix_screen_coordinates (REMAILER ** type2_list,
 
   if (i) {
     c =
-      coords[i - 1].c + mutt_strlen (type2_list[chain->ch[i - 1]]->shortname) + 2;
+      coords[i - 1].c + safe_strlen (type2_list[chain->ch[i - 1]]->shortname) + 2;
     r = coords[i - 1].r;
   }
   else {
@@ -245,7 +245,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 += safe_strlen (type2_list[chain->ch[i]]->shortname) + 2;
 
     if (c >= COLS) {
       oc = c = MIX_HOFFSET;
@@ -431,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 (!safe_strcmp (s, "0") || !ascii_strcasecmp (s, "<random>")) {
     chain->ch[chain->cl++] = 0;
     return 0;
   }