X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=1762394bad211aae168e7a293a25959728da0363;hp=b06696fc34f9b51441fd2ab74feb47999e251938;hb=f061b8bfafd1eb3d389e4c9801ff4377de8f9225;hpb=bec523bb3ad78ec9100efb18fb58d43d38b304de diff --git a/sendlib.c b/sendlib.c index b06696f..1762394 100644 --- a/sendlib.c +++ b/sendlib.c @@ -19,14 +19,13 @@ #include #include +#include + #include "mutt.h" #include "handler.h" #include "recvattach.h" #include "mutt_curses.h" -#include "rfc2047.h" -#include "rfc2231.h" #include "mx.h" -#include "mime.h" #include "copy.h" #include "pager.h" #include "charset.h" @@ -69,12 +68,8 @@ #include #endif -extern char RFC822Specials[]; - #define DISPOSITION(X) X==DISPATTACH?"attachment":"inline" -const char MimeSpecials[] = "@.,;:<>[]\\\"()?/= \t"; - static char MsgIdPfx = 'A'; static void transform_to_7bit (BODY * a, FILE * fpin); @@ -301,7 +296,7 @@ int mutt_write_mime_header (BODY * a, FILE * f) buffer[0] = 0; tmp = m_strdup(p->value); encode = rfc2231_encode_string (&tmp); - rfc822_cat (buffer, sizeof (buffer), tmp, MimeSpecials); + rfc822_strcpy(buffer, sizeof(buffer), tmp, MimeSpecials); /* Dirty hack to make messages readable by Outlook Express * for the Mac: force quotes around the boundary parameter @@ -353,7 +348,7 @@ int mutt_write_mime_header (BODY * a, FILE * f) buffer[0] = 0; tmp = m_strdup(t); encode = rfc2231_encode_string (&tmp); - rfc822_cat (buffer, sizeof (buffer), tmp, MimeSpecials); + rfc822_strcpy(buffer, sizeof(buffer), tmp, MimeSpecials); p_delete(&tmp); fprintf (f, "; filename%s=%s", encode ? "*" : "", buffer); } @@ -929,13 +924,9 @@ int mutt_lookup_mime_type (BODY * att, const char *path) sze = m_strlen(p); if ((sze > cur_sze) && (szf >= sze) && (m_strcasecmp(path + szf - sze, p) == 0 - || ascii_strcasecmp (path + szf - sze, p) == 0) && (szf == sze - || path[szf - - - sze - - - 1] - == '.')) { + || ascii_strcasecmp (path + szf - sze, p) == 0) + && (szf == sze || path[szf - sze - 1] == '.')) + { /* get the content-type */ if ((p = strchr (ct, '/')) == NULL) { @@ -964,8 +955,8 @@ bye: if (type != TYPEOTHER || *xtype != '\0') { att->type = type; - str_replace (&att->subtype, subtype); - str_replace (&att->xtype, xtype); + m_strreplace(&att->subtype, subtype); + m_strreplace(&att->xtype, xtype); } return (type); @@ -1380,10 +1371,10 @@ char *mutt_make_date (char *s, size_t len) /* wrapper around mutt_write_address() so we can handle very large recipient lists without needing a huge temporary buffer in memory */ -void mutt_write_address_list (ADDRESS * adr, FILE * fp, int linelen, +void mutt_write_address_list (address_t * adr, FILE * fp, int linelen, int display) { - ADDRESS *tmp; + address_t *tmp; char buf[LONG_STRING]; int count = 0; int len; @@ -1934,7 +1925,7 @@ send_msg(const char *path, const char **args, const char *msg, char **tempfile) } static const char ** -add_args(const char **args, size_t *argslen, size_t *argsmax, ADDRESS * addr) +add_args(const char **args, size_t *argslen, size_t *argsmax, address_t * addr) { for (; addr; addr = addr->next) { /* weed out group mailboxes, since those are for display only */ @@ -1957,8 +1948,8 @@ add_option(const char **args, size_t *argslen, size_t *argsmax, const char *s) return (args); } -static int mutt_invoke_sendmail (ADDRESS * from, /* the sender */ - ADDRESS * to, ADDRESS * cc, ADDRESS * bcc, /* recips */ +static int mutt_invoke_sendmail (address_t * from, /* the sender */ + address_t * to, address_t * cc, address_t * bcc, /* recips */ const char *msg, /* file containing message */ int eightbit) { /* message contains 8bit chars */ @@ -2013,7 +2004,7 @@ static int mutt_invoke_sendmail (ADDRESS * from, /* the sender */ args = add_option(args, &argslen, &argsmax, "-B8BITMIME"); if (option (OPTENVFROM)) { - ADDRESS *f = NULL; + address_t *f = NULL; if (EnvFrom) f = EnvFrom; else if (from && !from->next) @@ -2077,8 +2068,8 @@ static int mutt_invoke_sendmail (ADDRESS * from, /* the sender */ return (i); } -int mutt_invoke_mta (ADDRESS * from, /* the sender */ - ADDRESS * to, ADDRESS * cc, ADDRESS * bcc, /* recips */ +int mutt_invoke_mta (address_t * from, /* the sender */ + address_t * to, address_t * cc, address_t * bcc, /* recips */ const char *msg, /* file containing message */ int eightbit) { /* message contains 8bit chars */ @@ -2156,13 +2147,13 @@ void mutt_prepare_envelope (ENVELOPE * env, int final) * recipients if there is no To: or Cc: field, so attempt to suppress * it by using an empty To: field. */ - env->to = rfc822_new_address (); + env->to = address_new (); env->to->group = 1; - env->to->next = rfc822_new_address (); + env->to->next = address_new (); buffer[0] = 0; - rfc822_cat (buffer, sizeof (buffer), "undisclosed-recipients", - RFC822Specials); + rfc822_strcpy(buffer, sizeof(buffer), "undisclosed-recipients", + RFC822Specials); env->to->mailbox = m_strdup(buffer); } @@ -2198,7 +2189,7 @@ void mutt_unprepare_envelope (ENVELOPE * env) for (item = env->userhdrs; item; item = item->next) rfc2047_decode (&item->data); - rfc822_free_address (&env->mail_followup_to); + address_delete (&env->mail_followup_to); /* back conversions */ rfc2047_decode_adrlist (env->to); @@ -2209,8 +2200,8 @@ void mutt_unprepare_envelope (ENVELOPE * env) rfc2047_decode (&env->subject); } -static int _mutt_bounce_message (FILE * fp, HEADER * h, ADDRESS * to, - const char *resent_from, ADDRESS * env_from) +static int _mutt_bounce_message (FILE * fp, HEADER * h, address_t * to, + const char *resent_from, address_t * env_from) { int i, ret = 0; FILE *f; @@ -2263,9 +2254,9 @@ static int _mutt_bounce_message (FILE * fp, HEADER * h, ADDRESS * to, return ret; } -int mutt_bounce_message (FILE * fp, HEADER * h, ADDRESS * to) +int mutt_bounce_message (FILE * fp, HEADER * h, address_t * to) { - ADDRESS *from; + address_t *from; const char *fqdn = mutt_fqdn (1); char resent_from[STRING]; int ret; @@ -2290,18 +2281,18 @@ int mutt_bounce_message (FILE * fp, HEADER * h, ADDRESS * to) ret = _mutt_bounce_message (fp, h, to, resent_from, from); - rfc822_free_address (&from); + address_delete (&from); return ret; } /* given a list of addresses, return a list of unique addresses */ -ADDRESS *mutt_remove_duplicates (ADDRESS * addr) +address_t *mutt_remove_duplicates (address_t * addr) { - ADDRESS *top = addr; - ADDRESS **last = ⊤ - ADDRESS *tmp; + address_t *top = addr; + address_t **last = ⊤ + address_t *tmp; int dup; while (addr) { @@ -2319,7 +2310,7 @@ ADDRESS *mutt_remove_duplicates (ADDRESS * addr) *last = addr->next; addr->next = NULL; - rfc822_free_address (&addr); + address_delete (&addr); addr = *last; }