X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=copy.c;h=f04e5b5b9c03935a9467933d1a05324b5307a5b5;hp=45eba0a344e3b45d7b7ef411896c5b208db9c7a2;hb=6d838d9aef36d95fa439b3f7cc06d4e81c8581bd;hpb=3f35b8874fb10587ce43e2853a1ef95573222015 diff --git a/copy.c b/copy.c index 45eba0a..f04e5b5 100644 --- a/copy.c +++ b/copy.c @@ -10,13 +10,13 @@ #include #include +#include #include #include "mutt.h" #include "handler.h" #include "copy.h" -#include -#include +#include "crypt.h" #include "mutt_idna.h" static int address_header_decode (char **str); @@ -106,7 +106,7 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end, } if (!ignore && fputs (buf, out) == EOF) - return (-1); + return -1; } return 0; } @@ -313,9 +313,7 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end, p_delete(&headers[x]); p_delete(&headers); - if (error) - return (-1); - return (0); + return error ? -1 : 0; } /* flags @@ -353,7 +351,7 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags, if (mutt_copy_hdr (in, out, h->offset, h->content->offset, flags, prefix) == -1) - return (-1); + return -1; if (flags & CH_TXTPLAIN) { char chsbuf[STRING]; @@ -361,7 +359,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); - charset_canonicalize(chsbuf, sizeof (chsbuf), Charset); + charset_canonicalize(chsbuf, sizeof (chsbuf), mod_cset.charset); rfc822_strcpy(buffer, sizeof(buffer), chsbuf, MimeSpecials); fputs (buffer, out); fputc ('\n', out); @@ -377,21 +375,21 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags, string_list_t *listp = h->env->in_reply_to; if (fputs ("In-Reply-To: ", out) == EOF) - return (-1); + return -1; for (; listp; listp = listp->next) if ((fputs (listp->data, out) == EOF) || (fputc (' ', out) == EOF)) - return (-1); + return -1; if (fputc ('\n', out) == EOF) - return (-1); + return -1; } if (h->env->refs_changed && h->env->references) { string_list_t *listp = h->env->references, *refs = NULL, *t; if (fputs ("References: ", out) == EOF) - return (-1); + return -1; /* Mutt stores references in reverse order, thus we create * a reordered refs list that we can put in the headers */ @@ -403,55 +401,55 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags, for (; refs; refs = refs->next) if ((fputs (refs->data, out) == EOF) || (fputc (' ', out) == EOF)) - return (-1); + return -1; /* clearing refs from memory */ for (t = refs; refs; refs = t->next, t = refs) p_delete(&refs); if (fputc ('\n', out) == EOF) - return (-1); + return -1; } if (h->old || h->read) { if (fputs ("Status: ", out) == EOF) - return (-1); + return -1; if (h->read) { if (fputs ("RO", out) == EOF) - return (-1); + return -1; } else if (h->old) { if (fputc ('O', out) == EOF) - return (-1); + return -1; } if (fputc ('\n', out) == EOF) - return (-1); + return -1; } if (h->flagged || h->replied) { if (fputs ("X-Status: ", out) == EOF) - return (-1); + return -1; if (h->replied) { if (fputc ('A', out) == EOF) - return (-1); + return -1; } if (h->flagged) { if (fputc ('F', out) == EOF) - return (-1); + return -1; } if (fputc ('\n', out) == EOF) - return (-1); + return -1; } } } if (flags & CH_UPDATE_LEN && (flags & CH_NOLEN) == 0) { - fprintf (out, "Content-Length: %lld\n", h->content->length); + fprintf (out, "Content-Length: %zu\n", h->content->length); if (h->lines != 0 || h->content->length == 0) fprintf (out, "Lines: %d\n", h->lines); } @@ -460,13 +458,13 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags, if (flags & CH_PREFIX) fputs (prefix, out); if (fputc ('\n', out) == EOF) /* add header terminator */ - return (-1); + return -1; } if (ferror (out) || feof (out)) return -1; - return (0); + return 0; } /* Count the number of lines and bytes to be deleted in this body*/ @@ -555,7 +553,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: %lld\n", new_length); + fprintf (fpout, "Content-Length: %zu\n", new_length); if (new_lines <= 0) new_lines = 0; else @@ -628,14 +626,14 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body, 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); + return -1; fputs ("MIME-Version: 1.0\n", fpout); } 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); + return -1; } mutt_write_mime_header (cur, fpout); @@ -645,7 +643,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body, if (mutt_copy_bytes (fp, fpout, cur->length) == -1) { m_fclose(&fp); body_list_wipe(&cur); - return (-1); + return -1; } body_list_wipe(&cur); m_fclose(&fp); @@ -717,10 +715,10 @@ _mutt_append_message (CONTEXT * dest, FILE * fpin, CONTEXT * src __attribute__ ( fseeko(fpin, hdr->offset, 0); if (fgets (buf, sizeof (buf), fpin) == NULL) - return (-1); + return -1; if ((msg = mx_open_new_message (dest, hdr, is_from (buf, NULL, 0, NULL) ? 0 : M_ADD_FROM)) == NULL) - return (-1); - if (dest->magic == M_MBOX || dest->magic == M_MMDF) + return -1; + if (dest->magic == M_MBOX) chflags |= CH_FROM | CH_FORCE_FROM; chflags |= (dest->magic == M_MAILDIR ? CH_NOSTATUS : CH_UPDATE); r = _mutt_copy_message (msg->fp, fpin, hdr, body, flags, chflags); @@ -768,7 +766,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=%lld\n" + "\texpiration=%s; length=%zu\n" "\n", date + 5, part->length); if (ferror (fpout)) return -1;