X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=copy.c;h=42543d3305f021ffe00b2145117dafa8c1d72583;hp=05a73713417f564b758d4f6418c1979207b6597f;hb=c01e17f6b99066ca30931a082ea855656174619b;hpb=7a368b3670a90656b2e0e724ed3efd79221f3d31 diff --git a/copy.c b/copy.c index 05a7371..42543d3 100644 --- a/copy.c +++ b/copy.c @@ -11,6 +11,11 @@ # include "config.h" #endif +#include +#include +#include +#include + #include #include #include @@ -23,17 +28,9 @@ #include "handler.h" #include "mx.h" #include "copy.h" -#include "rfc2047.h" -#include "mutt_crypt.h" +#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); @@ -49,7 +46,7 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end, int ignore = 0; char buf[STRING]; /* should be long enough to get most fields in one pass */ char *nl; - LIST *t; + string_list_t *t; char **headers; int hdr_count; int x; @@ -123,13 +120,10 @@ 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 */ @@ -210,7 +204,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; } } @@ -220,7 +213,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 @@ -354,7 +346,7 @@ 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_canonicalize (chsbuf, sizeof (chsbuf), Charset ? Charset : "us-ascii"); rfc822_strcpy(buffer, sizeof(buffer), chsbuf, MimeSpecials); fputs (buffer, out); @@ -368,7 +360,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 +374,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 +382,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; } @@ -445,7 +437,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); } @@ -549,7 +541,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 @@ -563,18 +555,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; @@ -622,26 +602,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); @@ -700,7 +677,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 +695,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 +754,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; @@ -940,7 +916,7 @@ static int address_header_decode (char **h) format_address_header (h, a); - address_delete (&a); + address_list_wipe(&a); p_delete(&s); return 1;