X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=copy.c;h=48dcabb300c21bb2f2825b2da4003235b635394d;hp=567d0e40e02b94a1a6c3b1872e5ad0ce282193ea;hb=ef7b80006ebb47372d69c64e8b2b2f0764333d55;hpb=ba5e3af4ea19e1d20c80941c077039871ec84258

diff --git a/copy.c b/copy.c
index 567d0e4..48dcabb 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"
@@ -36,9 +38,8 @@ static int copy_delete_attach (BODY * b, FILE * fpin, FILE * fpout,
  * below is to avoid creating a HEADER structure in message_handler().
  */
 int
-mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
-               const char *prefix)
-{
+mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
+               int flags, const char *prefix) {
   int from = 0;
   int this_is_from;
   int ignore = 0;
@@ -50,9 +51,10 @@ 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);
+  if (ftello (in) != off_start)
+    fseeko (in, off_start, 0);
 
   buf[0] = '\n';
   buf[1] = 0;
@@ -63,7 +65,7 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
     /* Without these flags to complicate things
      * we can do a more efficient line to line copying
      */
-    while (ftell (in) < off_end) {
+    while (ftello (in) < off_end) {
       nl = strchr (buf, '\n');
 
       if ((fgets (buf, sizeof (buf), in)) == NULL)
@@ -127,7 +129,7 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
   headers = mem_calloc (hdr_count, sizeof (char *));
 
   /* Read all the headers into the array */
-  while (ftell (in) < off_end) {
+  while (ftello (in) < off_end) {
     nl = strchr (buf, '\n');
 
     /* Read a line */
@@ -136,6 +138,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,14 +220,22 @@ 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) */
+  }                             /* while (ftello (in) < off_end) */
 
   /* Do we have anything pending?  -- XXX, same code as in above in the loop. */
   if (this_one) {
@@ -335,7 +351,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 +445,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: %zd\n", h->content->length);
     if (h->lines != 0 || h->content->length == 0)
       fprintf (out, "Lines: %d\n", h->lines);
   }
@@ -448,7 +464,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, off_t *length,
                                size_t datelen)
 {
   int dellines = 0;
@@ -456,7 +472,7 @@ static int count_delete_lines (FILE * fp, BODY * b, long *length,
   int ch;
 
   if (b->deleted) {
-    fseek (fp, b->offset, SEEK_SET);
+    fseeko (fp, b->offset, SEEK_SET);
     for (l = b->length; l; l--) {
       ch = getc (fp);
       if (ch == EOF)
@@ -501,7 +517,8 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
 {
   char prefix[SHORT_STRING];
   STATE s;
-  long new_offset = -1;
+  off_t new_offset = -1;
+  int rc = 0;
 
   if (flags & M_CM_PREFIX) {
     if (option (OPTTEXTFLOWED))
@@ -517,14 +534,14 @@ _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;
+      off_t new_length = body->length;
       char date[SHORT_STRING];
 
       mutt_make_date (date, sizeof (date));
       date[5] = date[str_len (date) - 1] = '\"';
 
       /* Count the number of lines and bytes to be deleted */
-      fseek (fpin, body->offset, SEEK_SET);
+      fseeko (fpin, body->offset, SEEK_SET);
       new_lines = hdr->lines -
         count_delete_lines (fpin, body, &new_length, str_len (date));
 
@@ -532,23 +549,23 @@ _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: %zd\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);
+      fseeko (fpin, body->offset, SEEK_SET);
       if (copy_delete_attach (body, fpin, fpout, date))
         return -1;
 
 #ifdef DEBUG
       {
-        long fail = ((ftell (fpout) - new_offset) - new_length);
+        off_t fail = ((ftello (fpout) - new_offset) - new_length);
 
         if (fail) {
           mutt_error ("The length calculation was wrong by %ld bytes", fail);
@@ -584,7 +601,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 +625,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 +637,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)
@@ -633,7 +650,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
     mutt_write_mime_header (cur, fpout);
     fputc ('\n', fpout);
 
-    fseek (fp, cur->offset, 0);
+    fseeko (fp, cur->offset, 0);
     if (mutt_copy_bytes (fp, fpout, cur->length) == -1) {
       fclose (fp);
       mutt_free_body (&cur);
@@ -643,7 +660,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
     fclose (fp);
   }
   else {
-    fseek (fpin, body->offset, 0);
+    fseeko (fpin, body->offset, 0);
     if (flags & M_CM_PREFIX) {
       int c;
       size_t bytes = body->length;
@@ -667,7 +684,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
     mutt_free_body (&body->parts);
   }
 
-  return 0;
+  return rc;
 }
 
 int
@@ -708,7 +725,7 @@ _mutt_append_message (CONTEXT * dest, FILE * fpin, CONTEXT * src,
   MESSAGE *msg;
   int r;
 
-  fseek(fpin, hdr->offset, 0);
+  fseeko(fpin, hdr->offset, 0);
   if (fgets (buf, sizeof (buf), fpin) == NULL)
     return (-1);
   if ((msg = mx_open_new_message (dest, hdr, is_from (buf, NULL, 0, NULL) ? 0 : M_ADD_FROM)) == NULL)
@@ -755,23 +772,23 @@ static int copy_delete_attach (BODY * b, FILE * fpin, FILE * fpout,
   for (part = b->parts; part; part = part->next) {
     if (part->deleted || part->parts) {
       /* Copy till start of this part */
-      if (mutt_copy_bytes (fpin, fpout, part->hdr_offset - ftell (fpin)))
+      if (mutt_copy_bytes (fpin, fpout, part->hdr_offset - ftello (fpin)))
         return -1;
 
       if (part->deleted) {
         fprintf (fpout,
                  "Content-Type: message/external-body; access-type=x-mutt-deleted;\n"
-                 "\texpiration=%s; length=%ld\n"
+                 "\texpiration=%s; length=%zd\n"
                  "\n", date + 5, part->length);
         if (ferror (fpout))
           return -1;
 
         /* Copy the original mime headers */
-        if (mutt_copy_bytes (fpin, fpout, part->offset - ftell (fpin)))
+        if (mutt_copy_bytes (fpin, fpout, part->offset - ftello (fpin)))
           return -1;
 
         /* Skip the deleted body */
-        fseek (fpin, part->offset + part->length, SEEK_SET);
+        fseeko (fpin, part->offset + part->length, SEEK_SET);
       }
       else {
         if (copy_delete_attach (part, fpin, fpout, date))
@@ -781,7 +798,7 @@ static int copy_delete_attach (BODY * b, FILE * fpin, FILE * fpout,
   }
 
   /* Copy the last parts */
-  if (mutt_copy_bytes (fpin, fpout, b->offset + b->length - ftell (fpin)))
+  if (mutt_copy_bytes (fpin, fpout, b->offset + b->length - ftello (fpin)))
     return -1;
 
   return 0;