X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=3a53ac7006f1e11947dbbddc343c713a4144bc26;hp=aae6e61635640c7040b7dcae372d3273222b630e;hb=bec523bb3ad78ec9100efb18fb58d43d38b304de;hpb=1c16e9623a9fb6a15bb284a6f7322b583ebc06a7

diff --git a/commands.c b/commands.c
index aae6e61..3a53ac7 100644
--- a/commands.c
+++ b/commands.c
@@ -250,9 +250,9 @@ void ci_bounce_message (HEADER * h, int *redraw)
   int rc;
 
   if (h)
-    strfcpy (prompt, _("Bounce message to: "), sizeof (prompt));
+    m_strcpy(prompt, sizeof(prompt), _("Bounce message to: "));
   else
-    strfcpy (prompt, _("Bounce tagged messages to: "), sizeof (prompt));
+    m_strcpy(prompt, sizeof(prompt), _("Bounce tagged messages to: "));
 
   rc = mutt_get_field (prompt, buf, sizeof (buf), M_ALIAS);
 
@@ -555,7 +555,7 @@ void mutt_shell_escape (void)
   buf[0] = 0;
   if (mutt_get_field (_("Shell command: "), buf, sizeof (buf), M_CMD) == 0) {
     if (!buf[0] && Shell)
-      strfcpy (buf, Shell, sizeof (buf));
+      m_strcpy(buf, sizeof(buf), Shell);
     if (buf[0]) {
       CLEARLINE (LINES - 1);
       mutt_endwin (NULL);
@@ -750,9 +750,9 @@ int mutt_save_message (HEADER * h, int delete,
    * Leitner <leitner@prz.fu-berlin.de>
    */
   if (m_strcmp(buf, ".") == 0)
-    strfcpy (buf, LastSaveFolder, sizeof (buf));
+    m_strcpy(buf, sizeof(buf), LastSaveFolder);
   else
-    strfcpy (LastSaveFolder, buf, sizeof (LastSaveFolder));
+    m_strcpy(LastSaveFolder, sizeof(LastSaveFolder), buf);
 
   mutt_expand_path (buf, sizeof (buf));
 
@@ -850,10 +850,10 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
   short type_changed = 0;
 
   cp = mutt_get_parameter ("charset", b->parameter);
-  strfcpy (charset, NONULL (cp), sizeof (charset));
+  m_strcpy(charset, sizeof(charset), NONULL(cp));
 
   snprintf (buf, sizeof (buf), "%s/%s", TYPE (b), b->subtype);
-  strfcpy (obuf, buf, sizeof (obuf));
+  m_strcpy(obuf, sizeof(obuf), buf);
   if (b->parameter) {
     size_t l;