X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=alias.c;h=a41c8d8b4e173262d6170b651128b73c731aadb8;hp=f092a8caa04eea7cce8693324982b89d30c0906b;hb=68e9c3fe5664c1e13093e24dd15415ac000af70c;hpb=fa7f733a61a6fe3143198791ab470ddf4d08fdbe

diff --git a/alias.c b/alias.c
index f092a8c..a41c8d8 100644
--- a/alias.c
+++ b/alias.c
@@ -28,7 +28,7 @@ ADDRESS *mutt_lookup_alias (const char *s)
   ALIAS *t = Aliases;
 
   for (; t; t = t->next)
-    if (!mutt_strcasecmp (s, t->name))
+    if (!safe_strcasecmp (s, t->name))
       return (t->addr);
   return (NULL);                /* no such alias */
 }
@@ -48,7 +48,7 @@ static ADDRESS *mutt_expand_aliases_r (ADDRESS * a, LIST ** expn)
       if (t) {
         i = 0;
         for (u = *expn; u; u = u->next) {
-          if (mutt_strcmp (a->mailbox, u->data) == 0) { /* alias already found */
+          if (safe_strcmp (a->mailbox, u->data) == 0) { /* alias already found */
             dprint (1,
                     (debugfile,
                      "mutt_expand_aliases_r(): loop in alias found for '%s'\n",
@@ -85,7 +85,7 @@ static ADDRESS *mutt_expand_aliases_r (ADDRESS * a, LIST ** expn)
           char namebuf[STRING];
 
           mutt_gecos_name (namebuf, sizeof (namebuf), pw);
-          mutt_str_replace (&a->personal, namebuf);
+          str_replace (&a->personal, namebuf);
 
 #ifdef EXACT_ADDRESS
           FREE (&a->val);
@@ -398,7 +398,7 @@ int mutt_alias_complete (char *s, size_t buflen)
       if (a->name && strstr (a->name, s) == a->name) {
         if (!bestname[0])       /* init */
           strfcpy (bestname, a->name,
-                   min (mutt_strlen (a->name) + 1, sizeof (bestname)));
+                   min (safe_strlen (a->name) + 1, sizeof (bestname)));
         else {
           for (i = 0; a->name[i] && a->name[i] == bestname[i]; i++);
           bestname[i] = 0;
@@ -408,9 +408,9 @@ int mutt_alias_complete (char *s, size_t buflen)
     }
 
     if (bestname[0] != 0) {
-      if (mutt_strcmp (bestname, s) != 0) {
+      if (safe_strcmp (bestname, s) != 0) {
         /* we are adding something to the completion */
-        strfcpy (s, bestname, mutt_strlen (bestname) + 1);
+        strfcpy (s, bestname, safe_strlen (bestname) + 1);
         return 1;
       }