projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
commands.c
diff --git
a/commands.c
b/commands.c
index
5626cb8
..
13d26e2
100644
(file)
--- a/
commands.c
+++ b/
commands.c
@@
-17,7
+17,6
@@
#include "mutt_menu.h"
#include "mime.h"
#include "sort.h"
#include "mutt_menu.h"
#include "mime.h"
#include "sort.h"
-#include "mailbox.h"
#include "copy.h"
#include "mx.h"
#include "pager.h"
#include "copy.h"
#include "mx.h"
#include "pager.h"
@@
-36,6
+35,11
@@
#include "buffy.h"
#endif
#include "buffy.h"
#endif
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+#include "lib/debug.h"
+
#include <errno.h>
#include <unistd.h>
#include <stdlib.h>
#include <errno.h>
#include <unistd.h>
#include <stdlib.h>
@@
-119,7
+123,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);
builtin = 1;
else {
mutt_make_string (buf, sizeof (buf), NONULL (PagerFmt), Context, cur);
@@
-348,7
+352,7
@@
static int _mutt_pipe_message (HEADER * h, char *cmd,
mutt_endwin (NULL);
if ((thepid = mutt_create_filter (cmd, &fpout, NULL, NULL)) < 0) {
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;
}
return 1;
}
@@
-379,7
+383,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) {
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;
}
return 1;
}
@@
-396,7
+400,7
@@
static int _mutt_pipe_message (HEADER * h, char *cmd,
else {
mutt_endwin (NULL);
if ((thepid = mutt_create_filter (cmd, &fpout, NULL, NULL)) < 0) {
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;
}
return 1;
}
@@
-720,7
+724,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>
*/
/* 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));
strfcpy (buf, LastSaveFolder, sizeof (buf));
else
strfcpy (LastSaveFolder, buf, sizeof (LastSaveFolder));
@@
-738,7
+742,7
@@
int mutt_save_message (HEADER * h, int delete,
mutt_message (_("Copying to %s..."), buf);
#ifdef USE_IMAP
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:
switch (imap_copy_messages (Context, h, buf, delete)) {
/* success */
case 0:
@@
-776,7
+780,7
@@
int mutt_save_message (HEADER * h, int delete,
#ifdef BUFFY_SIZE
tmp = mutt_find_mailbox (buf);
if (tmp && tmp->new <= 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) {
#else
/* fix up the times so buffy won't get confused */
if (st.st_mtime > st.st_atime) {
@@
-807,26
+811,26
@@
int mutt_update_list_file (char *filename, char *section, char *key,
int ext = 0, done = 0, r = 0;
snprintf (oldfile, sizeof (oldfile), "%s.bak", filename);
int ext = 0, done = 0, r = 0;
snprintf (oldfile, sizeof (oldfile), "%s.bak", filename);
- d
print (1, (debugfile,
"Renaming %s to %s\n", filename, oldfile));
+ d
ebug_print (1, (
"Renaming %s to %s\n", filename, oldfile));
/* if file not exist, create it */
if ((ifp = safe_fopen (filename, "a")))
fclose (ifp);
if (_mutt_rename_file (filename, oldfile, 1)) {
/* if file not exist, create it */
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);
}
return (-1);
}
- d
print (1, (debugfile,
"Opening %s\n", oldfile));
+ d
ebug_print (1, (
"Opening %s\n", oldfile));
if (!(ifp = safe_fopen (oldfile, "r"))) {
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);
}
return (-1);
}
- d
print (1, (debugfile,
"Opening %s\n", filename));
+ d
ebug_print (1, (
"Opening %s\n", filename));
if (!(ofp = safe_fopen (filename, "w"))) {
fclose (ifp);
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);
}
return (-1);
}
@@
-845,7
+849,7
@@
int mutt_update_list_file (char *filename, char *section, char *key,
while (*c && *c != '\n')
c++;
c[0] = 0; /* strip EOL */
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++;
}
if (r != EOF && !done) {
@@
-873,8
+877,8
@@
int mutt_update_list_file (char *filename, char *section, char *key,
done++;
break;
}
done++;
break;
}
- else if (key && !strncmp (buf, key, strlen (key)) &&
- (!*key || buf[strlen (key)] == ' ')) {
+ else if (key && !strncmp (buf, key, s
afe_s
trlen (key)) &&
+ (!*key || buf[s
afe_s
trlen (key)] == ' ')) {
c = buf;
ext = 0;
while (*c && (*c != '\r') && (*c != '\n'))
c = buf;
ext = 0;
while (*c && (*c != '\r') && (*c != '\n'))
@@
-943,7
+947,7
@@
void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
size_t l;
for (p = b->parameter; p; p = p->next) {
size_t l;
for (p = b->parameter; p; p = p->next) {
- l = strlen (buf);
+ l = s
afe_s
trlen (buf);
rfc822_cat (tmp, sizeof (tmp), p->value, MimeSpecials);
snprintf (buf + l, sizeof (buf) - l, "; %s=%s", p->attribute, tmp);
rfc822_cat (tmp, sizeof (tmp), p->value, MimeSpecials);
snprintf (buf + l, sizeof (buf) - l, "; %s=%s", p->attribute, tmp);