X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=761054b1ba937d1a3cfc32ea600df84daeb4c6c5;hp=91490fe3adc0165dbef07a4eeaea3279fffd061f;hb=69cbbd6ba2aec89f81ecf169e21b7bc4ec5bce90;hpb=c660c8cbae7f647c637502779862e4a36ad6a074 diff --git a/sendlib.c b/sendlib.c index 91490fe..761054b 100644 --- a/sendlib.c +++ b/sendlib.c @@ -25,7 +25,6 @@ #include "handler.h" #include "recvattach.h" #include "mutt_curses.h" -#include "rfc2047.h" #include "mx.h" #include "copy.h" #include "pager.h" @@ -69,8 +68,6 @@ #include #endif -extern char RFC822Specials[]; - #define DISPOSITION(X) X==DISPATTACH?"attachment":"inline" static char MsgIdPfx = 'A'; @@ -299,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 @@ -351,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); } @@ -747,7 +744,7 @@ static size_t convert_file_from_to (FILE * file, for (c = tocodes, i = 0; c; c = c1 ? c1 + 1 : 0, i++) { if ((c1 = strchr (c, ':')) == c) continue; - tcode[i] = str_substrdup (c, c1); + tcode[i] = m_substrdup(c, c1); } ret = (size_t) (-1); @@ -756,7 +753,7 @@ static size_t convert_file_from_to (FILE * file, for (c = fromcodes; c; c = c1 ? c1 + 1 : 0) { if ((c1 = strchr (c, ':')) == c) continue; - fcode = str_substrdup (c, c1); + fcode = m_substrdup(c, c1); ret = convert_file_to (file, fcode, ncodes, (const char **) tcode, &cn, info); @@ -940,7 +937,7 @@ int mutt_lookup_mime_type (BODY * att, const char *path) for (q = p; *q && !ISSPACE (*q); q++); - str_substrcpy (subtype, p, q, sizeof (subtype)); + m_strncpy(subtype, sizeof(subtype), p, q - p); if ((type = mutt_check_mime_type (ct)) == TYPEOTHER) m_strcpy(xtype, sizeof(xtype), ct); @@ -958,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); @@ -1374,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; @@ -1928,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 */ @@ -1951,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 */ @@ -2007,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) @@ -2071,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 */ @@ -2150,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); } @@ -2192,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); @@ -2203,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; @@ -2257,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; @@ -2284,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) { @@ -2313,7 +2310,7 @@ ADDRESS *mutt_remove_duplicates (ADDRESS * addr) *last = addr->next; addr->next = NULL; - rfc822_free_address (&addr); + address_delete (&addr); addr = *last; }