X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=edc09da13f866a4a308d9df6b9a6803b20296fd7;hp=2cfb5e86e2f9de23721fb62e15be35d46f9051b7;hb=5e6273c09929249ee7a850934bf12fd03439d923;hpb=ae0ce4dfcafa0c3820f107c5bfa8bd06e5272b57

diff --git a/commands.c b/commands.c
index 2cfb5e8..edc09da 100644
--- a/commands.c
+++ b/commands.c
@@ -53,8 +53,6 @@
 #include <sys/types.h>
 #include <utime.h>
 
-extern char *ReleaseDate;
-
 /* The folder the user last saved to.  Used by ci_save_message() */
 static char LastSaveFolder[_POSIX_PATH_MAX] = "";
 
@@ -250,9 +248,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);
 
@@ -288,13 +286,12 @@ void ci_bounce_message (HEADER * h, int *redraw)
             buf);
 
   if (mutt_strwidth (prompt) > COLS - extra_space) {
-    mutt_format_string (prompt, sizeof (prompt),
-                        0, COLS - extra_space, 0, 0,
-                        prompt, sizeof (prompt), 0);
-    str_cat (prompt, sizeof (prompt), "...?");
+    mutt_format_string(prompt, sizeof(prompt), 0, COLS - extra_space, 0, 0,
+                       prompt, sizeof(prompt), 0);
+    m_strcat(prompt, sizeof(prompt), "...?");
+  } else {
+    m_strcat(prompt, sizeof(prompt), "?");
   }
-  else
-    str_cat (prompt, sizeof (prompt), "?");
 
   if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
     rfc822_free_address (&adr);
@@ -556,7 +553,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);
@@ -751,9 +748,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));
 
@@ -851,10 +848,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;