X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=copy.c;h=0c5f8b467511bad0b54ae71b8eca42d854bed6ff;hp=48dcabb300c21bb2f2825b2da4003235b635394d;hb=f3cbb9f51357972f6e74244494236a41dc4d84cd;hpb=ef7b80006ebb47372d69c64e8b2b2f0764333d55 diff --git a/copy.c b/copy.c index 48dcabb..0c5f8b4 100644 --- a/copy.c +++ b/copy.c @@ -7,29 +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 "ascii.h" #include "handler.h" -#include "mx.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); @@ -44,12 +33,13 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end, 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; @@ -66,15 +56,15 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end, * we can do a more efficient line to line copying */ while (ftello (in) < off_end) { - nl = strchr (buf, '\n'); + 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 && str_ncmp ("From ", buf, 5) == 0) { + if (!from && m_strncmp("From ", buf, 5) == 0) { if ((flags & CH_FROM) == 0) continue; from = 1; @@ -119,30 +109,27 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end, */ 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 = mem_calloc (hdr_count, sizeof (char *)); + headers = p_new(char *, hdr_count); /* Read all the headers into the array */ while (ftello (in) < off_end) { - nl = strchr (buf, '\n'); + 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) && (ascii_strncmp ("To:", buf, 3) == 0 || - ascii_strncmp ("Cc:", buf, 3) == 0 || - ascii_strncmp ("Bcc:", buf, 4) == 0); + 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) { @@ -154,10 +141,10 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end, if (!headers[x]) headers[x] = this_one; else { - mem_realloc (&headers[x], str_len (headers[x]) + - str_len (this_one) + sizeof (char)); - strcat (headers[x], this_one); /* __STRCAT_CHECKED__ */ - mem_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; @@ -165,7 +152,7 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end, ignore = 1; this_is_from = 0; - if (!from && str_ncmp ("From ", buf, 5) == 0) { + if (!from && m_strncmp("From ", buf, 5) == 0) { if ((flags & CH_FROM) == 0) continue; this_is_from = from = 1; @@ -206,8 +193,7 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end, /* 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, str_len (t->data))) { - debug_print (2, ("Reorder: %s matches %s\n", t->data, buf)); + if (!ascii_strncasecmp (buf, t->data, m_strlen(t->data))) { break; } } @@ -217,22 +203,21 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end, } /* If beginning of header */ if (!ignore) { - debug_print (2, ("Reorder: x = %d; hdr_count = %d\n", x, hdr_count)); if (!this_one) - this_one = str_dup (buf); + 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) { - mem_realloc (&this_one, - str_len (this_one) + str_len (buf) + - sizeof (char)); - 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) { - mem_realloc (&this_one, str_len (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) */ @@ -247,10 +232,10 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end, if (!headers[x]) headers[x] = this_one; else { - mem_realloc (&headers[x], str_len (headers[x]) + - str_len (this_one) + sizeof (char)); - strcat (headers[x], this_one); /* __STRCAT_CHECKED__ */ - mem_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; @@ -259,11 +244,6 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end, /* 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. */ @@ -303,8 +283,8 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end, /* Free in a separate loop to be sure that all headers are freed * in case of error. */ for (x = 0; x < hdr_count; x++) - mem_free (&headers[x]); - mem_free (&headers); + p_delete(&headers[x]); + p_delete(&headers); if (error) return (-1); @@ -354,9 +334,8 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags, 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); @@ -368,7 +347,7 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags, if (flags & CH_UPDATE) { if ((flags & CH_NOSTATUS) == 0) { if (h->env->irt_changed && h->env->in_reply_to) { - LIST *listp = h->env->in_reply_to; + string_list_t *listp = h->env->in_reply_to; if (fputs ("In-Reply-To: ", out) == EOF) return (-1); @@ -382,7 +361,7 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags, } if (h->env->refs_changed && h->env->references) { - LIST *listp = h->env->references, *refs = NULL, *t; + string_list_t *listp = h->env->references, *refs = NULL, *t; if (fputs ("References: ", out) == EOF) return (-1); @@ -390,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 *) mem_malloc (sizeof (LIST)); + t = p_new(string_list_t, 1); t->data = listp->data; t->next = refs; } @@ -401,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) - mem_free (&refs); + p_delete(&refs); if (fputc ('\n', out) == EOF) return (-1); @@ -445,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: %zd\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); } @@ -522,7 +501,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body, 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); @@ -538,18 +517,18 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body, char date[SHORT_STRING]; mutt_make_date (date, sizeof (date)); - date[5] = date[str_len (date) - 1] = '\"'; + date[5] = date[m_strlen(date) - 1] = '\"'; /* Count the number of lines and bytes to be deleted */ fseeko (fpin, body->offset, SEEK_SET); new_lines = hdr->lines - - count_delete_lines (fpin, body, &new_length, str_len (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: %zd\n", new_length); + fprintf (fpout, "Content-Length: %lld\n", new_length); if (new_lines <= 0) new_lines = 0; else @@ -563,18 +542,6 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body, if (copy_delete_attach (body, fpin, fpout, date)) return -1; -#ifdef DEBUG - { - off_t fail = ((ftello (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; @@ -591,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; @@ -606,7 +573,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body, 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) @@ -622,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; 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); } - 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); @@ -652,12 +616,12 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body, 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 { fseeko (fpin, body->offset, 0); @@ -681,7 +645,7 @@ _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 rc; @@ -700,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); @@ -719,7 +682,7 @@ mutt_copy_message (FILE * fpout, CONTEXT * src, HEADER * hdr, int flags, */ int -_mutt_append_message (CONTEXT * dest, FILE * fpin, CONTEXT * src, +_mutt_append_message (CONTEXT * dest, FILE * fpin, CONTEXT * src __attribute__ ((unused)), HEADER * hdr, BODY * body, int flags, int chflags) { char buf[STRING]; MESSAGE *msg; @@ -778,7 +741,7 @@ static int copy_delete_attach (BODY * b, FILE * fpin, FILE * fpout, if (part->deleted) { fprintf (fpout, "Content-Type: message/external-body; access-type=x-mutt-deleted;\n" - "\texpiration=%s; length=%zd\n" + "\texpiration=%s; length=%lld\n" "\n", date + 5, part->length); if (ferror (fpout)) return -1; @@ -813,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]; @@ -821,27 +784,27 @@ static void format_address_header (char **h, ADDRESS * a) int l, linelen, buflen, count; - linelen = str_len (*h); + linelen = m_strlen(*h); buflen = linelen + 3; - mem_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); a->next = tmp; - l = str_len (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; @@ -849,18 +812,18 @@ 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 + str_len (cbuf) + str_len (c2buf); - mem_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) @@ -868,7 +831,7 @@ static int address_header_decode (char **h) char *s = *h; int l; - ADDRESS *a = NULL; + address_t *a = NULL; switch (tolower ((unsigned char) *s)) { case 'r': @@ -936,14 +899,12 @@ static int address_header_decode (char **h) mutt_addrlist_to_local (a); rfc2047_decode_adrlist (a); - *h = mem_calloc (1, l + 2); - - strfcpy (*h, s, l + 1); + *h = p_dupstr(s, l + 1); format_address_header (h, a); - rfc822_free_address (&a); + address_list_wipe(&a); - mem_free (&s); + p_delete(&s); return 1; }