Nico Golde:

[apps/madmutt.git] / commands.c

diff --git a/commands.c b/commands.c
index 5626cb8..b50f9d5 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -17,7 +17,6 @@
 #include "mutt_menu.h"
 #include "mime.h"
 #include "sort.h"
-#include "mailbox.h"
 #include "copy.h"
 #include "mx.h"
 #include "pager.h"
@@ -36,6 +35,10 @@
 #include "buffy.h"
 #endif
 
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -119,7 +122,7 @@ int mutt_display_message (HEADER * cur)
     }
   }
 
-  if (!Pager || mutt_strcmp (Pager, "builtin") == 0)
+  if (!Pager || safe_strcmp (Pager, "builtin") == 0)
     builtin = 1;
   else {
     mutt_make_string (buf, sizeof (buf), NONULL (PagerFmt), Context, cur);
@@ -348,7 +351,7 @@ static int _mutt_pipe_message (HEADER * h, char *cmd,
     mutt_endwin (NULL);
 
     if ((thepid = mutt_create_filter (cmd, &fpout, NULL, NULL)) < 0) {
-      mutt_perror _("Can't create filter process");
+      mutt_perror (_("Can't create filter process"));
 
       return 1;
     }
@@ -379,7 +382,7 @@ static int _mutt_pipe_message (HEADER * h, char *cmd,
                              M_MESSAGEHOOK);
           mutt_endwin (NULL);
           if ((thepid = mutt_create_filter (cmd, &fpout, NULL, NULL)) < 0) {
-            mutt_perror _("Can't create filter process");
+            mutt_perror (_("Can't create filter process"));
 
             return 1;
           }
@@ -396,7 +399,7 @@ static int _mutt_pipe_message (HEADER * h, char *cmd,
     else {
       mutt_endwin (NULL);
       if ((thepid = mutt_create_filter (cmd, &fpout, NULL, NULL)) < 0) {
-        mutt_perror _("Can't create filter process");
+        mutt_perror (_("Can't create filter process"));
 
         return 1;
       }
@@ -720,7 +723,7 @@ int mutt_save_message (HEADER * h, int delete,
   /* This is an undocumented feature of ELM pointed out to me by Felix von
    * Leitner <leitner@prz.fu-berlin.de>
    */
-  if (mutt_strcmp (buf, ".") == 0)
+  if (safe_strcmp (buf, ".") == 0)
     strfcpy (buf, LastSaveFolder, sizeof (buf));
   else
     strfcpy (LastSaveFolder, buf, sizeof (LastSaveFolder));
@@ -738,7 +741,7 @@ int mutt_save_message (HEADER * h, int delete,
   mutt_message (_("Copying to %s..."), buf);
 
 #ifdef USE_IMAP
-  if (Context->magic == M_IMAP && !(decode || decrypt) && mx_is_imap (buf)) {
+  if (Context->magic == M_IMAP && !(decode || decrypt) && mx_get_magic (buf) == M_IMAP) {
     switch (imap_copy_messages (Context, h, buf, delete)) {
       /* success */
     case 0:
@@ -813,20 +816,20 @@ int mutt_update_list_file (char *filename, char *section, char *key,
   if ((ifp = safe_fopen (filename, "a")))
     fclose (ifp);
   if (_mutt_rename_file (filename, oldfile, 1)) {
-    mutt_perror _("Unable to create backup file");
+    mutt_perror (_("Unable to create backup file"));
 
     return (-1);
   }
   dprint (1, (debugfile, "Opening %s\n", oldfile));
   if (!(ifp = safe_fopen (oldfile, "r"))) {
-    mutt_perror _("Unable to open backup file for reading");
+    mutt_perror (_("Unable to open backup file for reading"));
 
     return (-1);
   }
   dprint (1, (debugfile, "Opening %s\n", filename));
   if (!(ofp = safe_fopen (filename, "w"))) {
     fclose (ifp);
-    mutt_perror _("Unable to open new file for writing");
+    mutt_perror (_("Unable to open new file for writing"));
 
     return (-1);
   }
@@ -845,7 +848,7 @@ int mutt_update_list_file (char *filename, char *section, char *key,
       while (*c && *c != '\n')
         c++;
       c[0] = 0;                 /* strip EOL */
-      if (!strncmp (buf, "#: ", 3) && !mutt_strcasecmp (buf + 3, section))
+      if (!strncmp (buf, "#: ", 3) && !safe_strcasecmp (buf + 3, section))
         done++;
     }
     if (r != EOF && !done) {
@@ -873,8 +876,8 @@ int mutt_update_list_file (char *filename, char *section, char *key,
       done++;
       break;
     }
-    else if (key && !strncmp (buf, key, strlen (key)) &&
-             (!*key || buf[strlen (key)] == ' ')) {
+    else if (key && !strncmp (buf, key, safe_strlen (key)) &&
+             (!*key || buf[safe_strlen (key)] == ' ')) {
       c = buf;
       ext = 0;
       while (*c && (*c != '\r') && (*c != '\n'))
@@ -943,7 +946,7 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
     size_t l;
 
     for (p = b->parameter; p; p = p->next) {
-      l = strlen (buf);
+      l = safe_strlen (buf);
 
       rfc822_cat (tmp, sizeof (tmp), p->value, MimeSpecials);
       snprintf (buf + l, sizeof (buf) - l, "; %s=%s", p->attribute, tmp);