exit strfcpy, only use m_strcpy.

[apps/madmutt.git] / keymap.c

diff --git a/keymap.c b/keymap.c
index 0c450f7..bc577b7 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -144,7 +144,7 @@ static int parsekeys (const char *str, keycode_t * d, int max)
   char c;
   char *s, *t;
 
-  strfcpy (buff, str, sizeof (buff));
+  m_strcpy(buff, sizeof(buff), str);
   s = buff;
 
   while (*s && len) {
@@ -492,7 +492,7 @@ int km_expand_key (char *s, size_t len, struct keymap_t *map)
     return (0);
 
   for (;;) {
-    strfcpy (s, km_keyname (map->keys[p]), len);
+    m_strcpy(s, len, km_keyname(map->keys[p]));
     len -= (l = m_strlen(s));
 
     if (++p >= map->len || !len)
@@ -661,7 +661,7 @@ int mutt_parse_push (BUFFER * buf, BUFFER * s, unsigned long data,
 
   mutt_extract_token (buf, s, M_TOKEN_CONDENSE);
   if (MoreArgs (s)) {
-    strfcpy (err->data, _("push: too many arguments"), err->dsize);
+    m_strcpy(err->data, err->dsize, _("push: too many arguments"));
     r = -1;
   }
   else
@@ -703,13 +703,13 @@ static char *parse_keymap (int *menu, BUFFER * s, int maxmenus, int *nummenus,
     mutt_extract_token (&buf, s, 0);
 
     if (!*buf.data) {
-      strfcpy (err->data, _("null key sequence"), err->dsize);
+      m_strcpy(err->data, err->dsize, _("null key sequence"));
     }
     else if (MoreArgs (s))
       return (buf.data);
   }
   else {
-    strfcpy (err->data, _("too few arguments"), err->dsize);
+    m_strcpy(err->data, err->dsize, _("too few arguments"));
   }
 error:
   p_delete(&buf.data);
@@ -788,7 +788,7 @@ int mutt_parse_bind (BUFFER * buf, BUFFER * s, unsigned long data,
   /* function to execute */
   mutt_extract_token (buf, s, 0);
   if (MoreArgs (s)) {
-    strfcpy (err->data, _("bind: too many arguments"), err->dsize);
+    m_strcpy(err->data, err->dsize, _("bind: too many arguments"));
     r = -1;
   }
   else if (ascii_strcasecmp ("noop", buf->data) == 0) {
@@ -833,7 +833,7 @@ int mutt_parse_macro (BUFFER * buf, BUFFER * s, unsigned long data,
   mutt_extract_token (buf, s, M_TOKEN_CONDENSE);
   /* make sure the macro sequence is not an empty string */
   if (!*buf->data) {
-    strfcpy (err->data, _("macro: empty key sequence"), err->dsize);
+    m_strcpy(err->data, err->dsize, _("macro: empty key sequence"));
   }
   else {
     if (MoreArgs (s)) {
@@ -841,7 +841,7 @@ int mutt_parse_macro (BUFFER * buf, BUFFER * s, unsigned long data,
       mutt_extract_token (buf, s, M_TOKEN_CONDENSE);
 
       if (MoreArgs (s)) {
-        strfcpy (err->data, _("macro: too many arguments"), err->dsize);
+        m_strcpy(err->data, err->dsize, _("macro: too many arguments"));
       }
       else {
         for (i = 0; i < nummenus; ++i) {
@@ -873,7 +873,7 @@ int mutt_parse_exec (BUFFER * buf, BUFFER * s, unsigned long data,
   char *function;
 
   if (!MoreArgs (s)) {
-    strfcpy (err->data, _("exec: no arguments"), err->dsize);
+    m_strcpy(err->data, err->dsize, _("exec: no arguments"));
     return (-1);
   }