/*
+ * Copyright notice from original mutt:
* Copyright (C) 1996-2000,2002 Michael R. Elkins <me@mutt.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
- */
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
+ */
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
+
+#include <lib-mime/mime.h>
+#include <lib-ui/lib-ui.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
-#include "mailbox.h"
-#include "mx.h"
+#include "handler.h"
#include "copy.h"
-#include "rfc2047.h"
-#include "mime.h"
-#include "mutt_crypt.h"
+#include "crypt.h"
#include "mutt_idna.h"
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <unistd.h> /* 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);
+static int copy_delete_attach (BODY * b, FILE * fpin, FILE * fpout,
+ char *date);
/* Ok, the only reason for not merging this with mutt_copy_header()
* 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;
- char buf[STRING]; /* should be long enough to get most fields in one pass */
- char *nl;
- LIST *t;
+ char buf[STRING]; /* should be long enough to get most fields in one pass */
+ char *eol;
+ string_list_t *t;
char **headers;
int hdr_count;
int x;
char *this_one = NULL;
+ ssize_t this_one_len = 0, headers_len = 0;
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;
- if ((flags & (CH_REORDER | CH_WEED | CH_MIME | CH_DECODE | CH_PREFIX | CH_WEED_DELIVERED)) == 0)
- {
+ if ((flags &
+ (CH_REORDER | CH_WEED | CH_MIME | CH_DECODE | CH_PREFIX |
+ CH_WEED_DELIVERED)) == 0) {
/* Without these flags to complicate things
* we can do a more efficient line to line copying
*/
- while (ftell (in) < off_end)
- {
- nl = strchr (buf, '\n');
+ while (ftello (in) < off_end) {
+ eol = strchr (buf, '\n');
if ((fgets (buf, sizeof (buf), in)) == NULL)
- break;
+ break;
/* Is it the begining of a header? */
- if (nl && buf[0] != ' ' && buf[0] != '\t')
- {
- ignore = 1;
- if (!from && mutt_strncmp ("From ", buf, 5) == 0)
- {
- if ((flags & CH_FROM) == 0)
- continue;
- from = 1;
- }
- else if (flags & (CH_NOQFROM) &&
- ascii_strncasecmp (">From ", buf, 6) == 0)
- continue;
-
- else if (buf[0] == '\n' || (buf[0] == '\r' && buf[1] == '\n'))
- break; /* end of header */
-
- if ((flags & (CH_UPDATE | CH_XMIT | CH_NOSTATUS)) &&
- (ascii_strncasecmp ("Status:", buf, 7) == 0 ||
- ascii_strncasecmp ("X-Status:", buf, 9) == 0))
- continue;
- if ((flags & (CH_UPDATE_LEN | CH_XMIT | CH_NOLEN)) &&
- (ascii_strncasecmp ("Content-Length:", buf, 15) == 0 ||
- ascii_strncasecmp ("Lines:", buf, 6) == 0))
- continue;
- if ((flags & CH_UPDATE_REFS) &&
- ascii_strncasecmp ("References:", buf, 11) == 0)
- continue;
- if ((flags & CH_UPDATE_IRT) &&
- ascii_strncasecmp ("In-Reply-To:", buf, 12) == 0)
- continue;
- ignore = 0;
+ if (eol && buf[0] != ' ' && buf[0] != '\t') {
+ ignore = 1;
+ if (!from && m_strncmp("From ", buf, 5) == 0) {
+ if ((flags & CH_FROM) == 0)
+ continue;
+ from = 1;
+ }
+ else if (flags & (CH_NOQFROM) &&
+ ascii_strncasecmp (">From ", buf, 6) == 0)
+ continue;
+
+ else if (buf[0] == '\n' || (buf[0] == '\r' && buf[1] == '\n'))
+ break; /* end of header */
+
+ switch (mime_which_token(buf, (strchr(buf, ':') ?: buf) - buf)) {
+ case MIME_STATUS:
+ case MIME_X_STATUS:
+ if (flags & (CH_UPDATE | CH_XMIT | CH_NOSTATUS))
+ continue;
+ break;
+
+ case MIME_CONTENT_LENGTH:
+ case MIME_LINES:
+ if (flags & (CH_UPDATE_LEN | CH_XMIT | CH_NOLEN))
+ continue;
+ break;
+
+ case MIME_REFERENCES:
+ if (flags & CH_UPDATE_REFS)
+ continue;
+ break;
+
+ case MIME_IN_REPLY_TO:
+ if (flags & CH_UPDATE_IRT)
+ continue;
+ break;
+
+ default:
+ break;
+ }
+ ignore = 0;
}
if (!ignore && fputs (buf, out) == EOF)
- return (-1);
+ return -1;
}
return 0;
}
* so we are able to do re-ordering.
* First count the number of entries in the array
*/
- if (flags & CH_REORDER)
- {
- for (t = HeaderOrderList; t; t = t->next)
- {
- dprint(1, (debugfile, "Reorder list: %s\n", t->data));
+ if (flags & CH_REORDER) {
+ for (t = HeaderOrderList; t; t = t->next) {
hdr_count++;
}
}
- dprint (1, (debugfile, "WEED is %s\n", (flags & CH_WEED) ? "Set" : "Not"));
-
- headers = safe_calloc (hdr_count, sizeof (char *));
+ headers = p_new(char *, hdr_count);
/* Read all the headers into the array */
- while (ftell (in) < off_end)
- {
- nl = strchr (buf, '\n');
+ while (ftello (in) < off_end) {
+ 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) && (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)
- {
- if (flags & CH_DECODE)
- {
- if (!address_header_decode (&this_one))
- rfc2047_decode (&this_one);
- }
-
- if (!headers[x])
- headers[x] = this_one;
- else
- {
- safe_realloc (&headers[x], mutt_strlen (headers[x]) +
- mutt_strlen (this_one) + sizeof (char));
- strcat (headers[x], this_one); /* __STRCAT_CHECKED__ */
- FREE (&this_one);
- }
-
- this_one = NULL;
+ if (this_one) {
+ if (flags & CH_DECODE) {
+ if (!address_header_decode (&this_one))
+ rfc2047_decode (&this_one);
+ }
+
+ if (!headers[x])
+ headers[x] = this_one;
+ else {
+ headers_len = m_strlen(headers[x]) + m_strlen(this_one) + 1;
+ p_realloc(&headers[x], headers_len);
+ m_strcat(headers[x], headers_len, this_one);
+ p_delete(&this_one);
+ }
+
+ this_one = NULL;
}
-
+
ignore = 1;
this_is_from = 0;
- if (!from && mutt_strncmp ("From ", buf, 5) == 0)
- {
- if ((flags & CH_FROM) == 0)
- continue;
- this_is_from = from = 1;
+ if (!from && m_strncmp("From ", buf, 5) == 0) {
+ if ((flags & CH_FROM) == 0)
+ continue;
+ this_is_from = from = 1;
}
else if (buf[0] == '\n' || (buf[0] == '\r' && buf[1] == '\n'))
- break; /* end of header */
+ break; /* end of header */
/* note: CH_FROM takes precedence over header weeding. */
if (!((flags & CH_FROM) && (flags & CH_FORCE_FROM) && this_is_from) &&
- (flags & CH_WEED) &&
- mutt_matches_ignore (buf, Ignore) &&
- !mutt_matches_ignore (buf, UnIgnore))
- continue;
- if ((flags & CH_WEED_DELIVERED) &&
- ascii_strncasecmp ("Delivered-To:", buf, 13) == 0)
- continue;
- if ((flags & (CH_UPDATE | CH_XMIT | CH_NOSTATUS)) &&
- (ascii_strncasecmp ("Status:", buf, 7) == 0 ||
- ascii_strncasecmp ("X-Status:", buf, 9) == 0))
- continue;
- if ((flags & (CH_UPDATE_LEN | CH_XMIT | CH_NOLEN)) &&
- (ascii_strncasecmp ("Content-Length:", buf, 15) == 0 ||
- ascii_strncasecmp ("Lines:", buf, 6) == 0))
- continue;
- if ((flags & CH_MIME) &&
- ((ascii_strncasecmp ("content-", buf, 8) == 0 &&
- (ascii_strncasecmp ("transfer-encoding:", buf + 8, 18) == 0 ||
- ascii_strncasecmp ("type:", buf + 8, 5) == 0)) ||
- ascii_strncasecmp ("mime-version:", buf, 13) == 0))
- continue;
- if ((flags & CH_UPDATE_REFS) &&
- ascii_strncasecmp ("References:", buf, 11) == 0)
- continue;
- if ((flags & CH_UPDATE_IRT) &&
- ascii_strncasecmp ("In-Reply-To:", buf, 12) == 0)
- continue;
+ (flags & CH_WEED) && string_list_contains(Ignore, buf, "*")
+ && !string_list_contains(UnIgnore, buf, "*"))
+ continue;
+
+ switch (mime_which_token(buf, (strchr(buf, ':') ?: buf) - buf)) {
+ case MIME_DELIVERED_TO:
+ if (flags & CH_WEED_DELIVERED)
+ continue;
+ break;
+
+ case MIME_STATUS:
+ case MIME_X_STATUS:
+ if (flags & (CH_UPDATE | CH_XMIT | CH_NOSTATUS))
+ continue;
+ break;
+
+ case MIME_CONTENT_LENGTH:
+ case MIME_LINES:
+ if (flags & (CH_UPDATE_LEN | CH_XMIT | CH_NOLEN))
+ continue;
+ break;
+
+ case MIME_CONTENT_TRANSFER_ENCODING:
+ case MIME_CONTENT_TYPE:
+ case MIME_MIME_VERSION:
+ if (flags & CH_MIME)
+ continue;
+ break;
+
+ case MIME_REFERENCES:
+ if (flags & CH_UPDATE_REFS)
+ continue;
+ break;
+
+ case MIME_IN_REPLY_TO:
+ if (flags & CH_UPDATE_IRT)
+ continue;
+ break;
+
+ default:
+ break;
+ }
/* Find x -- the array entry where this header is to be saved */
- if (flags & CH_REORDER)
- {
- for (t = HeaderOrderList, x = 0 ; (t) ; t = t->next, x++)
- {
- if (!ascii_strncasecmp (buf, t->data, mutt_strlen (t->data)))
- {
- dprint(2, (debugfile, "Reorder: %s matches %s\n", t->data, buf));
- break;
- }
- }
+ if (flags & CH_REORDER) {
+ for (t = HeaderOrderList, x = 0; (t); t = t->next, x++) {
+ if (!ascii_strncasecmp (buf, t->data, m_strlen(t->data))) {
+ break;
+ }
+ }
}
-
+
ignore = 0;
- } /* If beginning of header */
+ } /* If beginning of header */
- if (!ignore)
- {
- dprint (2, (debugfile, "Reorder: x = %d; hdr_count = %d\n", x, hdr_count));
+ if (!ignore) {
if (!this_one)
- this_one = safe_strdup (buf);
- else
- {
- safe_realloc (&this_one,
- mutt_strlen (this_one) + mutt_strlen (buf) + sizeof (char));
- strcat (this_one, buf); /* __STRCAT_CHECKED__ */
+ this_one = m_strdup(buf);
+ /* 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) {
+ this_one_len = m_strlen(this_one) + m_strlen(buf) + 1;
+ p_realloc(&this_one, this_one_len);
+ m_strcat(this_one, this_one_len, buf);
+ /* only for the first line which doesn't exeeds
+ * $max_display_recips: abbreviate it */
+ } else if (curline == MaxDispRecips+1) {
+ this_one_len = m_strlen(this_one) + 5;
+ p_realloc(&this_one, this_one_len);
+ m_strcat(this_one, this_one_len, " ...");
}
}
- } /* 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)
- {
- if (flags & CH_DECODE)
- {
+ if (this_one) {
+ if (flags & CH_DECODE) {
if (!address_header_decode (&this_one))
- rfc2047_decode (&this_one);
+ rfc2047_decode (&this_one);
}
-
+
if (!headers[x])
headers[x] = this_one;
- else
- {
- safe_realloc (&headers[x], mutt_strlen (headers[x]) +
- mutt_strlen (this_one) + sizeof (char));
- strcat (headers[x], this_one); /* __STRCAT_CHECKED__ */
- FREE (&this_one);
+ else {
+ headers_len = m_strlen(headers[x]) + m_strlen(this_one) + 1;
+ p_realloc(&headers[x], headers_len);
+ m_strcat(headers[x], headers_len, this_one);
+ p_delete(&this_one);
}
-
+
this_one = NULL;
}
/* Now output the headers in order */
- for (x = 0; x < hdr_count; x++)
- {
- if (headers[x])
- {
-#if 0
- if (flags & CH_DECODE)
- rfc2047_decode (&headers[x]);
-#endif
-
+ for (x = 0; x < hdr_count; x++) {
+ if (headers[x]) {
/* We couldn't do the prefixing when reading because RFC 2047
* decoding may have concatenated lines.
*/
- if (flags & CH_PREFIX)
- {
- char *ch = headers[x];
- int print_prefix = 1;
-
- while (*ch)
- {
- if (print_prefix)
- {
- if (fputs (prefix, out) == EOF)
- {
- error = TRUE;
- break;
- }
- print_prefix = 0;
- }
-
- if (*ch == '\n' && ch[1])
- print_prefix = 1;
-
- if (putc (*ch++, out) == EOF)
- {
- error = TRUE;
- break;
- }
- }
- if (error)
- break;
+ if (flags & CH_PREFIX) {
+ char *ch = headers[x];
+ int print_prefix = 1;
+
+ while (*ch) {
+ if (print_prefix) {
+ if (fputs (prefix, out) == EOF) {
+ error = TRUE;
+ break;
+ }
+ print_prefix = 0;
+ }
+
+ if (*ch == '\n' && ch[1])
+ print_prefix = 1;
+
+ if (putc (*ch++, out) == EOF) {
+ error = TRUE;
+ break;
+ }
+ }
+ if (error)
+ break;
}
- else
- {
- if (fputs (headers[x], out) == EOF)
- {
- error = TRUE;
- break;
- }
+ else {
+ if (fputs (headers[x], out) == EOF) {
+ error = TRUE;
+ break;
+ }
}
}
}
/* Free in a separate loop to be sure that all headers are freed
* in case of error. */
for (x = 0; x < hdr_count; x++)
- FREE (&headers[x]);
- FREE (&headers);
+ p_delete(&headers[x]);
+ p_delete(&headers);
- if (error)
- return (-1);
- return (0);
+ return error ? -1 : 0;
}
/* flags
*/
int
-mutt_copy_header (FILE *in, HEADER *h, FILE *out, int flags, const char *prefix)
+mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags,
+ const char *prefix)
{
- char buffer[SHORT_STRING];
-
- flags |= (h->irt_changed ? CH_UPDATE_IRT : 0)
- | (h->refs_changed ? CH_UPDATE_REFS : 0);
-
- if (mutt_copy_hdr (in, out, h->offset, h->content->offset, flags, prefix) == -1)
- return (-1);
-
- if (flags & CH_TXTPLAIN)
- {
- char chsbuf[SHORT_STRING];
- fputs ("Mime-Version: 1.0\n", out);
+ char buffer[STRING];
+
+ if (h->env)
+ flags |= (h->env->irt_changed ? CH_UPDATE_IRT : 0) |
+ (h->env->refs_changed ? CH_UPDATE_REFS : 0);
+
+ if (mutt_copy_hdr (in, out, h->offset, h->content->offset, flags, prefix) ==
+ -1)
+ return -1;
+
+ if (flags & CH_TXTPLAIN) {
+ char chsbuf[STRING];
+
+ 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);
- fputs(buffer, out);
- fputc('\n', out);
-
+ charset_canonicalize(chsbuf, sizeof (chsbuf), mod_cset.charset);
+ rfc822_strcpy(buffer, sizeof(buffer), chsbuf, MimeSpecials);
+ fputs (buffer, out);
+ fputc ('\n', out);
+
if (ferror (out) != 0 || feof (out) != 0)
return -1;
-
+
}
- if (flags & CH_UPDATE)
- {
- if ((flags & CH_NOSTATUS) == 0)
- {
- if (h->irt_changed && h->new_env->in_reply_to)
- {
- LIST *listp = h->new_env->in_reply_to;
+ if (flags & CH_UPDATE) {
+ if ((flags & CH_NOSTATUS) == 0) {
+ if (h->env->irt_changed && h->env->in_reply_to) {
+ string_list_t *listp = h->env->in_reply_to;
- if (fputs ("In-Reply-To: ", out) == EOF)
- return (-1);
+ if (fputs ("In-Reply-To: ", out) == EOF)
+ return -1;
- for (; listp; listp = listp->next)
- if ((fputs (listp->data, out) == EOF) || (fputc (' ', out) == EOF))
- return (-1);
+ for (; listp; listp = listp->next)
+ if ((fputs (listp->data, out) == EOF) || (fputc (' ', out) == EOF))
+ return -1;
- if (fputc ('\n', out) == EOF)
- return (-1);
+ if (fputc ('\n', out) == EOF)
+ return -1;
}
- if (h->refs_changed && h->new_env->references)
- {
- LIST *listp = h->new_env->references, *refs = NULL, *t;
+ 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);
+ if (fputs ("References: ", out) == EOF)
+ return -1;
- /* 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 = (LIST *)safe_malloc (sizeof (LIST));
- t->data = listp->data;
- t->next = refs;
- }
+ /* 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(string_list_t, 1);
+ t->data = listp->data;
+ t->next = refs;
+ }
- for (; refs; refs = refs->next)
- if ((fputs (refs->data, out) == EOF) || (fputc (' ', out) == EOF))
- return (-1);
+ for (; refs; refs = refs->next)
+ if ((fputs (refs->data, out) == EOF) || (fputc (' ', out) == EOF))
+ return -1;
- /* clearing refs from memory */
- for (t = refs; refs; refs = t->next, t = refs)
- FREE(&refs);
+ /* clearing refs from memory */
+ for (t = refs; refs; refs = t->next, t = refs)
+ p_delete(&refs);
- if (fputc ('\n', out) == EOF)
- return (-1);
+ if (fputc ('\n', out) == EOF)
+ return -1;
}
- if (h->old || h->read)
- {
- if (fputs ("Status: ", out) == EOF)
- return (-1);
-
- if (h->read)
- {
- if (fputs ("RO", out) == EOF)
- return (-1);
- }
- else if (h->old)
- {
- if (fputc ('O', out) == EOF)
- return (-1);
- }
-
- if (fputc ('\n', out) == EOF)
- return (-1);
+ if (h->old || h->read) {
+ if (fputs ("Status: ", out) == EOF)
+ return -1;
+
+ if (h->read) {
+ if (fputs ("RO", out) == EOF)
+ return -1;
+ }
+ else if (h->old) {
+ if (fputc ('O', out) == EOF)
+ return -1;
+ }
+
+ if (fputc ('\n', out) == EOF)
+ return -1;
}
- if (h->flagged || h->replied)
- {
- if (fputs ("X-Status: ", out) == EOF)
- return (-1);
-
- if (h->replied)
- {
- if (fputc ('A', out) == EOF)
- return (-1);
- }
-
- if (h->flagged)
- {
- if (fputc ('F', out) == EOF)
- return (-1);
- }
-
- if (fputc ('\n', out) == EOF)
- return (-1);
+ if (h->flagged || h->replied) {
+ if (fputs ("X-Status: ", out) == EOF)
+ return -1;
+
+ if (h->replied) {
+ if (fputc ('A', out) == EOF)
+ return -1;
+ }
+
+ if (h->flagged) {
+ if (fputc ('F', out) == EOF)
+ return -1;
+ }
+
+ if (fputc ('\n', out) == EOF)
+ return -1;
}
}
}
- if (flags & CH_UPDATE_LEN &&
- (flags & CH_NOLEN) == 0)
- {
- fprintf (out, "Content-Length: %ld\n", h->content->length);
+ if (flags & CH_UPDATE_LEN && (flags & CH_NOLEN) == 0) {
+ fprintf (out, "Content-Length: %zu\n", h->content->length);
if (h->lines != 0 || h->content->length == 0)
fprintf (out, "Lines: %d\n", h->lines);
}
- if ((flags & CH_NONEWLINE) == 0)
- {
+ if ((flags & CH_NONEWLINE) == 0) {
if (flags & CH_PREFIX)
- fputs(prefix, out);
- if (fputc ('\n', out) == EOF) /* add header terminator */
- return (-1);
+ fputs (prefix, out);
+ if (fputc ('\n', out) == EOF) /* add header terminator */
+ 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*/
-static int count_delete_lines (FILE *fp, BODY *b, long *length, size_t datelen)
+static int count_delete_lines (FILE * fp, BODY * b, off_t *length,
+ size_t datelen)
{
int dellines = 0;
long l;
int ch;
- if (b->deleted)
- {
- fseek (fp, b->offset, SEEK_SET);
- for (l = b->length ; l ; l --)
- {
+ if (b->deleted) {
+ fseeko (fp, b->offset, SEEK_SET);
+ for (l = b->length; l; l--) {
ch = getc (fp);
if (ch == EOF)
- break;
+ break;
if (ch == '\n')
- dellines ++;
+ dellines++;
}
dellines -= 3;
*length -= b->length - (84 + datelen);
/* Count the number of digits exceeding the first one to write the size */
- for (l = 10 ; b->length >= l ; l *= 10)
- (*length) ++;
+ for (l = 10; b->length >= l; l *= 10)
+ (*length)++;
}
- else
- {
- for (b = b->parts ; b ; b = b->next)
+ else {
+ for (b = b->parts; b; b = b->next)
dellines += count_delete_lines (fp, b, length, datelen);
}
return dellines;
*/
int
-_mutt_copy_message (FILE *fpout, FILE *fpin, HEADER *hdr, BODY *body,
- int flags, int chflags)
+_mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
+ int flags, int chflags)
{
- char prefix[SHORT_STRING];
+ char prefix[STRING];
STATE s;
- long new_offset = -1;
+ off_t new_offset = -1;
+ int rc = 0;
- if (flags & M_CM_PREFIX)
- {
+ 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);
+ _mutt_make_string (prefix, sizeof (prefix), NONULL (Prefix), Context,
+ hdr, 0);
}
- if ((flags & M_CM_NOHEADER) == 0)
- {
+ if ((flags & M_CM_NOHEADER) == 0) {
if (flags & M_CM_PREFIX)
chflags |= CH_PREFIX;
- else if (hdr->attach_del && (chflags & CH_UPDATE_LEN))
- {
+ else if (hdr->attach_del && (chflags & CH_UPDATE_LEN)) {
int new_lines;
- long new_length = body->length;
- char date[SHORT_STRING];
+ off_t new_length = body->length;
+ char date[STRING];
mutt_make_date (date, sizeof (date));
- date[5] = date[mutt_strlen (date) - 1] = '\"';
+ date[5] = date[m_strlen(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, mutt_strlen (date));
+ count_delete_lines (fpin, body, &new_length, m_strlen(date));
/* Copy the headers */
if (mutt_copy_header (fpin, hdr, fpout,
- chflags | CH_NOLEN | CH_NONEWLINE, NULL))
- return -1;
- fprintf (fpout, "Content-Length: %ld\n", new_length);
+ chflags | CH_NOLEN | CH_NONEWLINE, NULL))
+ return -1;
+ fprintf (fpout, "Content-Length: %zu\n", new_length);
if (new_lines <= 0)
- new_lines = 0;
+ new_lines = 0;
else
- fprintf (fpout, "Lines: %d\n\n", new_lines);
+ fprintf (fpout, "Lines: %d\n\n", new_lines);
if (ferror (fpout) || feof (fpout))
- return -1;
- new_offset = ftell (fpout);
+ return -1;
+ 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);
-
- 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;
- hdr->lines = new_lines;
- body->offset = new_offset;
-
- /* update the total size of the mailbox to reflect this deletion */
- Context->size -= body->length - new_length;
- /*
- * if the message is visible, update the visible size of the mailbox
- * as well.
- */
- if (Context->v2r[hdr->msgno] != -1)
- Context->vsize -= body->length - new_length;
-
- body->length = new_length;
- mutt_free_body (&body->parts);
+ return -1;
+
+ /* Update original message if we are sync'ing a mailfolder */
+ if (flags & M_CM_UPDATE) {
+ hdr->attach_del = 0;
+ hdr->lines = new_lines;
+ body->offset = new_offset;
+
+ /* update the total size of the mailbox to reflect this deletion */
+ Context->size -= body->length - new_length;
+ /*
+ * if the message is visible, update the visible size of the mailbox
+ * as well.
+ */
+ if (Context->v2r[hdr->msgno] != -1)
+ Context->vsize -= body->length - new_length;
+
+ body->length = new_length;
+ body_list_wipe(&body->parts);
}
return 0;
}
if (mutt_copy_header (fpin, hdr, fpout, chflags,
- (chflags & CH_PREFIX) ? prefix : NULL) == -1)
+ (chflags & CH_PREFIX) ? prefix : NULL) == -1)
return -1;
- new_offset = ftell (fpout);
+ new_offset = ftello (fpout);
}
- if (flags & M_CM_DECODE)
- {
+ 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)
s.flags |= M_CHARCONV;
if (flags & M_CM_REPLYING)
s.flags |= M_REPLYING;
-
- if (WithCrypto && flags & M_CM_VERIFY)
+
+ if (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))
- {
+ 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) &&
- hdr->content->type == TYPEMULTIPART)
- {
+ 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);
+ return -1;
+ fputs ("MIME-Version: 1.0\n", fpout);
}
- if ((WithCrypto & APPLICATION_SMIME)
- && (flags & M_CM_DECODE_SMIME) && (hdr->security & APPLICATION_SMIME)
- && hdr->content->type == TYPEAPPLICATION)
- {
+ 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);
fputc ('\n', fpout);
- fseek (fp, cur->offset, 0);
- if (mutt_copy_bytes (fp, fpout, cur->length) == -1)
- {
- fclose (fp);
- mutt_free_body (&cur);
- return (-1);
+ fseeko (fp, cur->offset, 0);
+ if (mutt_copy_bytes (fp, fpout, cur->length) == -1) {
+ m_fclose(&fp);
+ body_list_wipe(&cur);
+ return -1;
}
- mutt_free_body (&cur);
- fclose (fp);
+ body_list_wipe(&cur);
+ m_fclose(&fp);
}
- else
- {
- fseek (fpin, body->offset, 0);
- if (flags & M_CM_PREFIX)
- {
+ else {
+ fseeko (fpin, body->offset, 0);
+ if (flags & M_CM_PREFIX) {
int c;
size_t bytes = body->length;
-
- fputs(prefix, fpout);
-
- while((c = fgetc(fpin)) != EOF && bytes--)
- {
- fputc(c, fpout);
- if(c == '\n')
- {
- fputs(prefix, fpout);
- }
- }
+
+ fputs (prefix, fpout);
+
+ while ((c = fgetc (fpin)) != EOF && bytes--) {
+ fputc (c, fpout);
+ if (c == '\n') {
+ fputs (prefix, fpout);
+ }
+ }
}
else if (mutt_copy_bytes (fpin, fpout, body->length) == -1)
return -1;
}
- if ((flags & M_CM_UPDATE) && (flags & M_CM_NOHEADER) == 0
- && new_offset != -1)
- {
+ 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 0;
+ return rc;
}
int
-mutt_copy_message (FILE *fpout, CONTEXT *src, HEADER *hdr, int flags,
- int chflags)
+mutt_copy_message (FILE * fpout, CONTEXT * src, HEADER * hdr, int flags,
+ int chflags)
{
MESSAGE *msg;
int r;
-
- if ((msg = mx_open_message (src, hdr->msgno)) == NULL)
+
+ if (!(msg = mx_open_message (src, hdr->msgno)))
return -1;
- if ((r = _mutt_copy_message (fpout, msg->fp, hdr, hdr->content, flags, chflags)) == 0
- && (ferror (fpout) || feof (fpout)))
- {
- dprint (1, (debugfile, "_mutt_copy_message failed to detect EOF!\n"));
+
+ r = _mutt_copy_message(fpout, msg->fp, hdr, hdr->content, flags,
+ chflags);
+ if (!r && (ferror(fpout) || feof (fpout))) {
r = -1;
}
mx_close_message (&msg);
*/
int
-_mutt_append_message (CONTEXT *dest, FILE *fpin, CONTEXT *src, HEADER *hdr,
- BODY *body, int flags, int chflags)
-{
+_mutt_append_message (CONTEXT * dest, FILE * fpin, CONTEXT * src __attribute__ ((unused)),
+ HEADER * hdr, BODY * body, int flags, int chflags) {
+ char buf[STRING];
MESSAGE *msg;
int r;
- if ((msg = mx_open_new_message (dest, hdr, (src->magic == M_MBOX || src->magic == M_MMDF) ? 0 : M_ADD_FROM)) == NULL)
+ 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)
return -1;
- if (dest->magic == M_MBOX || dest->magic == M_MMDF)
+ 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);
}
int
-mutt_append_message (CONTEXT *dest, CONTEXT *src, HEADER *hdr, int cmflags,
- int chflags)
+mutt_append_message (CONTEXT * dest, CONTEXT * src, HEADER * hdr, int cmflags,
+ int chflags)
{
MESSAGE *msg;
int r;
if ((msg = mx_open_message (src, hdr->msgno)) == NULL)
return -1;
- r = _mutt_append_message (dest, msg->fp, src, hdr, hdr->content, cmflags, chflags);
+ r =
+ _mutt_append_message (dest, msg->fp, src, hdr, hdr->content, cmflags,
+ chflags);
mx_close_message (&msg);
return r;
}
*
* The function will return 0 on success and -1 on failure.
*/
-static int copy_delete_attach (BODY *b, FILE *fpin, FILE *fpout, char *date)
+static int copy_delete_attach (BODY * b, FILE * fpin, FILE * fpout,
+ char *date)
{
BODY *part;
- for (part = b->parts ; part ; part = part->next)
- {
- if (part->deleted || part->parts)
- {
+ 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)))
- return -1;
-
- if (part->deleted)
- {
- fprintf (fpout,
- "Content-Type: message/external-body; access-type=x-mutt-deleted;\n"
- "\texpiration=%s; length=%ld\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)))
- return -1;
-
- /* Skip the deleted body */
- fseek (fpin, part->offset + part->length, SEEK_SET);
+ 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=%zu\n"
+ "\n", date + 5, part->length);
+ if (ferror (fpout))
+ return -1;
+
+ /* Copy the original mime headers */
+ if (mutt_copy_bytes (fpin, fpout, part->offset - ftello (fpin)))
+ return -1;
+
+ /* Skip the deleted body */
+ fseeko (fpin, part->offset + part->length, SEEK_SET);
}
- else
- {
- if (copy_delete_attach (part, fpin, fpout, date))
- return -1;
+ else {
+ if (copy_delete_attach (part, fpin, fpout, date))
+ return -1;
}
}
}
/* 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;
* 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];
char c2buf[STRING];
-
+
int l, linelen, buflen, count;
- linelen = mutt_strlen (*h);
- buflen = linelen + 3;
-
-
- safe_realloc (h, buflen);
- for (count = 0; a; a = a->next, count++)
- {
- ADDRESS *tmp = a->next;
+
+ linelen = m_strlen(*h);
+ buflen = linelen + 3;
+
+
+ p_realloc(h, buflen);
+ for (count = 0; a; a = a->next, count++) {
+ address_t *tmp = a->next;
+
a->next = NULL;
*buf = *cbuf = *c2buf = '\0';
- rfc822_write_address (buf, sizeof (buf), a, 0);
+ rfc822_addrcat(buf, sizeof (buf), a, 0);
a->next = tmp;
-
- l = mutt_strlen (buf);
- if (count && linelen + l > 74)
- {
- strcpy (cbuf, "\n\t"); /* __STRCPY_CHECKED__ */
+
+ l = m_strlen(buf);
+ if (count && linelen + l > 74) {
+ m_strcpy(cbuf, sizeof(cbuf), "\n\t");
linelen = l + 8;
}
- else
- {
- if (a->mailbox)
- {
- strcpy (cbuf, " "); /* __STRCPY_CHECKED__ */
- linelen++;
+ else {
+ if (a->mailbox) {
+ m_strcpy(cbuf, sizeof(cbuf), " ");
+ linelen++;
}
linelen += l;
}
- if (!a->group && a->next && a->next->mailbox)
- {
+ if (!a->group && a->next && a->next->mailbox) {
linelen++;
buflen++;
- strcpy (c2buf, ","); /* __STRCPY_CHECKED__ */
+ m_strcpy(c2buf, sizeof(c2buf), ",");
}
-
- buflen += l + mutt_strlen (cbuf) + mutt_strlen (c2buf);
- safe_realloc (h, buflen);
- strcat (*h, cbuf); /* __STRCAT_CHECKED__ */
- strcat (*h, buf); /* __STRCAT_CHECKED__ */
- strcat (*h, c2buf); /* __STRCAT_CHECKED__ */
+
+ buflen += l + m_strlen(cbuf) + m_strlen(c2buf);
+ p_realloc(h, buflen);
+ m_strcat(*h, buflen, cbuf);
+ m_strcat(*h, buflen, buf);
+ m_strcat(*h, buflen, c2buf);
}
-
+
/* Space for this was allocated in the beginning of this function. */
- strcat (*h, "\n"); /* __STRCAT_CHECKED__ */
+ m_strcat(*h, buflen, "\n");
}
-static int address_header_decode (char **h)
+static int address_header_decode(char **h)
{
- char *s = *h;
- int l;
-
- ADDRESS *a = NULL;
-
- switch (tolower ((unsigned char) *s))
- {
- case 'r':
- {
- if (ascii_strncasecmp (s, "return-path:", 12) == 0)
- {
- l = 12;
- break;
- }
- else if (ascii_strncasecmp (s, "reply-to:", 9) == 0)
- {
- l = 9;
- break;
- }
- return 0;
- }
- case 'f':
- {
- if (ascii_strncasecmp (s, "from:", 5))
- return 0;
- l = 5;
- break;
- }
- case 'c':
- {
- if (ascii_strncasecmp (s, "cc:", 3))
- return 0;
- l = 3;
- break;
-
- }
- case 'b':
- {
- if (ascii_strncasecmp (s, "bcc:", 4))
- return 0;
- l = 4;
- break;
- }
- case 's':
- {
- if (ascii_strncasecmp (s, "sender:", 7))
- return 0;
- l = 7;
- break;
+ address_t *a;
+ char *p, *s = *h;
+
+ p = strchr(s, ':');
+ if (!p)
+ return 0;
+
+ switch (mime_which_token(s, p - s)) {
+ case MIME_RETURN_PATH:
+ case MIME_REPLY_TO:
+ case MIME_FROM:
+ case MIME_CC:
+ case MIME_BCC:
+ case MIME_SENDER:
+ case MIME_TO:
+ case MIME_MAIL_FOLLOWUP_TO:
+ p++;
+ break;
+
+ default:
+ return 0;
}
- case 't':
- {
- if (ascii_strncasecmp (s, "to:", 3))
- return 0;
- l = 3;
- break;
- }
- case 'm':
- {
- if (ascii_strncasecmp (s, "mail-followup-to:", 17))
- return 0;
- l = 17;
- break;
- }
- default: return 0;
- }
- if ((a = rfc822_parse_adrlist (a, s + l)) == NULL)
- return 0;
-
- mutt_addrlist_to_local (a);
- rfc2047_decode_adrlist (a);
-
- *h = safe_calloc (1, l + 2);
-
- strfcpy (*h, s, l + 1);
-
- format_address_header (h, a);
-
- rfc822_free_address (&a);
-
- FREE (&s);
- return 1;
+ a = rfc822_parse_adrlist(NULL, p);
+ if (!a)
+ return 0;
+
+ mutt_addrlist_to_local(a);
+ rfc2047_decode_adrlist(a);
+
+ *h = p_dupstr(s, p - s);
+ format_address_header(h, a);
+ address_list_wipe(&a);
+
+ p_delete(&s);
+ return 1;
}
projects / apps / madmutt.git / blobdiff