projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
begin to rework mailcap parsing a "bit".
[apps/madmutt.git]
/
commands.c
diff --git
a/commands.c
b/commands.c
index
58eaaa5
..
2054d12
100644
(file)
--- a/
commands.c
+++ b/
commands.c
@@
-12,6
+12,15
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/wait.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <utime.h>
+
#include <lib-lib/mem.h>
#include <lib-lib/file.h>
#include <lib-lib/macros.h>
#include <lib-lib/mem.h>
#include <lib-lib/file.h>
#include <lib-lib/macros.h>
@@
-19,41
+28,32
@@
#include <lib-mime/mime.h>
#include <lib-mime/mime.h>
+#include <lib-sys/exit.h>
+#include <lib-sys/unix.h>
+
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
+
#include "mutt.h"
#include "mutt.h"
-#include "
enter
.h"
+#include "
alias
.h"
#include "recvattach.h"
#include "recvattach.h"
-#include "mutt_curses.h"
-#include "mutt_menu.h"
#include "sort.h"
#include "copy.h"
#include "mx.h"
#include "pager.h"
#include "sort.h"
#include "copy.h"
#include "mx.h"
#include "pager.h"
-#include
"mutt_crypt.h"
+#include
<lib-crypt/crypt.h>
#include "mutt_idna.h"
#include "mutt_idna.h"
-#include "rfc1524.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#ifdef USE_IMAP
-#include "imap.h"
-#endif
+#include <imap/imap.h>
#ifdef BUFFY_SIZE
#include "buffy.h"
#endif
#ifdef BUFFY_SIZE
#include "buffy.h"
#endif
-#include "lib/debug.h"
-
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <utime.h>
-
/* The folder the user last saved to. Used by ci_save_message() */
static char LastSaveFolder[_POSIX_PATH_MAX] = "";
/* The folder the user last saved to. Used by ci_save_message() */
static char LastSaveFolder[_POSIX_PATH_MAX] = "";
@@
-142,7
+142,6
@@
int mutt_display_message (HEADER * cur)
(option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) |
CH_DECODE | CH_FROM);
if (res == 0 && (ferror(fpout) || feof(fpout))) {
(option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) |
CH_DECODE | CH_FROM);
if (res == 0 && (ferror(fpout) || feof(fpout))) {
- debug_print (1, ("_mutt_copy_message failed to detect EOF!\n"));
res = -1;
}
res = -1;
}
@@
-241,7
+240,7
@@
void ci_bounce_message (HEADER * h, int *redraw)
char prompt[SHORT_STRING];
char buf[HUGE_STRING] = { 0 };
address_t *adr = NULL;
char prompt[SHORT_STRING];
char buf[HUGE_STRING] = { 0 };
address_t *adr = NULL;
- char *err = NULL;
+ c
onst c
har *err = NULL;
int rc;
if (h)
int rc;
if (h)
@@
-270,7
+269,7
@@
void ci_bounce_message (HEADER * h, int *redraw)
if (mutt_addrlist_to_idna (adr, &err) < 0) {
mutt_error (_("Bad IDN: '%s'"), err);
p_delete(&err);
if (mutt_addrlist_to_idna (adr, &err) < 0) {
mutt_error (_("Bad IDN: '%s'"), err);
p_delete(&err);
- address_
delete
(&adr);
+ address_
list_wipe
(&adr);
return;
}
return;
}
@@
-291,7
+290,7
@@
void ci_bounce_message (HEADER * h, int *redraw)
}
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
}
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
- address_
delete
(&adr);
+ address_
list_wipe
(&adr);
CLEARLINE (LINES - 1);
mutt_message (h ? _("Message not bounced.") : _("Messages not bounced."));
return;
CLEARLINE (LINES - 1);
mutt_message (h ? _("Message not bounced.") : _("Messages not bounced."));
return;
@@
-300,7
+299,7
@@
void ci_bounce_message (HEADER * h, int *redraw)
CLEARLINE (LINES - 1);
rc = mutt_bounce_message (NULL, h, adr);
CLEARLINE (LINES - 1);
rc = mutt_bounce_message (NULL, h, adr);
- address_
delete
(&adr);
+ address_
list_wipe
(&adr);
/* If no error, or background, display message. */
if ((rc == 0) || (rc == S_BKG))
mutt_message (h ? _("Message bounced.") : _("Messages bounced."));
/* If no error, or background, display message. */
if ((rc == 0) || (rc == S_BKG))
mutt_message (h ? _("Message bounced.") : _("Messages bounced."));
@@
-754,7
+753,6
@@
int mutt_save_message (HEADER * h, int delete,
mutt_message (_("Copying to %s..."), buf);
mutt_message (_("Copying to %s..."), buf);
-#ifdef USE_IMAP
if (Context->magic == M_IMAP && !(decode || decrypt) && mx_get_magic (buf) == M_IMAP) {
switch (imap_copy_messages (Context, h, buf, delete)) {
/* success */
if (Context->magic == M_IMAP && !(decode || decrypt) && mx_get_magic (buf) == M_IMAP) {
switch (imap_copy_messages (Context, h, buf, delete)) {
/* success */
@@
-769,7
+767,6
@@
int mutt_save_message (HEADER * h, int delete,
return -1;
}
}
return -1;
}
}
-#endif
if (mx_open_mailbox (buf, M_APPEND, &ctx) != NULL) {
if (h) {
if (mx_open_mailbox (buf, M_APPEND, &ctx) != NULL) {
if (h) {
@@
-843,7
+840,7
@@
void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
snprintf (buf, sizeof (buf), "%s/%s", TYPE (b), b->subtype);
m_strcpy(obuf, sizeof(obuf), buf);
if (b->parameter) {
snprintf (buf, sizeof (buf), "%s/%s", TYPE (b), b->subtype);
m_strcpy(obuf, sizeof(obuf), buf);
if (b->parameter) {
- size_t l;
+ s
s
ize_t l;
for (p = b->parameter; p; p = p->next) {
l = m_strlen(buf);
for (p = b->parameter; p; p = p->next) {
l = m_strlen(buf);
@@
-858,7
+855,7
@@
void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
return;
/* clean up previous junk */
return;
/* clean up previous junk */
-
mutt_free_parameter
(&b->parameter);
+
parameter_list_wipe
(&b->parameter);
p_delete(&b->subtype);
mutt_parse_content_type (buf, b);
p_delete(&b->subtype);
mutt_parse_content_type (buf, b);
@@
-895,14
+892,14
@@
void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
b->force_charset |= charset_changed ? 1 : 0;
b->force_charset |= charset_changed ? 1 : 0;
- if (!is_multipart
(b) && b->parts)
+ if (!is_multipart(b) && b->parts)
mutt_free_body (&b->parts);
if (!mutt_is_message_type (b->type, b->subtype) && b->hdr) {
b->hdr->content = NULL;
mutt_free_body (&b->parts);
if (!mutt_is_message_type (b->type, b->subtype) && b->hdr) {
b->hdr->content = NULL;
-
mutt_free_header
(&b->hdr);
+
header_delete
(&b->hdr);
}
}
- if (fp && (is_multipart
(b) || mutt_is_message_type
(b->type, b->subtype)))
+ if (fp && (is_multipart
(b) || mutt_is_message_type
(b->type, b->subtype)))
mutt_parse_part (fp, b);
if (h) {
mutt_parse_part (fp, b);
if (h) {