X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=copy.c;h=55dd1921df560205d31eef6b853e3c731c9d0c23;hp=5e0b7dbb07dd1b75a24a04df42670d5b6b7f2beb;hb=7d29626ce4e1fa932c6349c7253e6f774df069fc;hpb=928ca0d87eb15bfa4c150abdadadaf3b177f95bd diff --git a/copy.c b/copy.c index 5e0b7db..55dd192 100644 --- a/copy.c +++ b/copy.c @@ -39,6 +39,7 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end, int hdr_count; int x; char *this_one = NULL; + ssize_t this_one_len = 0, headers_len = 0; int error; int curline = 0; @@ -140,8 +141,9 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end, if (!headers[x]) headers[x] = this_one; else { - p_realloc(&headers[x], m_strlen(headers[x]) + m_strlen(this_one) + 1); - strcat(headers[x], this_one); /* __STRCAT_CHECKED__ */ + 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); } @@ -161,8 +163,8 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end, /* 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) @@ -207,13 +209,15 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end, * 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) { - p_realloc(&this_one, m_strlen(this_one) + m_strlen(buf) + 1); - strcat (this_one, buf); /* __STRCAT_CHECKED__ */ + 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) { - p_realloc(&this_one, m_strlen(this_one) + 5); - strcat (this_one, " ..."); + this_one_len = m_strlen(this_one) + 5; + p_realloc(&this_one, this_one_len); + m_strcat(this_one, this_one_len, " ..."); } } } /* while (ftello (in) < off_end) */ @@ -228,8 +232,9 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end, if (!headers[x]) headers[x] = this_one; else { - p_realloc(&headers[x], m_strlen(headers[x]) + m_strlen(this_one) + 1); - strcat (headers[x], this_one); /* __STRCAT_CHECKED__ */ + 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); } @@ -313,7 +318,7 @@ int mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags, const char *prefix) { - char buffer[SHORT_STRING]; + char buffer[STRING]; if (h->env) flags |= (h->env->irt_changed ? CH_UPDATE_IRT : 0) | @@ -324,7 +329,7 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags, return (-1); if (flags & CH_TXTPLAIN) { - char chsbuf[SHORT_STRING]; + char chsbuf[STRING]; fputs ("MIME-Version: 1.0\n", out); fputs ("Content-Transfer-Encoding: 8bit\n", out); @@ -489,7 +494,7 @@ 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; off_t new_offset = -1; int rc = 0; @@ -509,7 +514,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body, else if (hdr->attach_del && (chflags & CH_UPDATE_LEN)) { int new_lines; off_t new_length = body->length; - char date[SHORT_STRING]; + char date[STRING]; mutt_make_date (date, sizeof (date)); date[5] = date[m_strlen(date) - 1] = '\"'; @@ -789,17 +794,17 @@ static void format_address_header (char **h, address_t * a) 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 = 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; @@ -807,99 +812,56 @@ static void format_address_header (char **h, address_t * a) if (!a->group && a->next && a->next->mailbox) { linelen++; buflen++; - strcpy (c2buf, ","); /* __STRCPY_CHECKED__ */ + m_strcpy(c2buf, sizeof(c2buf), ","); } buflen += l + m_strlen(cbuf) + m_strlen(c2buf); p_realloc(h, buflen); - strcat (*h, cbuf); /* __STRCAT_CHECKED__ */ - strcat (*h, buf); /* __STRCAT_CHECKED__ */ - strcat (*h, c2buf); /* __STRCAT_CHECKED__ */ + 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_t *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)) - 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)) + default: 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 = p_dupstr(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); - address_list_wipe(&a); + *h = p_dupstr(s, p - s); + format_address_header(h, a); + address_list_wipe(&a); - p_delete(&s); - return 1; + p_delete(&s); + return 1; }