projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make some code yet more simple, using the VERY good semantics of snprintf
[apps/madmutt.git]
/
send.c
diff --git
a/send.c
b/send.c
index
d282321
..
1773589
100644
(file)
--- a/
send.c
+++ b/
send.c
@@
-8,7
+8,6
@@
*/
#include <lib-lib/lib-lib.h>
*/
#include <lib-lib/lib-lib.h>
-#include <utime.h>
#include <lib-mime/mime.h>
#include <lib-mime/rfc3676.h>
#include <lib-mime/mime.h>
#include <lib-mime/rfc3676.h>
@@
-28,10
+27,7
@@
#include <nntp/nntp.h>
#endif
#include <nntp/nntp.h>
#endif
-#ifdef MIXMASTER
#include "remailer.h"
#include "remailer.h"
-#endif
-
static void append_signature (FILE * f)
{
static void append_signature (FILE * f)
{
@@
-607,7
+603,7
@@
void mutt_make_misc_reply_headers (ENVELOPE * env,
if (curenv->real_subj) {
p_delete(&env->subject);
env->subject = p_new(char, m_strlen(curenv->real_subj) + 5);
if (curenv->real_subj) {
p_delete(&env->subject);
env->subject = p_new(char, m_strlen(curenv->real_subj) + 5);
- sprintf (env->subject, "Re: %s", curenv->real_subj);
/* __SPRINTF_CHECKED__ */
+ sprintf (env->subject, "Re: %s", curenv->real_subj);
}
else if (!env->subject)
env->subject = m_strdup("Re: your mail");
}
else if (!env->subject)
env->subject = m_strdup("Re: your mail");
@@
-956,7
+952,7
@@
address_t *mutt_default_from (void)
else if (option (OPTUSEDOMAIN)) {
adr = address_new ();
adr->mailbox = p_new(char, m_strlen(Username) + m_strlen(fqdn) + 2);
else if (option (OPTUSEDOMAIN)) {
adr = address_new ();
adr->mailbox = p_new(char, m_strlen(Username) + m_strlen(fqdn) + 2);
- sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn));
/* __SPRINTF_CHECKED__ */
+ sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn));
}
else {
adr = address_new ();
}
else {
adr = address_new ();
@@
-977,14
+973,8
@@
static int send_message (HEADER * msg)
if (!tempfp)
return -1;
if (!tempfp)
return -1;
-#ifdef MIXMASTER
mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0,
msg->chain ? 1 : 0);
mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0,
msg->chain ? 1 : 0);
-#endif
-#ifndef MIXMASTER
- mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0, 0);
-#endif
-
fputc ('\n', tempfp); /* tie off the header. */
if ((mutt_write_mime_body (msg->content, tempfp) == -1)) {
fputc ('\n', tempfp); /* tie off the header. */
if ((mutt_write_mime_body (msg->content, tempfp) == -1)) {
@@
-999,10
+989,8
@@
static int send_message (HEADER * msg)
return (-1);
}
return (-1);
}
-#ifdef MIXMASTER
if (msg->chain)
return mix_send_message (msg->chain, tempfile);
if (msg->chain)
return mix_send_message (msg->chain, tempfile);
-#endif
i = mutt_invoke_mta (msg->env->from, msg->env->to, msg->env->cc,
msg->env->bcc, tempfile,
i = mutt_invoke_mta (msg->env->from, msg->env->to, msg->env->cc,
msg->env->bcc, tempfile,
@@
-1055,7
+1043,7
@@
int mutt_resend_message (FILE * fp, CONTEXT * ctx, HEADER * cur)
{
HEADER *msg = header_new();
{
HEADER *msg = header_new();
- if (mutt_prepare_template (fp, ctx, msg, cur,
1
) < 0)
+ if (mutt_prepare_template (fp, ctx, msg, cur,
option(OPTWEED)
) < 0)
return -1;
return ci_send_message (SENDRESEND, msg, NULL, ctx, cur);
return -1;
return ci_send_message (SENDRESEND, msg, NULL, ctx, cur);
@@
-1376,7
+1364,7
@@
int ci_send_message (int flags, /* send mode */
if (!(flags & SENDBATCH)) {
struct stat st;
if (!(flags & SENDBATCH)) {
struct stat st;
- time_t mtime = m
utt_decrease_mtime
(msg->content->filename, NULL);
+ time_t mtime = m
_decrease_mtime
(msg->content->filename, NULL);
mutt_update_encoding (msg->content);
mutt_update_encoding (msg->content);