projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
missing include
[apps/madmutt.git]
/
send.c
diff --git
a/send.c
b/send.c
index
c827e7e
..
f98e32b
100644
(file)
--- a/
send.c
+++ b/
send.c
@@
-17,13
+17,14
@@
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
+#include <lib-mime/mime.h>
+
#include "mutt.h"
#include "enter.h"
#include "mutt_curses.h"
#include "rfc2047.h"
#include "rfc3676.h"
#include "keymap.h"
#include "mutt.h"
#include "enter.h"
#include "mutt_curses.h"
#include "rfc2047.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"
@@
-76,7
+77,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;
@@
-86,7
+87,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))
@@
-96,9
+97,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) {
@@
-110,13
+111,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;
}
}
@@
-131,9
+132,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)) {
@@
-147,12
+148,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;
@@
-161,9
+162,9
@@
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) {
for (; t || c; t = c, c = NULL) {
for (; t; t = t->next) {
@@
-180,7
+181,7
@@
static ADDRESS *find_mailing_lists (ADDRESS * t, ADDRESS * c)
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;
@@
-192,7
+193,7
@@
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);
*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);
@@
-265,8
+266,7
@@
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);
+ p = vskipspaces(uh->data + 8);
m_strcpy(buf, sizeof(buf), p);
}
}
m_strcpy(buf, sizeof(buf), p);
}
}
@@
-303,10
+303,9
@@
static int edit_envelope (ENVELOPE * en, int flags)
}
#ifdef USE_NNTP
}
#ifdef USE_NNTP
-char *nntp_get_header
(const char *s)
+char *nntp_get_header(const char *s)
{
{
- SKIPWS (s);
- return m_strdup(s);
+ return m_strdup(skipspaces(s));
}
#endif
}
#endif
@@
-344,11
+343,11
@@
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)
@@
-471,10
+470,10
@@
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;
+
address_t
*tmp;
if (flags && env->mail_followup_to && hmfupto == M_YES) {
rfc822_append (to, env->mail_followup_to);
if (flags && env->mail_followup_to && hmfupto == M_YES) {
rfc822_append (to, env->mail_followup_to);
@@
-497,7
+496,7
@@
static int default_to (ADDRESS ** to, ENVELOPE * env, int flags, int hmfupto)
case M_YES:
tmp = find_mailing_lists (env->to, env->cc);
rfc822_append (to, tmp);
case M_YES:
tmp = find_mailing_lists (env->to, env->cc);
rfc822_append (to, tmp);
-
rfc822_free_address
(&tmp);
+
address_delete
(&tmp);
return 0;
case -1:
return -1; /* abort */
return 0;
case -1:
return -1; /* abort */
@@
-558,7
+557,7
@@
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;
+
address_t
*tmp;
int hmfupto = -1;
if ((flags & (SENDLISTREPLY | SENDGROUPREPLY)) && in->mail_followup_to) {
int hmfupto = -1;
if ((flags & (SENDLISTREPLY | SENDGROUPREPLY)) && in->mail_followup_to) {
@@
-573,7
+572,7
@@
int mutt_fetch_recips (ENVELOPE * out, ENVELOPE * in, int flags)
if (flags & SENDLISTREPLY) {
tmp = find_mailing_lists (in->to, in->cc);
rfc822_append (&out->to, tmp);
if (flags & SENDLISTREPLY) {
tmp = find_mailing_lists (in->to, in->cc);
rfc822_append (&out->to, tmp);
-
rfc822_free_address
(&tmp);
+
address_delete
(&tmp);
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)
@@
-882,8
+881,8
@@
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
*t = NULL;
+
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
@@
-947,9
+946,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))
@@
-973,9
+972,9
@@
static ADDRESS *set_reverse_name (ENVELOPE * env)
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);
/*
@@
-986,12
+985,12
@@
ADDRESS *mutt_default_from (void)
if (From)
adr = rfc822_cpy_adr_real (From);
else if (option (OPTUSEDOMAIN)) {
if (From)
adr = rfc822_cpy_adr_real (From);
else if (option (OPTUSEDOMAIN)) {
- adr =
rfc822_new_address
();
+ 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 {
adr->mailbox = p_new(char, m_strlen(Username) + m_strlen(fqdn) + 2);
sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn)); /* __SPRINTF_CHECKED__ */
}
else {
- adr =
rfc822_new_address
();
+ adr =
address_new
();
adr->mailbox = m_strdup(NONULL (Username));
}
adr->mailbox = m_strdup(NONULL (Username));
}
@@
-1187,7
+1186,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))) {
@@
-1316,7
+1315,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;
}
@@
-1503,7
+1502,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;
}
}