X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=copy.c;h=d386400d56e0c3007b537e9d92bc12e6ef6f5204;hp=2d205de037679b6bc9a8f402b0e36f2387ea2f37;hb=916e4872caf252a5850e64f79427b9dd7808435d;hpb=7f7a0be369840b290248e5b0302beb447fa1b3cd diff --git a/copy.c b/copy.c index 2d205de..d386400 100644 --- a/copy.c +++ b/copy.c @@ -7,30 +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 +#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/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); @@ -45,8 +33,8 @@ 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; @@ -67,15 +55,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; @@ -120,30 +108,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 = 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) { @@ -165,7 +150,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; @@ -207,7 +192,6 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end, if (flags & CH_REORDER) { for (t = HeaderOrderList, x = 0; (t); t = t->next, x++) { if (!ascii_strncasecmp (buf, t->data, m_strlen(t->data))) { - debug_print (2, ("Reorder: %s matches %s\n", t->data, buf)); break; } } @@ -217,7 +201,6 @@ 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 = m_strdup(buf); /* we do want to see all lines if this header doesn't feature @@ -351,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); @@ -365,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); @@ -379,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); @@ -387,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 = p_new(LIST, 1); + t = p_new(string_list_t, 1); t->data = listp->data; t->next = refs; } @@ -442,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); } @@ -519,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); @@ -546,7 +528,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body, 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 @@ -560,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; @@ -588,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; @@ -603,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) @@ -619,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); @@ -649,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); @@ -678,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; @@ -697,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); @@ -716,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; @@ -775,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; @@ -810,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]; @@ -824,7 +790,7 @@ static void format_address_header (char **h, ADDRESS * a) 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'; @@ -865,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': @@ -937,7 +903,7 @@ static int address_header_decode (char **h) format_address_header (h, a); - rfc822_free_address (&a); + address_list_wipe(&a); p_delete(&s); return 1;