projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
send.c
diff --git
a/send.c
b/send.c
index
c9cbb3b
..
d777335
100644
(file)
--- a/
send.c
+++ b/
send.c
@@
-25,6
+25,7
@@
#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
+#include "lib/debug.h"
#include <ctype.h>
#include <stdlib.h>
#include <ctype.h>
#include <stdlib.h>
@@
-659,7
+660,7
@@
void mutt_make_misc_reply_headers (ENVELOPE * env, CONTEXT * ctx,
*/
if (curenv->real_subj) {
FREE (&env->subject);
*/
if (curenv->real_subj) {
FREE (&env->subject);
- env->subject = safe_malloc (
safe
_strlen (curenv->real_subj) + 5);
+ env->subject = safe_malloc (
mutt
_strlen (curenv->real_subj) + 5);
sprintf (env->subject, "Re: %s", curenv->real_subj); /* __SPRINTF_CHECKED__ */
}
else if (!env->subject)
sprintf (env->subject, "Re: %s", curenv->real_subj); /* __SPRINTF_CHECKED__ */
}
else if (!env->subject)
@@
-995,7
+996,7
@@
ADDRESS *mutt_default_from (void)
else if (option (OPTUSEDOMAIN)) {
adr = rfc822_new_address ();
adr->mailbox =
else if (option (OPTUSEDOMAIN)) {
adr = rfc822_new_address ();
adr->mailbox =
- safe_malloc (
safe_strlen (Username) + safe
_strlen (fqdn) + 2);
+ safe_malloc (
mutt_strlen (Username) + mutt
_strlen (fqdn) + 2);
sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn)); /* __SPRINTF_CHECKED__ */
}
else {
sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn)); /* __SPRINTF_CHECKED__ */
}
else {
@@
-1208,10
+1209,8
@@
int ci_send_message (int flags, /* send mode */
}
if (!tempfp) {
}
if (!tempfp) {
- dprint (1,
- (debugfile,
- "newsend_message: can't create tempfile %s (errno=%d)\n",
- msg->content->filename, errno));
+ debug_print (1, ("can't create tempfile %s (errno=%d)\n",
+ msg->content->filename, errno));
mutt_perror (msg->content->filename);
goto cleanup;
}
mutt_perror (msg->content->filename);
goto cleanup;
}
@@
-1315,7
+1314,7
@@
int ci_send_message (int flags, /* send mode */
if (option (OPTSIGONTOP)
&& (!(flags & (SENDMAILX | SENDKEY)) && Editor
if (option (OPTSIGONTOP)
&& (!(flags & (SENDMAILX | SENDKEY)) && Editor
- &&
safe
_strcmp (Editor, "builtin") != 0))
+ &&
mutt
_strcmp (Editor, "builtin") != 0))
append_signature (tempfp);
/* include replies/forwarded messages, unless we are given a template */
append_signature (tempfp);
/* include replies/forwarded messages, unless we are given a template */
@@
-1325,7
+1324,7
@@
int ci_send_message (int flags, /* send mode */
if (!option (OPTSIGONTOP)
&& (!(flags & (SENDMAILX | SENDKEY)) && Editor
if (!option (OPTSIGONTOP)
&& (!(flags & (SENDMAILX | SENDKEY)) && Editor
- &&
safe
_strcmp (Editor, "builtin") != 0))
+ &&
mutt
_strcmp (Editor, "builtin") != 0))
append_signature (tempfp);
/*
append_signature (tempfp);
/*
@@
-1438,7
+1437,7
@@
int ci_send_message (int flags, /* send mode */
/* If the this isn't a text message, look for a mailcap edit command */
if (mutt_needs_mailcap (msg->content))
mutt_edit_attachment (msg->content);
/* If the this isn't a text message, look for a mailcap edit command */
if (mutt_needs_mailcap (msg->content))
mutt_edit_attachment (msg->content);
- else if (!Editor ||
safe
_strcmp ("builtin", Editor) == 0)
+ else if (!Editor ||
mutt
_strcmp ("builtin", Editor) == 0)
mutt_builtin_editor (msg->content->filename, msg, cur);
else if (option (OPTEDITHDRS)) {
mutt_env_to_local (msg->env);
mutt_builtin_editor (msg->content->filename, msg, cur);
else if (option (OPTEDITHDRS)) {
mutt_env_to_local (msg->env);
@@
-1662,11
+1661,11
@@
int ci_send_message (int flags, /* send mode */
*/
#ifdef USE_IMAP
*/
#ifdef USE_IMAP
- if ((flags & SENDBATCH) && fcc[0] && mx_
is_imap (fcc)
)
+ if ((flags & SENDBATCH) && fcc[0] && mx_
get_magic (fcc) == M_IMAP
)
fcc[0] = '\0';
#endif
fcc[0] = '\0';
#endif
- if (*fcc &&
safe
_strcmp ("/dev/null", fcc) != 0) {
+ if (*fcc &&
mutt
_strcmp ("/dev/null", fcc) != 0) {
BODY *tmpbody = msg->content;
BODY *save_sig = NULL;
BODY *save_parts = NULL;
BODY *tmpbody = msg->content;
BODY *save_sig = NULL;
BODY *save_parts = NULL;
@@
-1677,8
+1676,8
@@
int ci_send_message (int flags, /* send mode */
/* check to see if the user wants copies of all attachments */
if (!option (OPTFCCATTACH) && msg->content->type == TYPEMULTIPART) {
if (WithCrypto
/* check to see if the user wants copies of all attachments */
if (!option (OPTFCCATTACH) && msg->content->type == TYPEMULTIPART) {
if (WithCrypto
- && (
safe
_strcmp (msg->content->subtype, "encrypted") == 0 ||
-
safe
_strcmp (msg->content->subtype, "signed") == 0)) {
+ && (
mutt
_strcmp (msg->content->subtype, "encrypted") == 0 ||
+
mutt
_strcmp (msg->content->subtype, "signed") == 0)) {
if (clear_content->type == TYPEMULTIPART) {
if (!(msg->security & ENCRYPT) && (msg->security & SIGN)) {
/* save initial signature and attachments */
if (clear_content->type == TYPEMULTIPART) {
if (!(msg->security & ENCRYPT) && (msg->security & SIGN)) {
/* save initial signature and attachments */