X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=copy.c;h=55dd1921df560205d31eef6b853e3c731c9d0c23;hp=e4bb6c46d08f176d2262ac03399104438d2a0165;hb=7d29626ce4e1fa932c6349c7253e6f774df069fc;hpb=96d53ff49c308769efbf708e1e65819077cb7af6 diff --git a/copy.c b/copy.c index e4bb6c4..55dd192 100644 --- a/copy.c +++ b/copy.c @@ -7,27 +7,18 @@ * please see the file GPL in the top level source directory. */ -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include + +#include +#include #include "mutt.h" -#include "mx.h" +#include "handler.h" #include "copy.h" -#include "rfc2047.h" -#include "mime.h" -#include "mutt_crypt.h" +#include +#include #include "mutt_idna.h" -#include "lib/mem.h" -#include "lib/str.h" -#include "lib/debug.h" - -#include -#include -#include -#include /* needed for SEEK_SET under SunOS 4.1.4 */ - static int address_header_decode (char **str); static int copy_delete_attach (BODY * b, FILE * fpin, FILE * fpout, char *date); @@ -36,23 +27,24 @@ static int copy_delete_attach (BODY * b, FILE * fpin, FILE * fpout, * below is to avoid creating a HEADER structure in message_handler(). */ int -mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags, - const char *prefix) -{ +mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end, + int flags, const char *prefix) { int from = 0; int this_is_from; int ignore = 0; char buf[STRING]; /* should be long enough to get most fields in one pass */ - char *nl; - LIST *t; + char *eol; + string_list_t *t; char **headers; int hdr_count; int x; char *this_one = NULL; + ssize_t this_one_len = 0, headers_len = 0; int error; + int curline = 0; - if (ftell (in) != off_start) - fseek (in, off_start, 0); + if (ftello (in) != off_start) + fseeko (in, off_start, 0); buf[0] = '\n'; buf[1] = 0; @@ -63,16 +55,16 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags, /* Without these flags to complicate things * we can do a more efficient line to line copying */ - while (ftell (in) < off_end) { - nl = strchr (buf, '\n'); + while (ftello (in) < off_end) { + eol = strchr (buf, '\n'); if ((fgets (buf, sizeof (buf), in)) == NULL) break; /* Is it the begining of a header? */ - if (nl && buf[0] != ' ' && buf[0] != '\t') { + if (eol && buf[0] != ' ' && buf[0] != '\t') { ignore = 1; - if (!from && safe_strncmp ("From ", buf, 5) == 0) { + if (!from && m_strncmp("From ", buf, 5) == 0) { if ((flags & CH_FROM) == 0) continue; from = 1; @@ -117,25 +109,28 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags, */ if (flags & CH_REORDER) { for (t = HeaderOrderList; t; t = t->next) { - debug_print (1, ("Reorder list: %s\n", t->data)); hdr_count++; } } - debug_print (1, ("WEED is %s\n", (flags & CH_WEED) ? "Set" : "Not")); - - headers = safe_calloc (hdr_count, sizeof (char *)); + headers = p_new(char *, hdr_count); /* Read all the headers into the array */ - while (ftell (in) < off_end) { - nl = strchr (buf, '\n'); + while (ftello (in) < off_end) { + eol = strchr (buf, '\n'); /* Read a line */ if ((fgets (buf, sizeof (buf), in)) == NULL) break; /* Is it the begining of a header? */ - if (nl && buf[0] != ' ' && buf[0] != '\t') { + if (eol && buf[0] != ' ' && buf[0] != '\t') { + + /* set curline to 1 for To:/Cc:/Bcc: and 0 otherwise */ + curline = (flags & CH_WEED) && (m_strncmp("To:", buf, 3) == 0 || + m_strncmp("Cc:", buf, 3) == 0 || + m_strncmp("Bcc:", buf, 4) == 0); + /* Do we have anything pending? */ if (this_one) { if (flags & CH_DECODE) { @@ -146,10 +141,10 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags, if (!headers[x]) headers[x] = this_one; else { - safe_realloc (&headers[x], mutt_strlen (headers[x]) + - mutt_strlen (this_one) + sizeof (char)); - strcat (headers[x], this_one); /* __STRCAT_CHECKED__ */ - FREE (&this_one); + headers_len = m_strlen(headers[x]) + m_strlen(this_one) + 1; + p_realloc(&headers[x], headers_len); + m_strcat(headers[x], headers_len, this_one); + p_delete(&this_one); } this_one = NULL; @@ -157,7 +152,7 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags, ignore = 1; this_is_from = 0; - if (!from && safe_strncmp ("From ", buf, 5) == 0) { + if (!from && m_strncmp("From ", buf, 5) == 0) { if ((flags & CH_FROM) == 0) continue; this_is_from = from = 1; @@ -168,8 +163,8 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags, /* note: CH_FROM takes precedence over header weeding. */ if (!((flags & CH_FROM) && (flags & CH_FORCE_FROM) && this_is_from) && (flags & CH_WEED) && - mutt_matches_ignore (buf, Ignore) && - !mutt_matches_ignore (buf, UnIgnore)) + string_list_contains(Ignore, buf, "*") && + !string_list_contains(UnIgnore, buf, "*")) continue; if ((flags & CH_WEED_DELIVERED) && ascii_strncasecmp ("Delivered-To:", buf, 13) == 0) @@ -198,8 +193,7 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags, /* Find x -- the array entry where this header is to be saved */ if (flags & CH_REORDER) { for (t = HeaderOrderList, x = 0; (t); t = t->next, x++) { - if (!ascii_strncasecmp (buf, t->data, mutt_strlen (t->data))) { - debug_print (2, ("Reorder: %s matches %s\n", t->data, buf)); + if (!ascii_strncasecmp (buf, t->data, m_strlen(t->data))) { break; } } @@ -209,17 +203,24 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags, } /* If beginning of header */ if (!ignore) { - debug_print (2, ("Reorder: x = %d; hdr_count = %d\n", x, hdr_count)); if (!this_one) - this_one = safe_strdup (buf); - else { - safe_realloc (&this_one, - mutt_strlen (this_one) + mutt_strlen (buf) + - sizeof (char)); - strcat (this_one, buf); /* __STRCAT_CHECKED__ */ + this_one = m_strdup(buf); + /* we do want to see all lines if this header doesn't feature + * abbreviations (curline is 0), $max_display_recips is 0 and + * while the number hasn't reached $max_display_recips yet */ + else if (curline == 0 || MaxDispRecips == 0 || ++curline <= MaxDispRecips) { + this_one_len = m_strlen(this_one) + m_strlen(buf) + 1; + p_realloc(&this_one, this_one_len); + m_strcat(this_one, this_one_len, buf); + /* only for the first line which doesn't exeeds + * $max_display_recips: abbreviate it */ + } else if (curline == MaxDispRecips+1) { + this_one_len = m_strlen(this_one) + 5; + p_realloc(&this_one, this_one_len); + m_strcat(this_one, this_one_len, " ..."); } } - } /* while (ftell (in) < off_end) */ + } /* while (ftello (in) < off_end) */ /* Do we have anything pending? -- XXX, same code as in above in the loop. */ if (this_one) { @@ -231,10 +232,10 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags, if (!headers[x]) headers[x] = this_one; else { - safe_realloc (&headers[x], mutt_strlen (headers[x]) + - mutt_strlen (this_one) + sizeof (char)); - strcat (headers[x], this_one); /* __STRCAT_CHECKED__ */ - FREE (&this_one); + headers_len = m_strlen(headers[x]) + m_strlen(this_one) + 1; + p_realloc(&headers[x], headers_len); + m_strcat(headers[x], headers_len, this_one); + p_delete(&this_one); } this_one = NULL; @@ -243,11 +244,6 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags, /* Now output the headers in order */ for (x = 0; x < hdr_count; x++) { if (headers[x]) { -#if 0 - if (flags & CH_DECODE) - rfc2047_decode (&headers[x]); -#endif - /* We couldn't do the prefixing when reading because RFC 2047 * decoding may have concatenated lines. */ @@ -287,8 +283,8 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags, /* Free in a separate loop to be sure that all headers are freed * in case of error. */ for (x = 0; x < hdr_count; x++) - FREE (&headers[x]); - FREE (&headers); + p_delete(&headers[x]); + p_delete(&headers); if (error) return (-1); @@ -322,24 +318,24 @@ int mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags, const char *prefix) { - char buffer[SHORT_STRING]; + char buffer[STRING]; - flags |= (h->irt_changed ? CH_UPDATE_IRT : 0) - | (h->refs_changed ? CH_UPDATE_REFS : 0); + if (h->env) + flags |= (h->env->irt_changed ? CH_UPDATE_IRT : 0) | + (h->env->refs_changed ? CH_UPDATE_REFS : 0); if (mutt_copy_hdr (in, out, h->offset, h->content->offset, flags, prefix) == -1) return (-1); if (flags & CH_TXTPLAIN) { - char chsbuf[SHORT_STRING]; + char chsbuf[STRING]; - fputs ("Mime-Version: 1.0\n", out); + fputs ("MIME-Version: 1.0\n", out); fputs ("Content-Transfer-Encoding: 8bit\n", out); fputs ("Content-Type: text/plain; charset=", out); - mutt_canonical_charset (chsbuf, sizeof (chsbuf), - Charset ? Charset : "us-ascii"); - rfc822_cat (buffer, sizeof (buffer), chsbuf, MimeSpecials); + charset_canonicalize(chsbuf, sizeof (chsbuf), Charset); + rfc822_strcpy(buffer, sizeof(buffer), chsbuf, MimeSpecials); fputs (buffer, out); fputc ('\n', out); @@ -350,8 +346,8 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags, if (flags & CH_UPDATE) { if ((flags & CH_NOSTATUS) == 0) { - if (h->irt_changed && h->new_env->in_reply_to) { - LIST *listp = h->new_env->in_reply_to; + if (h->env->irt_changed && h->env->in_reply_to) { + string_list_t *listp = h->env->in_reply_to; if (fputs ("In-Reply-To: ", out) == EOF) return (-1); @@ -364,8 +360,8 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags, return (-1); } - if (h->refs_changed && h->new_env->references) { - LIST *listp = h->new_env->references, *refs = NULL, *t; + if (h->env->refs_changed && h->env->references) { + string_list_t *listp = h->env->references, *refs = NULL, *t; if (fputs ("References: ", out) == EOF) return (-1); @@ -373,7 +369,7 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags, /* Mutt stores references in reverse order, thus we create * a reordered refs list that we can put in the headers */ for (; listp; listp = listp->next, refs = t) { - t = (LIST *) safe_malloc (sizeof (LIST)); + t = p_new(string_list_t, 1); t->data = listp->data; t->next = refs; } @@ -384,7 +380,7 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags, /* clearing refs from memory */ for (t = refs; refs; refs = t->next, t = refs) - FREE (&refs); + p_delete(&refs); if (fputc ('\n', out) == EOF) return (-1); @@ -428,7 +424,7 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags, } if (flags & CH_UPDATE_LEN && (flags & CH_NOLEN) == 0) { - fprintf (out, "Content-Length: %ld\n", h->content->length); + fprintf (out, "Content-Length: %lld\n", h->content->length); if (h->lines != 0 || h->content->length == 0) fprintf (out, "Lines: %d\n", h->lines); } @@ -447,7 +443,7 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags, } /* Count the number of lines and bytes to be deleted in this body*/ -static int count_delete_lines (FILE * fp, BODY * b, long *length, +static int count_delete_lines (FILE * fp, BODY * b, off_t *length, size_t datelen) { int dellines = 0; @@ -455,7 +451,7 @@ static int count_delete_lines (FILE * fp, BODY * b, long *length, int ch; if (b->deleted) { - fseek (fp, b->offset, SEEK_SET); + fseeko (fp, b->offset, SEEK_SET); for (l = b->length; l; l--) { ch = getc (fp); if (ch == EOF) @@ -498,13 +494,14 @@ int _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body, int flags, int chflags) { - char prefix[SHORT_STRING]; + char prefix[STRING]; STATE s; - long new_offset = -1; + off_t new_offset = -1; + int rc = 0; if (flags & M_CM_PREFIX) { if (option (OPTTEXTFLOWED)) - strfcpy (prefix, ">", sizeof (prefix)); + m_strcpy(prefix, sizeof(prefix), ">"); else _mutt_make_string (prefix, sizeof (prefix), NONULL (Prefix), Context, hdr, 0); @@ -516,47 +513,35 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body, else if (hdr->attach_del && (chflags & CH_UPDATE_LEN)) { int new_lines; - long new_length = body->length; - char date[SHORT_STRING]; + off_t new_length = body->length; + char date[STRING]; mutt_make_date (date, sizeof (date)); - date[5] = date[mutt_strlen (date) - 1] = '\"'; + date[5] = date[m_strlen(date) - 1] = '\"'; /* Count the number of lines and bytes to be deleted */ - fseek (fpin, body->offset, SEEK_SET); + fseeko (fpin, body->offset, SEEK_SET); new_lines = hdr->lines - - count_delete_lines (fpin, body, &new_length, mutt_strlen (date)); + count_delete_lines (fpin, body, &new_length, m_strlen(date)); /* Copy the headers */ if (mutt_copy_header (fpin, hdr, fpout, chflags | CH_NOLEN | CH_NONEWLINE, NULL)) return -1; - fprintf (fpout, "Content-Length: %ld\n", new_length); + fprintf (fpout, "Content-Length: %lld\n", new_length); if (new_lines <= 0) new_lines = 0; else fprintf (fpout, "Lines: %d\n\n", new_lines); if (ferror (fpout) || feof (fpout)) return -1; - new_offset = ftell (fpout); + new_offset = ftello (fpout); /* Copy the body */ - fseek (fpin, body->offset, SEEK_SET); + fseeko (fpin, body->offset, SEEK_SET); if (copy_delete_attach (body, fpin, fpout, date)) return -1; -#ifdef DEBUG - { - long fail = ((ftell (fpout) - new_offset) - new_length); - - if (fail) { - mutt_error ("The length calculation was wrong by %ld bytes", fail); - new_length += fail; - mutt_sleep (1); - } - } -#endif - /* Update original message if we are sync'ing a mailfolder */ if (flags & M_CM_UPDATE) { hdr->attach_del = 0; @@ -573,7 +558,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body, Context->vsize -= body->length - new_length; body->length = new_length; - mutt_free_body (&body->parts); + body_list_wipe(&body->parts); } return 0; @@ -583,12 +568,12 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body, (chflags & CH_PREFIX) ? prefix : NULL) == -1) return -1; - new_offset = ftell (fpout); + new_offset = ftello (fpout); } if (flags & M_CM_DECODE) { /* now make a text/plain version of the message */ - memset (&s, 0, sizeof (STATE)); + p_clear(&s, 1); s.fpin = fpin; s.fpout = fpout; if (flags & M_CM_PREFIX) @@ -604,26 +589,23 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body, if (flags & M_CM_REPLYING) s.flags |= M_REPLYING; - if (WithCrypto && flags & M_CM_VERIFY) + if (flags & M_CM_VERIFY) s.flags |= M_VERIFY; - mutt_body_handler (body, &s); + rc = mutt_body_handler (body, &s); } - else if (WithCrypto - && (flags & M_CM_DECODE_CRYPT) && (hdr->security & ENCRYPT)) { + else if ((flags & M_CM_DECODE_CRYPT) && (hdr->security & ENCRYPT)) { BODY *cur; FILE *fp; - if ((WithCrypto & APPLICATION_PGP) - && (flags & M_CM_DECODE_PGP) && (hdr->security & APPLICATION_PGP) && + if ((flags & M_CM_DECODE_PGP) && (hdr->security & APPLICATION_PGP) && hdr->content->type == TYPEMULTIPART) { if (crypt_pgp_decrypt_mime (fpin, &fp, hdr->content, &cur)) return (-1); - fputs ("Mime-Version: 1.0\n", fpout); + fputs ("MIME-Version: 1.0\n", fpout); } - if ((WithCrypto & APPLICATION_SMIME) - && (flags & M_CM_DECODE_SMIME) && (hdr->security & APPLICATION_SMIME) + if ((flags & M_CM_DECODE_SMIME) && (hdr->security & APPLICATION_SMIME) && hdr->content->type == TYPEAPPLICATION) { if (crypt_smime_decrypt_mime (fpin, &fp, hdr->content, &cur)) return (-1); @@ -632,17 +614,17 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body, mutt_write_mime_header (cur, fpout); fputc ('\n', fpout); - fseek (fp, cur->offset, 0); + fseeko (fp, cur->offset, 0); if (mutt_copy_bytes (fp, fpout, cur->length) == -1) { - fclose (fp); - mutt_free_body (&cur); + m_fclose(&fp); + body_list_wipe(&cur); return (-1); } - mutt_free_body (&cur); - fclose (fp); + body_list_wipe(&cur); + m_fclose(&fp); } else { - fseek (fpin, body->offset, 0); + fseeko (fpin, body->offset, 0); if (flags & M_CM_PREFIX) { int c; size_t bytes = body->length; @@ -663,10 +645,10 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body, if ((flags & M_CM_UPDATE) && (flags & M_CM_NOHEADER) == 0 && new_offset != -1) { body->offset = new_offset; - mutt_free_body (&body->parts); + body_list_wipe(&body->parts); } - return 0; + return rc; } int @@ -682,7 +664,6 @@ mutt_copy_message (FILE * fpout, CONTEXT * src, HEADER * hdr, int flags, _mutt_copy_message (fpout, msg->fp, hdr, hdr->content, flags, chflags)) == 0 && (ferror (fpout) || feof (fpout))) { - debug_print (1, ("_mutt_copy_message failed to detect EOF!\n")); r = -1; } mx_close_message (&msg); @@ -701,18 +682,17 @@ mutt_copy_message (FILE * fpout, CONTEXT * src, HEADER * hdr, int flags, */ int -_mutt_append_message (CONTEXT * dest, FILE * fpin, CONTEXT * src, - HEADER * hdr, BODY * body, int flags, int chflags) -{ +_mutt_append_message (CONTEXT * dest, FILE * fpin, CONTEXT * src __attribute__ ((unused)), + HEADER * hdr, BODY * body, int flags, int chflags) { + char buf[STRING]; MESSAGE *msg; int r; - if ((msg = - mx_open_new_message (dest, hdr, - (src->magic == M_MBOX - || src->magic == M_MMDF) ? 0 : M_ADD_FROM)) == - NULL) - return -1; + fseeko(fpin, hdr->offset, 0); + if (fgets (buf, sizeof (buf), fpin) == NULL) + return (-1); + if ((msg = mx_open_new_message (dest, hdr, is_from (buf, NULL, 0, NULL) ? 0 : M_ADD_FROM)) == NULL) + return (-1); if (dest->magic == M_MBOX || dest->magic == M_MMDF) chflags |= CH_FROM | CH_FORCE_FROM; chflags |= (dest->magic == M_MAILDIR ? CH_NOSTATUS : CH_UPDATE); @@ -755,23 +735,23 @@ static int copy_delete_attach (BODY * b, FILE * fpin, FILE * fpout, for (part = b->parts; part; part = part->next) { if (part->deleted || part->parts) { /* Copy till start of this part */ - if (mutt_copy_bytes (fpin, fpout, part->hdr_offset - ftell (fpin))) + if (mutt_copy_bytes (fpin, fpout, part->hdr_offset - ftello (fpin))) return -1; if (part->deleted) { fprintf (fpout, "Content-Type: message/external-body; access-type=x-mutt-deleted;\n" - "\texpiration=%s; length=%ld\n" + "\texpiration=%s; length=%lld\n" "\n", date + 5, part->length); if (ferror (fpout)) return -1; /* Copy the original mime headers */ - if (mutt_copy_bytes (fpin, fpout, part->offset - ftell (fpin))) + if (mutt_copy_bytes (fpin, fpout, part->offset - ftello (fpin))) return -1; /* Skip the deleted body */ - fseek (fpin, part->offset + part->length, SEEK_SET); + fseeko (fpin, part->offset + part->length, SEEK_SET); } else { if (copy_delete_attach (part, fpin, fpout, date)) @@ -781,7 +761,7 @@ static int copy_delete_attach (BODY * b, FILE * fpin, FILE * fpout, } /* Copy the last parts */ - if (mutt_copy_bytes (fpin, fpout, b->offset + b->length - ftell (fpin))) + if (mutt_copy_bytes (fpin, fpout, b->offset + b->length - ftello (fpin))) return -1; return 0; @@ -796,7 +776,7 @@ static int copy_delete_attach (BODY * b, FILE * fpin, FILE * fpout, * XXX - fix that. */ -static void format_address_header (char **h, ADDRESS * a) +static void format_address_header (char **h, address_t * a) { char buf[HUGE_STRING]; char cbuf[STRING]; @@ -804,27 +784,27 @@ static void format_address_header (char **h, ADDRESS * a) int l, linelen, buflen, count; - linelen = mutt_strlen (*h); + linelen = m_strlen(*h); buflen = linelen + 3; - safe_realloc (h, buflen); + p_realloc(h, buflen); for (count = 0; a; a = a->next, count++) { - ADDRESS *tmp = a->next; + address_t *tmp = a->next; a->next = NULL; *buf = *cbuf = *c2buf = '\0'; - rfc822_write_address (buf, sizeof (buf), a, 0); + rfc822_addrcat(buf, sizeof (buf), a, 0); a->next = tmp; - l = mutt_strlen (buf); + l = m_strlen(buf); if (count && linelen + l > 74) { - strcpy (cbuf, "\n\t"); /* __STRCPY_CHECKED__ */ + m_strcpy(cbuf, sizeof(cbuf), "\n\t"); linelen = l + 8; } else { if (a->mailbox) { - strcpy (cbuf, " "); /* __STRCPY_CHECKED__ */ + m_strcpy(cbuf, sizeof(cbuf), " "); linelen++; } linelen += l; @@ -832,101 +812,56 @@ static void format_address_header (char **h, ADDRESS * a) if (!a->group && a->next && a->next->mailbox) { linelen++; buflen++; - strcpy (c2buf, ","); /* __STRCPY_CHECKED__ */ + m_strcpy(c2buf, sizeof(c2buf), ","); } - buflen += l + mutt_strlen (cbuf) + mutt_strlen (c2buf); - safe_realloc (h, buflen); - strcat (*h, cbuf); /* __STRCAT_CHECKED__ */ - strcat (*h, buf); /* __STRCAT_CHECKED__ */ - strcat (*h, c2buf); /* __STRCAT_CHECKED__ */ + buflen += l + m_strlen(cbuf) + m_strlen(c2buf); + p_realloc(h, buflen); + m_strcat(*h, buflen, cbuf); + m_strcat(*h, buflen, buf); + m_strcat(*h, buflen, c2buf); } /* Space for this was allocated in the beginning of this function. */ - strcat (*h, "\n"); /* __STRCAT_CHECKED__ */ + m_strcat(*h, buflen, "\n"); } -static int address_header_decode (char **h) +static int address_header_decode(char **h) { - char *s = *h; - int l; + address_t *a; + char *p, *s = *h; - ADDRESS *a = NULL; + p = strchr(s, ':'); + if (!p) + return 0; - switch (tolower ((unsigned char) *s)) { - case 'r': - { - if (ascii_strncasecmp (s, "return-path:", 12) == 0) { - l = 12; - break; - } - else if (ascii_strncasecmp (s, "reply-to:", 9) == 0) { - l = 9; + switch (mime_which_token(s, p - s)) { + case MIME_RETURN_PATH: + case MIME_REPLY_TO: + case MIME_FROM: + case MIME_CC: + case MIME_BCC: + case MIME_SENDER: + case MIME_TO: + case MIME_MAIL_FOLLOWUP_TO: + p++; break; - } - return 0; - } - case 'f': - { - if (ascii_strncasecmp (s, "from:", 5)) - return 0; - l = 5; - break; - } - case 'c': - { - if (ascii_strncasecmp (s, "cc:", 3)) - return 0; - l = 3; - break; - } - case 'b': - { - if (ascii_strncasecmp (s, "bcc:", 4)) + default: return 0; - l = 4; - break; - } - case 's': - { - if (ascii_strncasecmp (s, "sender:", 7)) - return 0; - l = 7; - break; } - case 't': - { - if (ascii_strncasecmp (s, "to:", 3)) - return 0; - l = 3; - break; - } - case 'm': - { - if (ascii_strncasecmp (s, "mail-followup-to:", 17)) - return 0; - l = 17; - break; - } - default: - return 0; - } - if ((a = rfc822_parse_adrlist (a, s + l)) == NULL) - return 0; - - mutt_addrlist_to_local (a); - rfc2047_decode_adrlist (a); - - *h = safe_calloc (1, l + 2); - - strfcpy (*h, s, l + 1); + a = rfc822_parse_adrlist(a, p); + if (!a) + return 0; - format_address_header (h, a); + mutt_addrlist_to_local(a); + rfc2047_decode_adrlist(a); - rfc822_free_address (&a); + *h = p_dupstr(s, p - s); + format_address_header(h, a); + address_list_wipe(&a); - FREE (&s); - return 1; + p_delete(&s); + return 1; }