projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move hash.[hc] into lib-lib/
[apps/madmutt.git]
/
commands.c
diff --git
a/commands.c
b/commands.c
index
3eea904
..
889ac8a
100644
(file)
--- a/
commands.c
+++ b/
commands.c
@@
-12,10
+12,14
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+
+#include <lib-lib/macros.h>
+#include <lib-lib/ascii.h>
+
#include "mutt.h"
#include "enter.h"
#include "recvattach.h"
#include "mutt.h"
#include "enter.h"
#include "recvattach.h"
-#include "ascii.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mime.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mime.h"
@@
-38,9
+42,6
@@
#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 "lib/debug.h"
#include <errno.h>
@@
-155,8
+156,16
@@
int mutt_display_message (HEADER * cur)
mutt_wait_filter (filterpid);
safe_fclose (&fpfilterout);
}
mutt_wait_filter (filterpid);
safe_fclose (&fpfilterout);
}
+#if 0
+ /* this is maybe just plain wrong but it makes the pager display
+ * what we have; i.e. for the crypto stuff we only get
+ * 'Could not copy message' for invalid passphrases, no PGP output
+ * not nothing; so just display what we have...
+ * - pdmef
+ */
mutt_unlink (tempfile);
return 0;
mutt_unlink (tempfile);
return 0;
+#endif
}
if (fpfilterout != NULL && mutt_wait_filter (filterpid) != 0)
}
if (fpfilterout != NULL && mutt_wait_filter (filterpid) != 0)
@@
-205,7
+214,7
@@
int mutt_display_message (HEADER * cur)
}
/* Invoke the builtin pager */
}
/* Invoke the builtin pager */
-
memset (&info, 0, sizeof (pager_t)
);
+
p_clear(&info, 1
);
info.hdr = cur;
info.ctx = Context;
rc = mutt_pager (NULL, tempfile, M_PAGER_MESSAGE, &info);
info.hdr = cur;
info.ctx = Context;
rc = mutt_pager (NULL, tempfile, M_PAGER_MESSAGE, &info);
@@
-265,7
+274,7
@@
void ci_bounce_message (HEADER * h, int *redraw)
if (mutt_addrlist_to_idna (adr, &err) < 0) {
mutt_error (_("Bad IDN: '%s'"), err);
if (mutt_addrlist_to_idna (adr, &err) < 0) {
mutt_error (_("Bad IDN: '%s'"), err);
-
mem_free
(&err);
+
p_delete
(&err);
rfc822_free_address (&adr);
return;
}
rfc822_free_address (&adr);
return;
}
@@
-342,8
+351,8
@@
static void pipe_msg (HEADER * h, FILE * fp, int decode, int print)
/* the following code is shared between printing and piping */
/* the following code is shared between printing and piping */
-static int _mutt_pipe_message
(HEADER * h, char *cmd
,
-
int decode, int print, int split,
char *sep)
+static int _mutt_pipe_message
(HEADER * h, char *cmd, int decode, int print
,
+
int split, const
char *sep)
{
int i, rc = 0;
{
int i, rc = 0;
@@
-571,9
+580,9
@@
void mutt_enter_command (void)
return;
err.data = errbuf;
err.dsize = sizeof (errbuf);
return;
err.data = errbuf;
err.dsize = sizeof (errbuf);
-
memset (&token, 0, sizeof (token)
);
+
p_clear(&token, 1
);
r = mutt_parse_rc_line (buffer, &token, &err);
r = mutt_parse_rc_line (buffer, &token, &err);
-
mem_free
(&token.data);
+
p_delete
(&token.data);
if (errbuf[0]) {
/* since errbuf could potentially contain printf() sequences in it,
we must call mutt_error() in this fashion so that vsprintf()
if (errbuf[0]) {
/* since errbuf could potentially contain printf() sequences in it,
we must call mutt_error() in this fashion so that vsprintf()
@@
-587,11
+596,11
@@
void mutt_enter_command (void)
void mutt_display_address (ENVELOPE * env)
{
void mutt_display_address (ENVELOPE * env)
{
- char *pfx = NULL;
+ c
onst c
har *pfx = NULL;
char buf[SHORT_STRING];
ADDRESS *adr = NULL;
char buf[SHORT_STRING];
ADDRESS *adr = NULL;
- adr = mutt_get_address
(env, &pfx);
+ adr = mutt_get_address(env, &pfx);
if (!adr)
return;
if (!adr)
return;
@@
-825,7
+834,7
@@
int mutt_save_message (HEADER * h, int delete,
void mutt_version (void)
{
void mutt_version (void)
{
- mutt_message (mutt_make_version ());
+ mutt_message (mutt_make_version (
1
));
}
void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
}
void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
@@
-850,7
+859,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 =
str_len
(buf);
+ l =
m_strlen
(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);
@@
-863,7
+872,7
@@
void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
/* clean up previous junk */
mutt_free_parameter (&b->parameter);
/* clean up previous junk */
mutt_free_parameter (&b->parameter);
-
mem_free
(&b->subtype);
+
p_delete
(&b->subtype);
mutt_parse_content_type (buf, b);
mutt_parse_content_type (buf, b);