projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
small fixes.
[apps/madmutt.git]
/
send.c
diff --git
a/send.c
b/send.c
index
b4dbd3a
..
7b4b9bc
100644
(file)
--- a/
send.c
+++ b/
send.c
@@
-11,14
+11,19
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+
+#include <lib-mime/mime.h>
+
#include "mutt.h"
#include "enter.h"
#include "mutt.h"
#include "enter.h"
-#include "ascii.h"
#include "mutt_curses.h"
#include "mutt_curses.h"
-#include "rfc2047.h"
#include "rfc3676.h"
#include "keymap.h"
#include "rfc3676.h"
#include "keymap.h"
-#include "mime.h"
#include "copy.h"
#include "mx.h"
#include "mutt_crypt.h"
#include "copy.h"
#include "mx.h"
#include "mutt_crypt.h"
@@
-26,9
+31,6
@@
#include "url.h"
#include "attach.h"
#include "url.h"
#include "attach.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <ctype.h>
#include "lib/debug.h"
#include <ctype.h>
@@
-74,7
+76,7
@@
static void append_signature (FILE * f)
}
/* compare two e-mail addresses and return 1 if they are equivalent */
}
/* compare two e-mail addresses and return 1 if they are equivalent */
-static int mutt_addrcmp (
ADDRESS * a, ADDRESS
* b)
+static int mutt_addrcmp (
address_t * a, address_t
* b)
{
if (!a->mailbox || !b->mailbox)
return 0;
{
if (!a->mailbox || !b->mailbox)
return 0;
@@
-84,7
+86,7
@@
static int mutt_addrcmp (ADDRESS * a, ADDRESS * b)
}
/* search an e-mail address in a list */
}
/* search an e-mail address in a list */
-static int mutt_addrsrc (
ADDRESS * a, ADDRESS
* lst)
+static int mutt_addrsrc (
address_t * a, address_t
* lst)
{
for (; lst; lst = lst->next) {
if (mutt_addrcmp (a, lst))
{
for (; lst; lst = lst->next) {
if (mutt_addrcmp (a, lst))
@@
-94,9
+96,9
@@
static int mutt_addrsrc (ADDRESS * a, ADDRESS * lst)
}
/* removes addresses from "b" which are contained in "a" */
}
/* removes addresses from "b" which are contained in "a" */
-static
ADDRESS *mutt_remove_xrefs (ADDRESS * a, ADDRESS
* b)
+static
address_t *mutt_remove_xrefs (address_t * a, address_t
* b)
{
{
-
ADDRESS
*top, *p, *prev = NULL;
+
address_t
*top, *p, *prev = NULL;
top = b;
while (b) {
top = b;
while (b) {
@@
-108,13
+110,13
@@
static ADDRESS *mutt_remove_xrefs (ADDRESS * a, ADDRESS * b)
if (prev) {
prev->next = b->next;
b->next = NULL;
if (prev) {
prev->next = b->next;
b->next = NULL;
-
rfc822_free_address
(&b);
+
address_delete
(&b);
b = prev;
}
else {
top = top->next;
b->next = NULL;
b = prev;
}
else {
top = top->next;
b->next = NULL;
-
rfc822_free_address
(&b);
+
address_delete
(&b);
b = top;
}
}
b = top;
}
}
@@
-129,9
+131,9
@@
static ADDRESS *mutt_remove_xrefs (ADDRESS * a, ADDRESS * b)
/* remove any address which matches the current user. if `leave_only' is
* nonzero, don't remove the user's address if it is the only one in the list
*/
/* remove any address which matches the current user. if `leave_only' is
* nonzero, don't remove the user's address if it is the only one in the list
*/
-static
ADDRESS *remove_user (ADDRESS
* a, int leave_only)
+static
address_t *remove_user (address_t
* a, int leave_only)
{
{
-
ADDRESS
*top = NULL, *last = NULL;
+
address_t
*top = NULL, *last = NULL;
while (a) {
if (!mutt_addr_is_user (a)) {
while (a) {
if (!mutt_addr_is_user (a)) {
@@
-145,12
+147,12
@@
static ADDRESS *remove_user (ADDRESS * a, int leave_only)
last->next = NULL;
}
else {
last->next = NULL;
}
else {
-
ADDRESS
*tmp = a;
+
address_t
*tmp = a;
a = a->next;
if (!leave_only || a || last) {
tmp->next = NULL;
a = a->next;
if (!leave_only || a || last) {
tmp->next = NULL;
-
rfc822_free_address
(&tmp);
+
address_delete
(&tmp);
}
else
last = top = tmp;
}
else
last = top = tmp;
@@
-159,26
+161,26
@@
static ADDRESS *remove_user (ADDRESS * a, int leave_only)
return top;
}
return top;
}
-static
ADDRESS *find_mailing_lists (ADDRESS * t, ADDRESS
* c)
+static
address_t *find_mailing_lists (address_t * t, address_t
* c)
{
{
-
ADDRESS
*top = NULL, *ptr = NULL;
+
address_t
*top = NULL, *ptr = NULL;
for (; t || c; t = c, c = NULL) {
for (; t; t = t->next) {
if (mutt_is_mail_list (t) && !t->group) {
if (top) {
for (; t || c; t = c, c = NULL) {
for (; t; t = t->next) {
if (mutt_is_mail_list (t) && !t->group) {
if (top) {
- ptr->next =
rfc822_cpy_adr_real
(t);
+ ptr->next =
address_dup
(t);
ptr = ptr->next;
}
else
ptr = ptr->next;
}
else
- ptr = top =
rfc822_cpy_adr_real
(t);
+ ptr = top =
address_dup
(t);
}
}
}
return top;
}
}
}
}
return top;
}
-static int edit_address (
ADDRESS ** a, /* const */
char *field)
+static int edit_address (
address_t ** a, const
char *field)
{
char buf[HUGE_STRING];
char *err = NULL;
{
char buf[HUGE_STRING];
char *err = NULL;
@@
-190,13
+192,13
@@
static int edit_address (ADDRESS ** a, /* const */ char *field)
rfc822_write_address (buf, sizeof (buf), *a, 0);
if (mutt_get_field (field, buf, sizeof (buf), M_ALIAS) != 0)
return (-1);
rfc822_write_address (buf, sizeof (buf), *a, 0);
if (mutt_get_field (field, buf, sizeof (buf), M_ALIAS) != 0)
return (-1);
-
rfc822_free_address
(a);
+
address_delete
(a);
*a = mutt_expand_aliases (mutt_parse_adrlist (NULL, buf));
if ((idna_ok = mutt_addrlist_to_idna (*a, &err)) != 0) {
mutt_error (_("Error: '%s' is a bad IDN."), err);
mutt_refresh ();
mutt_sleep (2);
*a = mutt_expand_aliases (mutt_parse_adrlist (NULL, buf));
if ((idna_ok = mutt_addrlist_to_idna (*a, &err)) != 0) {
mutt_error (_("Error: '%s' is a bad IDN."), err);
mutt_refresh ();
mutt_sleep (2);
-
mem_free
(&err);
+
p_delete
(&err);
}
}
while (idna_ok != 0);
}
}
while (idna_ok != 0);
@@
-212,33
+214,33
@@
static int edit_envelope (ENVELOPE * en, int flags)
#ifdef USE_NNTP
if (option (OPTNEWSSEND)) {
if (en->newsgroups)
#ifdef USE_NNTP
if (option (OPTNEWSSEND)) {
if (en->newsgroups)
-
strfcpy (buf, en->newsgroups, sizeof (buf)
);
+
m_strcpy(buf, sizeof(buf), en->newsgroups
);
else
buf[0] = 0;
if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) != 0)
return (-1);
else
buf[0] = 0;
if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) != 0)
return (-1);
-
mem_free
(&en->newsgroups);
- en->newsgroups =
str_dup
(buf);
+
p_delete
(&en->newsgroups);
+ en->newsgroups =
m_strdup
(buf);
if (en->followup_to)
if (en->followup_to)
-
strfcpy (buf, en->followup_to, sizeof (buf)
);
+
m_strcpy(buf, sizeof(buf), en->followup_to
);
else
buf[0] = 0;
if (option (OPTASKFOLLOWUP)
&& mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) != 0)
return (-1);
else
buf[0] = 0;
if (option (OPTASKFOLLOWUP)
&& mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) != 0)
return (-1);
-
mem_free
(&en->followup_to);
- en->followup_to =
str_dup
(buf);
+
p_delete
(&en->followup_to);
+ en->followup_to =
m_strdup
(buf);
if (en->x_comment_to)
if (en->x_comment_to)
-
strfcpy (buf, en->x_comment_to, sizeof (buf)
);
+
m_strcpy(buf, sizeof(buf), en->x_comment_to
);
else
buf[0] = 0;
if (option (OPTXCOMMENTTO) && option (OPTASKXCOMMENTTO)
&& mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) != 0)
return (-1);
else
buf[0] = 0;
if (option (OPTXCOMMENTTO) && option (OPTASKXCOMMENTTO)
&& mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) != 0)
return (-1);
-
mem_free
(&en->x_comment_to);
- en->x_comment_to =
str_dup
(buf);
+
p_delete
(&en->x_comment_to);
+ en->x_comment_to =
m_strdup
(buf);
}
else
#endif
}
else
#endif
@@
-255,7
+257,7
@@
static int edit_envelope (ENVELOPE * en, int flags)
if (option (OPTFASTREPLY))
return (0);
else
if (option (OPTFASTREPLY))
return (0);
else
-
strfcpy (buf, en->subject, sizeof (buf)
);
+
m_strcpy(buf, sizeof(buf), en->subject
);
}
else {
char *p;
}
else {
char *p;
@@
-263,9
+265,8
@@
static int edit_envelope (ENVELOPE * en, int flags)
buf[0] = 0;
for (; uh; uh = uh->next) {
if (ascii_strncasecmp ("subject:", uh->data, 8) == 0) {
buf[0] = 0;
for (; uh; uh = uh->next) {
if (ascii_strncasecmp ("subject:", uh->data, 8) == 0) {
- p = uh->data + 8;
- SKIPWS (p);
- strncpy (buf, p, sizeof (buf));
+ p = vskipspaces(uh->data + 8);
+ m_strcpy(buf, sizeof(buf), p);
}
}
}
}
}
}
@@
-295,16
+296,15
@@
static int edit_envelope (ENVELOPE * en, int flags)
return (-1);
}
return (-1);
}
-
str_replace
(&en->subject, buf);
+
m_strreplace
(&en->subject, buf);
return 0;
}
#ifdef USE_NNTP
return 0;
}
#ifdef USE_NNTP
-char *nntp_get_header
(const char *s)
+char *nntp_get_header(const char *s)
{
{
- SKIPWS (s);
- return str_dup (s);
+ return m_strdup(skipspaces(s));
}
#endif
}
#endif
@@
-342,15
+342,15
@@
static void process_user_header (ENVELOPE * env)
for (; uh; uh = uh->next) {
if (ascii_strncasecmp ("from:", uh->data, 5) == 0) {
/* User has specified a default From: address. Remove default address */
for (; uh; uh = uh->next) {
if (ascii_strncasecmp ("from:", uh->data, 5) == 0) {
/* User has specified a default From: address. Remove default address */
-
rfc822_free_address
(&env->from);
+
address_delete
(&env->from);
env->from = rfc822_parse_adrlist (env->from, uh->data + 5);
}
else if (ascii_strncasecmp ("reply-to:", uh->data, 9) == 0) {
env->from = rfc822_parse_adrlist (env->from, uh->data + 5);
}
else if (ascii_strncasecmp ("reply-to:", uh->data, 9) == 0) {
-
rfc822_free_address
(&env->reply_to);
+
address_delete
(&env->reply_to);
env->reply_to = rfc822_parse_adrlist (env->reply_to, uh->data + 9);
}
else if (ascii_strncasecmp ("message-id:", uh->data, 11) == 0)
env->reply_to = rfc822_parse_adrlist (env->reply_to, uh->data + 9);
}
else if (ascii_strncasecmp ("message-id:", uh->data, 11) == 0)
-
str_replace
(&env->message_id, uh->data + 11);
+
m_strreplace
(&env->message_id, uh->data + 11);
else if (ascii_strncasecmp ("to:", uh->data, 3) != 0 &&
ascii_strncasecmp ("cc:", uh->data, 3) != 0 &&
ascii_strncasecmp ("bcc:", uh->data, 4) != 0 &&
else if (ascii_strncasecmp ("to:", uh->data, 3) != 0 &&
ascii_strncasecmp ("cc:", uh->data, 3) != 0 &&
ascii_strncasecmp ("bcc:", uh->data, 4) != 0 &&
@@
-367,7
+367,7
@@
static void process_user_header (ENVELOPE * env)
}
else
last = env->userhdrs = mutt_new_list ();
}
else
last = env->userhdrs = mutt_new_list ();
- last->data =
str_dup
(uh->data);
+ last->data =
m_strdup
(uh->data);
}
}
}
}
}
}
@@
-469,13
+469,12
@@
static int include_reply (CONTEXT * ctx, HEADER * cur, FILE * out)
return 0;
}
return 0;
}
-static int default_to (
ADDRESS
** to, ENVELOPE * env, int flags, int hmfupto)
+static int default_to (
address_t
** to, ENVELOPE * env, int flags, int hmfupto)
{
char prompt[STRING];
{
char prompt[STRING];
- ADDRESS *tmp;
if (flags && env->mail_followup_to && hmfupto == M_YES) {
if (flags && env->mail_followup_to && hmfupto == M_YES) {
-
rfc822_append (to, env->mail_followup_to
);
+
address_list_append(to, address_list_dup(env->mail_followup_to)
);
return 0;
}
return 0;
}
@@
-490,13
+489,10
@@
static int default_to (ADDRESS ** to, ENVELOPE * env, int flags, int hmfupto)
*/
if (!(flags & SENDGROUPREPLY) && mutt_is_list_cc (0, env->to, env->cc)) {
switch (query_quadoption (OPT_LISTREPLY,
*/
if (!(flags & SENDGROUPREPLY) && mutt_is_list_cc (0, env->to, env->cc)) {
switch (query_quadoption (OPT_LISTREPLY,
- _
- ("Message came from a mailing list. Reply to author only?")))
+ _("Message came from a mailing list. List-reply to mailing list?")))
{
{
- case M_NO:
- tmp = find_mailing_lists (env->to, env->cc);
- rfc822_append (to, tmp);
- rfc822_free_address (&tmp);
+ case M_YES:
+ address_list_append(to, find_mailing_lists (env->to, env->cc));
return 0;
case -1:
return -1; /* abort */
return 0;
case -1:
return -1; /* abort */
@@
-505,7
+501,7
@@
static int default_to (ADDRESS ** to, ENVELOPE * env, int flags, int hmfupto)
if (!option (OPTREPLYSELF) && mutt_addr_is_user (env->from)) {
/* mail is from the user, assume replying to recipients */
if (!option (OPTREPLYSELF) && mutt_addr_is_user (env->from)) {
/* mail is from the user, assume replying to recipients */
-
rfc822_append (to, env->to
);
+
address_list_append(to, address_list_dup(env->to)
);
}
else if (env->reply_to) {
if ((mutt_addrcmp (env->from, env->reply_to) && !env->reply_to->next) ||
}
else if (env->reply_to) {
if ((mutt_addrcmp (env->from, env->reply_to) && !env->reply_to->next) ||
@@
-521,7
+517,7
@@
static int default_to (ADDRESS ** to, ENVELOPE * env, int flags, int hmfupto)
* in his From header.
*
*/
* in his From header.
*
*/
-
rfc822_append (to, env->from
);
+
address_list_append(to, address_list_dup(env->from)
);
}
else if (!(mutt_addrcmp (env->from, env->reply_to) &&
!env->reply_to->next) && quadoption (OPT_REPLYTO) != M_YES) {
}
else if (!(mutt_addrcmp (env->from, env->reply_to) &&
!env->reply_to->next) && quadoption (OPT_REPLYTO) != M_YES) {
@@
-534,11
+530,11
@@
static int default_to (ADDRESS ** to, ENVELOPE * env, int flags, int hmfupto)
env->reply_to->mailbox, env->reply_to->next ? ",..." : "");
switch (query_quadoption (OPT_REPLYTO, prompt)) {
case M_YES:
env->reply_to->mailbox, env->reply_to->next ? ",..." : "");
switch (query_quadoption (OPT_REPLYTO, prompt)) {
case M_YES:
-
rfc822_append (to, env->reply_to
);
+
address_list_append(to, address_list_dup(env->reply_to)
);
break;
case M_NO:
break;
case M_NO:
-
rfc822_append (to, env->from
);
+
address_list_append(to, address_list_dup(env->from)
);
break;
default:
break;
default:
@@
-546,10
+542,10
@@
static int default_to (ADDRESS ** to, ENVELOPE * env, int flags, int hmfupto)
}
}
else
}
}
else
-
rfc822_append (to, env->reply_to
);
+
address_list_append(to, address_list_dup(env->reply_to)
);
}
else
}
else
-
rfc822_append (to, env->from
);
+
address_list_append(to, address_list_dup(env->from)
);
return (0);
}
return (0);
}
@@
-557,7
+553,6
@@
static int default_to (ADDRESS ** to, ENVELOPE * env, int flags, int hmfupto)
int mutt_fetch_recips (ENVELOPE * out, ENVELOPE * in, int flags)
{
char prompt[STRING];
int mutt_fetch_recips (ENVELOPE * out, ENVELOPE * in, int flags)
{
char prompt[STRING];
- ADDRESS *tmp;
int hmfupto = -1;
if ((flags & (SENDLISTREPLY | SENDGROUPREPLY)) && in->mail_followup_to) {
int hmfupto = -1;
if ((flags & (SENDLISTREPLY | SENDGROUPREPLY)) && in->mail_followup_to) {
@@
-570,9
+565,7
@@
int mutt_fetch_recips (ENVELOPE * out, ENVELOPE * in, int flags)
}
if (flags & SENDLISTREPLY) {
}
if (flags & SENDLISTREPLY) {
- tmp = find_mailing_lists (in->to, in->cc);
- rfc822_append (&out->to, tmp);
- rfc822_free_address (&tmp);
+ address_list_append(&out->to, find_mailing_lists(in->to, in->cc));
if (in->mail_followup_to && hmfupto == M_YES &&
default_to (&out->cc, in, flags & SENDLISTREPLY, hmfupto) == -1)
if (in->mail_followup_to && hmfupto == M_YES &&
default_to (&out->cc, in, flags & SENDLISTREPLY, hmfupto) == -1)
@@
-583,10
+576,10
@@
int mutt_fetch_recips (ENVELOPE * out, ENVELOPE * in, int flags)
return (-1); /* abort */
if ((flags & SENDGROUPREPLY)
return (-1); /* abort */
if ((flags & SENDGROUPREPLY)
- && (!in->mail_followup_to || hmfupto != M_YES))
{
- /* if(!mutt_addr_is_user(in->to)) */
-
rfc822_append (&out->cc, in->to
);
-
rfc822_append (&out->cc, in->cc
);
+ && (!in->mail_followup_to || hmfupto != M_YES))
+ {
+
address_t **tmp = address_list_append(&out->cc, address_list_dup(in->to)
);
+
address_list_append(tmp, address_list_dup(in->cc)
);
}
}
return 0;
}
}
return 0;
@@
-603,7
+596,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 =
str_dup
(e->message_id);
+ t->data =
m_strdup
(e->message_id);
t->next = l;
l = t;
}
t->next = l;
l = t;
}
@@
-627,6
+620,11
@@
void mutt_fix_reply_recipients (ENVELOPE * env)
env->to = mutt_remove_duplicates (env->to);
env->cc = mutt_remove_duplicates (env->cc);
env->cc = mutt_remove_xrefs (env->to, env->cc);
env->to = mutt_remove_duplicates (env->to);
env->cc = mutt_remove_duplicates (env->cc);
env->cc = mutt_remove_xrefs (env->to, env->cc);
+
+ if (env->cc && !env->to) {
+ env->to = env->cc;
+ env->cc = NULL;
+ }
}
void mutt_make_forward_subject (ENVELOPE * env, CONTEXT * ctx, HEADER * cur)
}
void mutt_make_forward_subject (ENVELOPE * env, CONTEXT * ctx, HEADER * cur)
@@
-635,7
+633,7
@@
void mutt_make_forward_subject (ENVELOPE * env, CONTEXT * ctx, HEADER * cur)
/* set the default subject for the message. */
mutt_make_string (buffer, sizeof (buffer), NONULL (ForwFmt), ctx, cur);
/* set the default subject for the message. */
mutt_make_string (buffer, sizeof (buffer), NONULL (ForwFmt), ctx, cur);
-
str_replace
(&env->subject, buffer);
+
m_strreplace
(&env->subject, buffer);
}
void mutt_make_misc_reply_headers (ENVELOPE * env, CONTEXT * ctx,
}
void mutt_make_misc_reply_headers (ENVELOPE * env, CONTEXT * ctx,
@@
-645,16
+643,16
@@
void mutt_make_misc_reply_headers (ENVELOPE * env, CONTEXT * ctx,
* been taken from a List-Post header. Is that correct?
*/
if (curenv->real_subj) {
* been taken from a List-Post header. Is that correct?
*/
if (curenv->real_subj) {
-
mem_free
(&env->subject);
- env->subject =
mem_malloc (str_len
(curenv->real_subj) + 5);
+
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__ */
}
else if (!env->subject)
sprintf (env->subject, "Re: %s", curenv->real_subj); /* __SPRINTF_CHECKED__ */
}
else if (!env->subject)
- env->subject =
str_dup
("Re: your mail");
+ env->subject =
m_strdup
("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 =
str_dup
(mutt_get_name (curenv->from));
+ env->x_comment_to =
m_strdup
(mutt_get_name (curenv->from));
#endif
}
#endif
}
@@
-682,7
+680,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 =
str_dup
(curenv->message_id);
+ (*q)->data =
m_strdup
(curenv->message_id);
}
if (pp)
}
if (pp)
@@
-745,8
+743,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 &&
-
str_casecmp
(curenv->followup_to, "poster"))
- env->newsgroups =
str_dup
(curenv->followup_to);
+
m_strcasecmp
(curenv->followup_to, "poster"))
+ env->newsgroups =
m_strdup
(curenv->followup_to);
}
else
#endif
}
else
#endif
@@
-876,8
+874,7
@@
static int generate_body (FILE * tempfp, /* stream for outgoing message *
void mutt_set_followup_to (ENVELOPE * e)
{
void mutt_set_followup_to (ENVELOPE * e)
{
- ADDRESS *t = NULL;
- ADDRESS *from;
+ address_t *from;
/*
* Only generate the Mail-Followup-To if the user has requested it, and
/*
* Only generate the Mail-Followup-To if the user has requested it, and
@@
-889,20
+886,21
@@
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 =
str_dup
(e->newsgroups);
+ e->followup_to =
m_strdup
(e->newsgroups);
return;
}
#endif
if (!e->mail_followup_to) {
if (mutt_is_list_cc (0, e->to, e->cc)) {
return;
}
#endif
if (!e->mail_followup_to) {
if (mutt_is_list_cc (0, e->to, e->cc)) {
+ address_t **tmp;
/*
* this message goes to known mailing lists, so create a proper
* mail-followup-to header
*/
/*
* this message goes to known mailing lists, so create a proper
* mail-followup-to header
*/
- t
= rfc822_append (&e->mail_followup_to, e->to
);
-
rfc822_append (&t, e->cc
);
+ t
mp = address_list_append(&e->mail_followup_to, address_list_dup(e->to)
);
+
address_list_append(tmp, address_list_dup(e->cc)
);
}
/* remove ourselves from the mail-followup-to header */
}
/* remove ourselves from the mail-followup-to header */
@@
-917,22
+915,19
@@
void mutt_set_followup_to (ENVELOPE * e)
if (e->mail_followup_to && !mutt_is_list_recipient (0, e->to, e->cc)) {
if (e->reply_to)
if (e->mail_followup_to && !mutt_is_list_recipient (0, e->to, e->cc)) {
if (e->reply_to)
- from =
rfc822_cpy_adr
(e->reply_to);
+ from =
address_list_dup
(e->reply_to);
else if (e->from)
else if (e->from)
- from =
rfc822_cpy_adr
(e->from);
+ from =
address_list_dup
(e->from);
else
from = mutt_default_from ();
if (from) {
else
from = mutt_default_from ();
if (from) {
- /* Normally, this loop will not even be entered. */
- for (t = from; t && t->next; t = t->next);
-
- t->next = e->mail_followup_to; /* t cannot be NULL at this point. */
+ address_list_append(&from->next, e->mail_followup_to);
e->mail_followup_to = from;
}
}
e->mail_followup_to = from;
}
}
- e->mail_followup_to = mutt_remove_duplicates
(e->mail_followup_to);
+ e->mail_followup_to = mutt_remove_duplicates(e->mail_followup_to);
}
}
}
}
@@
-941,9
+936,9
@@
void mutt_set_followup_to (ENVELOPE * e)
/* look through the recipients of the message we are replying to, and if
we find an address that matches $alternates, we use that as the default
from field */
/* look through the recipients of the message we are replying to, and if
we find an address that matches $alternates, we use that as the default
from field */
-static
ADDRESS
*set_reverse_name (ENVELOPE * env)
+static
address_t
*set_reverse_name (ENVELOPE * env)
{
{
-
ADDRESS
*tmp;
+
address_t
*tmp;
for (tmp = env->to; tmp; tmp = tmp->next) {
if (mutt_addr_is_user (tmp))
for (tmp = env->to; tmp; tmp = tmp->next) {
if (mutt_addr_is_user (tmp))
@@
-958,18
+953,18
@@
static ADDRESS *set_reverse_name (ENVELOPE * env)
if (!tmp && mutt_addr_is_user (env->from))
tmp = env->from;
if (tmp) {
if (!tmp && mutt_addr_is_user (env->from))
tmp = env->from;
if (tmp) {
- tmp =
rfc822_cpy_adr_real
(tmp);
+ tmp =
address_dup
(tmp);
if (!option (OPTREVREAL))
if (!option (OPTREVREAL))
-
mem_free
(&tmp->personal);
+
p_delete
(&tmp->personal);
if (!tmp->personal)
if (!tmp->personal)
- tmp->personal =
str_dup
(Realname);
+ tmp->personal =
m_strdup
(Realname);
}
return (tmp);
}
}
return (tmp);
}
-
ADDRESS
*mutt_default_from (void)
+
address_t
*mutt_default_from (void)
{
{
-
ADDRESS
*adr;
+
address_t
*adr;
const char *fqdn = mutt_fqdn (1);
/*
const char *fqdn = mutt_fqdn (1);
/*
@@
-978,16
+973,15
@@
ADDRESS *mutt_default_from (void)
*/
if (From)
*/
if (From)
- adr =
rfc822_cpy_adr_real
(From);
+ adr =
address_dup
(From);
else if (option (OPTUSEDOMAIN)) {
else if (option (OPTUSEDOMAIN)) {
- adr = rfc822_new_address ();
- adr->mailbox =
- mem_malloc (str_len (Username) + str_len (fqdn) + 2);
+ 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__ */
}
else {
sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn)); /* __SPRINTF_CHECKED__ */
}
else {
- adr =
rfc822_new_address
();
- adr->mailbox =
str_dup
(NONULL (Username));
+ adr =
address_new
();
+ adr->mailbox =
m_strdup
(NONULL (Username));
}
return (adr);
}
return (adr);
@@
-1065,6
+1059,19
@@
static void decode_descriptions (BODY * b)
}
}
}
}
+static void fix_end_of_file (const char *data)
+{
+ FILE *fp;
+ int c;
+
+ if ((fp = safe_fopen (data, "a+")) == NULL)
+ return;
+ fseeko (fp, -1, SEEK_END);
+ if ((c = fgetc (fp)) != '\n')
+ fputc ('\n', fp);
+ safe_fclose (&fp);
+}
+
int mutt_resend_message (FILE * fp, CONTEXT * ctx, HEADER * cur)
{
HEADER *msg = mutt_new_header ();
int mutt_resend_message (FILE * fp, CONTEXT * ctx, HEADER * cur)
{
HEADER *msg = mutt_new_header ();
@@
-1094,8
+1101,8
@@
int ci_send_message (int flags, /* send mode */
char *pgpkeylist = NULL;
/* save current value of "pgp_sign_as" */
char *pgpkeylist = NULL;
/* save current value of "pgp_sign_as" */
- char *signas = NULL;
- c
har *tag = NULL, *err
= NULL;
+ char *signas = NULL
, *err = NULL
;
+ c
onst char *tag
= NULL;
char *ctype;
int rv = -1;
char *ctype;
int rv = -1;
@@
-1122,7
+1129,7
@@
int ci_send_message (int flags, /* send mode */
if ((WithCrypto & APPLICATION_PGP) && (flags & SENDPOSTPONED))
if ((WithCrypto & APPLICATION_PGP) && (flags & SENDPOSTPONED))
- signas =
str_dup
(PgpSignAs);
+ signas =
m_strdup
(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
@@
-1169,7
+1176,7
@@
int ci_send_message (int flags, /* send mode */
/* Use any list-post header as a template */
url_parse_mailto (msg->env, NULL, cur->env->list_post);
/* We don't let them set the sender's address. */
/* Use any list-post header as a template */
url_parse_mailto (msg->env, NULL, cur->env->list_post);
/* We don't let them set the sender's address. */
-
rfc822_free_address
(&msg->env->from);
+
address_delete
(&msg->env->from);
}
if (!(flags & (SENDKEY | SENDPOSTPONED | SENDRESEND))) {
}
if (!(flags & (SENDKEY | SENDPOSTPONED | SENDRESEND))) {
@@
-1177,9
+1184,10
@@
int ci_send_message (int flags, /* send mode */
pbody->next = msg->content; /* don't kill command-line attachments */
msg->content = pbody;
pbody->next = msg->content; /* don't kill command-line attachments */
msg->content = pbody;
- ctype = str_dup (ContentType);
+ if (!(ctype = m_strdup(ContentType)))
+ ctype = m_strdup("text/plain");
mutt_parse_content_type (ctype, msg->content);
mutt_parse_content_type (ctype, msg->content);
-
mem_free
(&ctype);
+
p_delete
(&ctype);
msg->content->unlink = 1;
msg->content->use_disp = 0;
msg->content->unlink = 1;
msg->content->use_disp = 0;
@@
-1194,11
+1202,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 =
str_dup
(buffer);
+ msg->content->filename =
m_strdup
(buffer);
}
else {
tempfp = safe_fopen (tempfile, "a+");
}
else {
tempfp = safe_fopen (tempfile, "a+");
- msg->content->filename =
str_dup
(tempfile);
+ msg->content->filename =
m_strdup
(tempfile);
}
if (!tempfp) {
}
if (!tempfp) {
@@
-1252,7
+1260,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 =
str_dup
(((NNTP_DATA *) ctx->data)->group);
+ msg->env->newsgroups =
m_strdup
(((NNTP_DATA *) ctx->data)->group);
#endif
if (!(flags & SENDMAILX) &&
#endif
if (!(flags & SENDMAILX) &&
@@
-1297,7
+1305,7
@@
int ci_send_message (int flags, /* send mode */
msg->replied = 0;
if (killfrom) {
msg->replied = 0;
if (killfrom) {
-
rfc822_free_address
(&msg->env->from);
+
address_delete
(&msg->env->from);
killfrom = 0;
}
killfrom = 0;
}
@@
-1307,7
+1315,7
@@
int ci_send_message (int flags, /* send mode */
if (option (OPTSIGONTOP)
&& (!(flags & (SENDMAILX | SENDKEY)) && Editor
if (option (OPTSIGONTOP)
&& (!(flags & (SENDMAILX | SENDKEY)) && Editor
- &&
str_cmp
(Editor, "builtin") != 0))
+ &&
m_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 */
@@
-1317,7
+1325,7
@@
int ci_send_message (int flags, /* send mode */
if (!option (OPTSIGONTOP)
&& (!(flags & (SENDMAILX | SENDKEY)) && Editor
if (!option (OPTSIGONTOP)
&& (!(flags & (SENDMAILX | SENDKEY)) && Editor
- &&
str_cmp
(Editor, "builtin") != 0))
+ &&
m_strcmp
(Editor, "builtin") != 0))
append_signature (tempfp);
/*
append_signature (tempfp);
/*
@@
-1397,7
+1405,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 =
str_dup
(Realname);
+ msg->env->from->personal =
m_strdup
(Realname);
if (!((WithCrypto & APPLICATION_PGP) && (flags & SENDKEY)))
safe_fclose (&tempfp);
if (!((WithCrypto & APPLICATION_PGP) && (flags & SENDKEY)))
safe_fclose (&tempfp);
@@
-1431,7
+1439,7
@@
int ci_send_message (int flags, /* send mode */
if (mutt_needs_mailcap (msg->content)) {
if (!mutt_edit_attachment (msg->content))
goto cleanup;
if (mutt_needs_mailcap (msg->content)) {
if (!mutt_edit_attachment (msg->content))
goto cleanup;
- } else if (!Editor ||
str_cmp
("builtin", Editor) == 0)
+ } else if (!Editor ||
m_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);
@@
-1439,9
+1447,16
@@
int ci_send_message (int flags, /* send mode */
sizeof (fcc));
mutt_env_to_idna (msg->env, NULL, NULL);
}
sizeof (fcc));
mutt_env_to_idna (msg->env, NULL, NULL);
}
- else
+ else
{
mutt_edit_file (Editor, msg->content->filename);
mutt_edit_file (Editor, msg->content->filename);
+ if (stat (msg->content->filename, &st) == 0) {
+ if (mtime != st.st_mtime)
+ fix_end_of_file (msg->content->filename);
+ } else
+ mutt_perror (msg->content->filename);
+ }
+
if (option (OPTTEXTFLOWED))
rfc3676_space_stuff (msg);
if (option (OPTTEXTFLOWED))
rfc3676_space_stuff (msg);
@@
-1477,7
+1492,7
@@
int ci_send_message (int flags, /* send mode */
}
mutt_select_fcc (fcc, sizeof (fcc), msg);
if (killfrom) {
}
mutt_select_fcc (fcc, sizeof (fcc), msg);
if (killfrom) {
-
rfc822_free_address
(&msg->env->from);
+
address_delete
(&msg->env->from);
killfrom = 0;
}
}
killfrom = 0;
}
}
@@
-1553,7
+1568,7
@@
int ci_send_message (int flags, /* send mode */
if (mutt_env_to_idna (msg->env, &tag, &err)) {
mutt_error (_("Bad IDN in \"%s\": '%s'"), tag, err);
if (mutt_env_to_idna (msg->env, &tag, &err)) {
mutt_error (_("Bad IDN in \"%s\": '%s'"), tag, err);
-
mem_free
(&err);
+
p_delete
(&err);
if (!(flags & SENDBATCH))
goto main_loop;
else
if (!(flags & SENDBATCH))
goto main_loop;
else
@@
-1628,7
+1643,7
@@
int ci_send_message (int flags, /* send mode */
mutt_protect (msg, pgpkeylist) == -1) {
msg->content = mutt_remove_multipart (msg->content);
mutt_protect (msg, pgpkeylist) == -1) {
msg->content = mutt_remove_multipart (msg->content);
-
mem_free
(&pgpkeylist);
+
p_delete
(&pgpkeylist);
decode_descriptions (msg->content);
goto main_loop;
decode_descriptions (msg->content);
goto main_loop;
@@
-1676,7
+1691,7
@@
int ci_send_message (int flags, /* send mode */
fcc[0] = '\0';
#endif
fcc[0] = '\0';
#endif
- if (*fcc &&
str_cmp
("/dev/null", fcc) != 0) {
+ if (*fcc &&
m_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;
@@
-1687,8
+1702,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
- && (
str_cmp
(msg->content->subtype, "encrypted") == 0 ||
-
str_cmp
(msg->content->subtype, "signed") == 0)) {
+ && (
m_strcmp
(msg->content->subtype, "encrypted") == 0 ||
+
m_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 */
@@
-1792,7
+1807,7
@@
int ci_send_message (int flags, /* send mode */
#endif
if (WithCrypto && (msg->security & ENCRYPT))
#endif
if (WithCrypto && (msg->security & ENCRYPT))
-
mem_free
(&pgpkeylist);
+
p_delete
(&pgpkeylist);
if (WithCrypto && free_clear_content)
mutt_free_body (&clear_content);
if (WithCrypto && free_clear_content)
mutt_free_body (&clear_content);
@@
-1814,7
+1829,7
@@
cleanup:
if ((WithCrypto & APPLICATION_PGP) && (flags & SENDPOSTPONED)) {
if (signas) {
if ((WithCrypto & APPLICATION_PGP) && (flags & SENDPOSTPONED)) {
if (signas) {
-
mem_free
(&PgpSignAs);
+
p_delete
(&PgpSignAs);
PgpSignAs = signas;
}
}
PgpSignAs = signas;
}
}