projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove yet anoter round of str_* functions, replaced with their inlineable
[apps/madmutt.git]
/
recvcmd.c
diff --git
a/recvcmd.c
b/recvcmd.c
index
8e18ca9
..
dff5aee
100644
(file)
--- a/
recvcmd.c
+++ b/
recvcmd.c
@@
-11,18
+11,27
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+
#include "mutt.h"
#include "mutt.h"
+#include "enter.h"
+#include "state.h"
+#include "handler.h"
+#include "recvattach.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "rfc1524.h"
#include "mime.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "rfc1524.h"
#include "mime.h"
-#include "mailbox.h"
#include "attach.h"
#include "mapping.h"
#include "mx.h"
#include "copy.h"
#include "mutt_idna.h"
#include "attach.h"
#include "mapping.h"
#include "mx.h"
#include "copy.h"
#include "mutt_idna.h"
+
/* some helper functions to verify that we are exclusively operating
* on message/rfc822 attachments
*/
/* some helper functions to verify that we are exclusively operating
* on message/rfc822 attachments
*/
@@
-146,7
+155,7
@@
void mutt_attach_bounce (FILE * fp, HEADER * hdr,
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);
-
FREE
(&err);
+
p_delete
(&err);
rfc822_free_address (&adr);
return;
}
rfc822_free_address (&adr);
return;
}
@@
-166,10
+175,10
@@
void mutt_attach_bounce (FILE * fp, HEADER * hdr,
mutt_format_string (prompt, sizeof (prompt) - 4,
0, COLS - extra_space, 0, 0,
prompt, sizeof (prompt), 0);
mutt_format_string (prompt, sizeof (prompt) - 4,
0, COLS - extra_space, 0, 0,
prompt, sizeof (prompt), 0);
- safe_strcat (prompt, sizeof (prompt), "...?");
+ m_strcat(prompt, sizeof(prompt), "...?");
+ } else {
+ m_strcat(prompt, sizeof(prompt), "?");
}
}
- else
- safe_strcat (prompt, sizeof (prompt), "?");
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
rfc822_free_address (&adr);
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
rfc822_free_address (&adr);
@@
-436,7
+445,7
@@
static void attach_forward_bodies (FILE * fp, HEADER * hdr,
/* initialize a state structure */
/* initialize a state structure */
-
memset (&st, 0, sizeof (st)
);
+
p_clear(&st, 1
);
if (option (OPTFORWQUOTE))
st.prefix = prefix;
if (option (OPTFORWQUOTE))
st.prefix = prefix;
@@
-680,8
+689,8
@@
attach_reply_envelope_defaults (ENVELOPE * env, ATTACHPTR ** idx,
if ((flags & SENDNEWS)) {
/* in case followup set Newsgroups: with Followup-To: if it present */
if (!env->newsgroups && curenv &&
if ((flags & SENDNEWS)) {
/* in case followup set Newsgroups: with Followup-To: if it present */
if (!env->newsgroups && curenv &&
- m
utt_strcasecmp
(curenv->followup_to, "poster"))
- env->newsgroups =
safe_strdup
(curenv->followup_to);
+ m
_strcasecmp
(curenv->followup_to, "poster"))
+ env->newsgroups =
m_strdup
(curenv->followup_to);
}
else
#endif
}
else
#endif
@@
-821,7
+830,7
@@
void mutt_attach_reply (FILE * fp, HEADER * hdr,
else {
mutt_make_attribution (Context, parent, tmpfp);
else {
mutt_make_attribution (Context, parent, tmpfp);
-
memset (&st, 0, sizeof (STATE)
);
+
p_clear(&st, 1
);
st.fpin = fp;
st.fpout = tmpfp;
st.fpin = fp;
st.fpout = tmpfp;