exit strfcpy, only use m_strcpy.

[apps/madmutt.git] / alias.c

diff --git a/alias.c b/alias.c
index efed62d..b43689b 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -223,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;
   }
@@ -249,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;
@@ -263,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;
 
@@ -285,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;
 
@@ -312,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);
@@ -409,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;
@@ -422,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;
       }
 
@@ -448,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) {