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
d789804
..
fd4bf77
100644
(file)
--- a/
send.c
+++ b/
send.c
@@
-214,7
+214,7
@@
static int edit_envelope (ENVELOPE * en, int flags)
if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) != 0)
return (-1);
FREE (&en->newsgroups);
if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) != 0)
return (-1);
FREE (&en->newsgroups);
- en->newsgroups = s
afe_str
dup (buf);
+ en->newsgroups = s
tr_
dup (buf);
if (en->followup_to)
strfcpy (buf, en->followup_to, sizeof (buf));
if (en->followup_to)
strfcpy (buf, en->followup_to, sizeof (buf));
@@
-224,7
+224,7
@@
static int edit_envelope (ENVELOPE * en, int flags)
&& mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) != 0)
return (-1);
FREE (&en->followup_to);
&& mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) != 0)
return (-1);
FREE (&en->followup_to);
- en->followup_to = s
afe_str
dup (buf);
+ en->followup_to = s
tr_
dup (buf);
if (en->x_comment_to)
strfcpy (buf, en->x_comment_to, sizeof (buf));
if (en->x_comment_to)
strfcpy (buf, en->x_comment_to, sizeof (buf));
@@
-234,7
+234,7
@@
static int edit_envelope (ENVELOPE * en, int flags)
&& mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) != 0)
return (-1);
FREE (&en->x_comment_to);
&& mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) != 0)
return (-1);
FREE (&en->x_comment_to);
- en->x_comment_to = s
afe_str
dup (buf);
+ en->x_comment_to = s
tr_
dup (buf);
}
else
#endif
}
else
#endif
@@
-300,7
+300,7
@@
static int edit_envelope (ENVELOPE * en, int flags)
char *nntp_get_header (const char *s)
{
SKIPWS (s);
char *nntp_get_header (const char *s)
{
SKIPWS (s);
- return s
afe_str
dup (s);
+ return s
tr_
dup (s);
}
#endif
}
#endif
@@
-363,7
+363,7
@@
static void process_user_header (ENVELOPE * env)
}
else
last = env->userhdrs = mutt_new_list ();
}
else
last = env->userhdrs = mutt_new_list ();
- last->data = s
afe_str
dup (uh->data);
+ last->data = s
tr_
dup (uh->data);
}
}
}
}
}
}
@@
-374,7
+374,7
@@
LIST *mutt_copy_list (LIST * p)
for (; p; p = p->next) {
t = (LIST *) safe_malloc (sizeof (LIST));
for (; p; p = p->next) {
t = (LIST *) safe_malloc (sizeof (LIST));
- t->data = s
afe_str
dup (p->data);
+ t->data = s
tr_
dup (p->data);
t->next = NULL;
if (l) {
r->next = t;
t->next = NULL;
if (l) {
r->next = t;
@@
-617,7
+617,7
@@
LIST *mutt_make_references (ENVELOPE * e)
if (e->message_id) {
t = mutt_new_list ();
if (e->message_id) {
t = mutt_new_list ();
- t->data = s
afe_str
dup (e->message_id);
+ t->data = s
tr_
dup (e->message_id);
t->next = l;
l = t;
}
t->next = l;
l = t;
}
@@
-660,15
+660,15
@@
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 (s
afe_str
len (curenv->real_subj) + 5);
+ env->subject = safe_malloc (s
tr_
len (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)
- env->subject = s
afe_str
dup ("Re: your mail");
+ env->subject = s
tr_
dup ("Re: your mail");
#ifdef USE_NNTP
if (option (OPTNEWSSEND) && option (OPTXCOMMENTTO) && curenv->from)
#ifdef USE_NNTP
if (option (OPTNEWSSEND) && option (OPTXCOMMENTTO) && curenv->from)
- env->x_comment_to = s
afe_str
dup (mutt_get_name (curenv->from));
+ env->x_comment_to = s
tr_
dup (mutt_get_name (curenv->from));
#endif
}
#endif
}
@@
-696,7
+696,7
@@
void mutt_add_to_reference_headers (ENVELOPE * env, ENVELOPE * curenv,
if (curenv->message_id) {
*q = mutt_new_list ();
if (curenv->message_id) {
*q = mutt_new_list ();
- (*q)->data = s
afe_str
dup (curenv->message_id);
+ (*q)->data = s
tr_
dup (curenv->message_id);
}
if (pp)
}
if (pp)
@@
-759,8
+759,8
@@
envelope_defaults (ENVELOPE * env, CONTEXT * ctx, HEADER * cur, int flags)
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 &&
- s
afe_str
casecmp (curenv->followup_to, "poster"))
- env->newsgroups = s
afe_str
dup (curenv->followup_to);
+ s
tr_
casecmp (curenv->followup_to, "poster"))
+ env->newsgroups = s
tr_
dup (curenv->followup_to);
}
else
#endif
}
else
#endif
@@
-903,7
+903,7
@@
void mutt_set_followup_to (ENVELOPE * e)
#ifdef USE_NNTP
if (option (OPTNEWSSEND)) {
if (!e->followup_to && e->newsgroups && (strrchr (e->newsgroups, ',')))
#ifdef USE_NNTP
if (option (OPTNEWSSEND)) {
if (!e->followup_to && e->newsgroups && (strrchr (e->newsgroups, ',')))
- e->followup_to = s
afe_str
dup (e->newsgroups);
+ e->followup_to = s
tr_
dup (e->newsgroups);
return;
}
#endif
return;
}
#endif
@@
-976,7
+976,7
@@
static ADDRESS *set_reverse_name (ENVELOPE * env)
if (!option (OPTREVREAL))
FREE (&tmp->personal);
if (!tmp->personal)
if (!option (OPTREVREAL))
FREE (&tmp->personal);
if (!tmp->personal)
- tmp->personal = s
afe_str
dup (Realname);
+ tmp->personal = s
tr_
dup (Realname);
}
return (tmp);
}
}
return (tmp);
}
@@
-996,12
+996,12
@@
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 (s
afe_strlen (Username) + safe_str
len (fqdn) + 2);
+ safe_malloc (s
tr_len (Username) + str_
len (fqdn) + 2);
sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn)); /* __SPRINTF_CHECKED__ */
}
else {
adr = rfc822_new_address ();
sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn)); /* __SPRINTF_CHECKED__ */
}
else {
adr = rfc822_new_address ();
- adr->mailbox = s
afe_str
dup (NONULL (Username));
+ adr->mailbox = s
tr_
dup (NONULL (Username));
}
return (adr);
}
return (adr);
@@
-1135,7
+1135,7
@@
int ci_send_message (int flags, /* send mode */
if ((WithCrypto & APPLICATION_PGP) && (flags & SENDPOSTPONED))
if ((WithCrypto & APPLICATION_PGP) && (flags & SENDPOSTPONED))
- signas = s
afe_str
dup (PgpSignAs);
+ signas = s
tr_
dup (PgpSignAs);
/* Delay expansion of aliases until absolutely necessary--shouldn't
* be necessary unless we are prompting the user or about to execute a
/* Delay expansion of aliases until absolutely necessary--shouldn't
* be necessary unless we are prompting the user or about to execute a
@@
-1201,11
+1201,11
@@
int ci_send_message (int flags, /* send mode */
if (!tempfile) {
mutt_mktemp (buffer);
tempfp = safe_fopen (buffer, "w+");
if (!tempfile) {
mutt_mktemp (buffer);
tempfp = safe_fopen (buffer, "w+");
- msg->content->filename = s
afe_str
dup (buffer);
+ msg->content->filename = s
tr_
dup (buffer);
}
else {
tempfp = safe_fopen (tempfile, "a+");
}
else {
tempfp = safe_fopen (tempfile, "a+");
- msg->content->filename = s
afe_str
dup (tempfile);
+ msg->content->filename = s
tr_
dup (tempfile);
}
if (!tempfp) {
}
if (!tempfp) {
@@
-1259,7
+1259,7
@@
int ci_send_message (int flags, /* send mode */
#ifdef USE_NNTP
if ((flags & SENDNEWS) && ctx && ctx->magic == M_NNTP
&& !msg->env->newsgroups)
#ifdef USE_NNTP
if ((flags & SENDNEWS) && ctx && ctx->magic == M_NNTP
&& !msg->env->newsgroups)
- msg->env->newsgroups = s
afe_str
dup (((NNTP_DATA *) ctx->data)->group);
+ msg->env->newsgroups = s
tr_
dup (((NNTP_DATA *) ctx->data)->group);
#endif
if (!(flags & SENDMAILX) &&
#endif
if (!(flags & SENDMAILX) &&
@@
-1314,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
- && s
afe_str
cmp (Editor, "builtin") != 0))
+ && s
tr_
cmp (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 */
@@
-1324,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
- && s
afe_str
cmp (Editor, "builtin") != 0))
+ && s
tr_
cmp (Editor, "builtin") != 0))
append_signature (tempfp);
/*
append_signature (tempfp);
/*
@@
-1404,7
+1404,7
@@
int ci_send_message (int flags, /* send mode */
that $realname can be set in a send-hook */
if (msg->env->from && !msg->env->from->personal
&& !(flags & (SENDRESEND | SENDPOSTPONED)))
that $realname can be set in a send-hook */
if (msg->env->from && !msg->env->from->personal
&& !(flags & (SENDRESEND | SENDPOSTPONED)))
- msg->env->from->personal = s
afe_str
dup (Realname);
+ msg->env->from->personal = s
tr_
dup (Realname);
if (!((WithCrypto & APPLICATION_PGP) && (flags & SENDKEY)))
safe_fclose (&tempfp);
if (!((WithCrypto & APPLICATION_PGP) && (flags & SENDKEY)))
safe_fclose (&tempfp);
@@
-1437,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 || s
afe_str
cmp ("builtin", Editor) == 0)
+ else if (!Editor || s
tr_
cmp ("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);
@@
-1665,7
+1665,7
@@
int ci_send_message (int flags, /* send mode */
fcc[0] = '\0';
#endif
fcc[0] = '\0';
#endif
- if (*fcc && s
afe_str
cmp ("/dev/null", fcc) != 0) {
+ if (*fcc && s
tr_
cmp ("/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;
@@
-1676,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
- && (s
afe_str
cmp (msg->content->subtype, "encrypted") == 0 ||
- s
afe_str
cmp (msg->content->subtype, "signed") == 0)) {
+ && (s
tr_
cmp (msg->content->subtype, "encrypted") == 0 ||
+ s
tr_
cmp (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 */