#include "mutt_menu.h"
#include "mime.h"
#include "sort.h"
-#include "mailbox.h"
#include "copy.h"
#include "mx.h"
#include "pager.h"
#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>
}
}
- 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);
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;
}
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;
}
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;
}
/* 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));
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:
#ifdef BUFFY_SIZE
tmp = mutt_find_mailbox (buf);
if (tmp && tmp->new <= 0)
- mutt_update_mailbox (tmp);
+ buffy_update_mailbox (tmp);
#else
/* fix up the times so buffy won't get confused */
if (st.st_mtime > st.st_atime) {
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);
}
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) {
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'))
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);