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
6a0dc10
..
2054d12
100644
(file)
--- a/
commands.c
+++ b/
commands.c
@@
-25,17
+25,18
@@
#include <lib-lib/file.h>
#include <lib-lib/macros.h>
#include <lib-lib/ascii.h>
#include <lib-lib/file.h>
#include <lib-lib/macros.h>
#include <lib-lib/ascii.h>
-#include <lib-lib/debug.h>
#include <lib-mime/mime.h>
#include <lib-sys/exit.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 <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/menu.h>
#include "mutt.h"
+#include "alias.h"
#include "recvattach.h"
#include "sort.h"
#include "copy.h"
#include "recvattach.h"
#include "sort.h"
#include "copy.h"
@@
-43,7
+44,6
@@
#include "pager.h"
#include <lib-crypt/crypt.h>
#include "mutt_idna.h"
#include "pager.h"
#include <lib-crypt/crypt.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>
@@
-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."));
@@
-841,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);
@@
-856,7
+855,7
@@
void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
return;
/* clean up previous junk */
return;
/* clean up previous junk */
- parameter_
delet
e(&b->parameter);
+ parameter_
list_wip
e(&b->parameter);
p_delete(&b->subtype);
mutt_parse_content_type (buf, b);
p_delete(&b->subtype);
mutt_parse_content_type (buf, b);