X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=copy.c;h=4368f028769be8e36198ac76d53a311083c0c6ca;hp=567d0e40e02b94a1a6c3b1872e5ad0ce282193ea;hb=d6988dab6bd378ccdf0f17aaa16de8aee1ceaf43;hpb=ba5e3af4ea19e1d20c80941c077039871ec84258 diff --git a/copy.c b/copy.c index 567d0e4..4368f02 100644 --- a/copy.c +++ b/copy.c @@ -12,6 +12,8 @@ #endif #include "mutt.h" +#include "ascii.h" +#include "handler.h" #include "mx.h" #include "copy.h" #include "rfc2047.h" @@ -50,6 +52,7 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags, int x; char *this_one = NULL; int error; + int curline = 0; if (ftell (in) != off_start) fseek (in, off_start, 0); @@ -136,6 +139,12 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags, /* Is it the begining of a header? */ if (nl && 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); + /* Do we have anything pending? */ if (this_one) { if (flags & CH_DECODE) { @@ -212,11 +221,19 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags, debug_print (2, ("Reorder: x = %d; hdr_count = %d\n", x, hdr_count)); if (!this_one) this_one = str_dup (buf); - else { + /* 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__ */ + /* 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, " ..."); } } } /* while (ftell (in) < off_end) */ @@ -335,7 +352,7 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags, if (flags & CH_TXTPLAIN) { char chsbuf[SHORT_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), @@ -429,7 +446,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: " OFF_T_FMT "\n", h->content->length); if (h->lines != 0 || h->content->length == 0) fprintf (out, "Lines: %d\n", h->lines); } @@ -448,7 +465,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, LOFF_T *length, size_t datelen) { int dellines = 0; @@ -501,7 +518,8 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body, { char prefix[SHORT_STRING]; STATE s; - long new_offset = -1; + LOFF_T new_offset = -1; + int rc = 0; if (flags & M_CM_PREFIX) { if (option (OPTTEXTFLOWED)) @@ -517,7 +535,7 @@ _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; + LOFF_T new_length = body->length; char date[SHORT_STRING]; mutt_make_date (date, sizeof (date)); @@ -532,14 +550,14 @@ _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: %ld\n", new_length); + fprintf (fpout, "Content-Length: " OFF_T_FMT "\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); @@ -548,7 +566,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body, #ifdef DEBUG { - long fail = ((ftell (fpout) - new_offset) - new_length); + LOFF_T fail = ((ftello (fpout) - new_offset) - new_length); if (fail) { mutt_error ("The length calculation was wrong by %ld bytes", fail); @@ -584,7 +602,7 @@ _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) { @@ -608,7 +626,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body, if (WithCrypto && 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)) { @@ -620,7 +638,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body, 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) @@ -667,7 +685,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body, mutt_free_body (&body->parts); } - return 0; + return rc; } int @@ -761,7 +779,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=%ld\n" + "\texpiration=%s; length=" OFF_T_FMT "\n" "\n", date + 5, part->length); if (ferror (fpout)) return -1;