X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=alias.c;h=835d55a4af6747829b9a98702712022ff6eaaa7c;hp=b1acd23e1042b4e6054501509a12afc452ff5035;hb=91d0c04349c9345f0ee29a61cc18dfc144b60edc;hpb=2ea77d3b2827ba23feb756ce2fb936565ae38998

diff --git a/alias.c b/alias.c
index b1acd23..835d55a 100644
--- a/alias.c
+++ b/alias.c
@@ -17,7 +17,9 @@
 #include <lib-lib/mem.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/str.h>
+#include <lib-lib/file.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/mapping.h>
 
 #include "lib/rx.h"
 #include "lib/debug.h"
@@ -27,7 +29,6 @@
 #include "mutt_curses.h"
 #include "mutt_idna.h"
 #include "mutt_menu.h"
-#include "mapping.h"
 #include "sort.h"
 
 #define RSORT(x) (SortAlias & SORT_REVERSE) ? -x : x
@@ -46,7 +47,7 @@ ADDRESS *mutt_lookup_alias (const char *s)
   ALIAS *t = Aliases;
 
   for (; t; t = t->next)
-    if (!str_casecmp (s, t->name))
+    if (!m_strcasecmp(s, t->name))
       return (t->addr);
   return (NULL);                /* no such alias */
 }
@@ -222,7 +223,7 @@ void mutt_create_alias (ENVELOPE * cur, ADDRESS * iadr)
   }
 
   if (adr && adr->mailbox) {
-    strfcpy (buf, adr->mailbox, sizeof (buf));
+    m_strcpy(buf, sizeof(buf), adr->mailbox);
     if ((pc = strchr (buf, '@')))
       *pc = 0;
   }
@@ -248,7 +249,7 @@ retry_name:
     switch (mutt_yesorno
             (_("Warning: This alias name may not work.  Fix it?"), M_YES)) {
     case M_YES:
-      strfcpy (buf, fixed, sizeof (buf));
+      m_strcpy(buf, sizeof(buf), fixed);
       goto retry_name;
     case -1:
       return;
@@ -262,7 +263,7 @@ retry_name:
   mutt_addrlist_to_local (adr);
 
   if (adr)
-    strfcpy (buf, adr->mailbox, sizeof (buf));
+    m_strcpy(buf, sizeof(buf), adr->mailbox);
   else
     buf[0] = 0;
 
@@ -284,8 +285,8 @@ retry_name:
   }
   while (new->addr == NULL);
 
-  if (adr && adr->personal && !mutt_is_mail_list (adr))
-    strfcpy (buf, adr->personal, sizeof (buf));
+  if (adr && adr->personal && !mutt_is_mail_list(adr))
+    m_strcpy(buf, sizeof(buf), adr->personal);
   else
     buf[0] = 0;
 
@@ -311,15 +312,15 @@ retry_name:
   else
     Aliases = new;
 
-  strfcpy (buf, NONULL (AliasFile), sizeof (buf));
+  m_strcpy(buf, sizeof(buf), NONULL(AliasFile));
   if (mutt_get_field (_("Save to file: "), buf, sizeof (buf), M_FILE) != 0)
     return;
   mutt_expand_path (buf, sizeof (buf));
   if ((rc = safe_fopen (buf, "a"))) {
     if (mutt_check_alias_name (new->name, NULL))
-      mutt_quote_filename (buf, sizeof (buf), new->name);
+      mutt_quote_filename(buf, sizeof(buf), new->name);
     else
-      strfcpy (buf, new->name, sizeof (buf));
+      m_strcpy(buf, sizeof(buf), new->name);
     fprintf (rc, "alias %s ", buf);
     buf[0] = 0;
     rfc822_write_address (buf, sizeof (buf), new->addr, 0);
@@ -408,8 +409,8 @@ int mutt_alias_complete (char *s, size_t buflen)
     while (a) {
       if (a->name && strstr (a->name, s) == a->name) {
         if (!bestname[0])       /* init */
-          strfcpy (bestname, a->name,
-                   min (m_strlen(a->name) + 1, sizeof (bestname)));
+          m_strcpy(bestname, MIN(m_strlen(a->name) + 1, sizeof(bestname)),
+                   a->name);
         else {
           for (i = 0; a->name[i] && a->name[i] == bestname[i]; i++);
           bestname[i] = 0;
@@ -421,7 +422,7 @@ int mutt_alias_complete (char *s, size_t buflen)
     if (bestname[0] != 0) {
       if (m_strcmp(bestname, s) != 0) {
         /* we are adding something to the completion */
-        strfcpy (s, bestname, m_strlen(bestname) + 1);
+        m_strcpy(s, m_strlen(bestname) + 1, bestname);
         return 1;
       }
 
@@ -447,7 +448,7 @@ int mutt_alias_complete (char *s, size_t buflen)
   bestname[0] = 0;
   mutt_alias_menu (bestname, sizeof (bestname), a_list ? a_list : Aliases);
   if (bestname[0] != 0)
-    strfcpy (s, bestname, buflen);
+    m_strcpy(s, buflen, bestname);
 
   /* free the alias list */
   while (a_list) {
@@ -597,7 +598,7 @@ static int alias_SortAlias (const void *a, const void *b)
 {
   ALIAS *pa = *(ALIAS **) a;
   ALIAS *pb = *(ALIAS **) b;
-  int r = str_casecmp (pa->name, pb->name);
+  int r = m_strcasecmp(pa->name, pb->name);
 
   return (RSORT (r));
 }
@@ -616,7 +617,7 @@ static int alias_SortAddress (const void *a, const void *b)
     r = 1;
   else if (pa->personal) {
     if (pb->personal)
-      r = str_casecmp (pa->personal, pb->personal);
+      r = m_strcasecmp(pa->personal, pb->personal);
     else
       r = 1;
   }