#include "handler.h"
#include "mutt_curses.h"
#include "rfc1524.h"
+#include "rfc3676.h"
#include "keymap.h"
#include "mime.h"
#include "copy.h"
}
}
-static void enriched_puts (char *s, struct enriched_state *stte)
+static void enriched_puts (const char *s, struct enriched_state *stte)
{
- char *c;
+ const char *p;
if (stte->buff_len < stte->buff_used + str_len (s)) {
stte->buff_len += LONG_STRING;
mem_realloc (&stte->buffer, stte->buff_len + 1);
}
- c = s;
- while (*c) {
- stte->buffer[stte->buff_used++] = *c;
- c++;
+
+ p = s;
+ while (*p) {
+ stte->buffer[stte->buff_used++] = *p++;
}
}
return (0);
}
-/*
- * An implementation of RFC 2646.
- *
- * NOTE: This still has to be made UTF-8 aware.
- *
- */
-
-#define FLOWED_MAX 77
-
-static int get_quote_level (char *line)
-{
- int quoted;
-
- for (quoted = 0; line[quoted] == '>'; quoted++);
- return quoted;
-}
-
-static void print_flowed_line (char *line, STATE * s, int ql)
-{
- int width;
- char *pos, *oldpos;
- int len = str_len (line);
- int i;
-
- if (MaxLineLength > 0) {
- width = MaxLineLength - WrapMargin - ql - 1;
- if (option (OPTSTUFFQUOTED))
- --width;
- if (width < 0)
- width = MaxLineLength;
- }
- else {
- if (option (OPTMBOXPANE))
- width = COLS - SidebarWidth - WrapMargin - ql - 1;
- else
- width = COLS - WrapMargin - ql - 1;
-
- if (option (OPTSTUFFQUOTED))
- --width;
- if (width < 0)
- width = COLS;
- }
-
- /* fprintf(stderr,"print_flowed_line will print `%s' with ql = %d\n",line,ql); */
-
- if (str_len (line) == 0) {
- if (option (OPTQUOTEEMPTY)) {
- if (s->prefix)
- state_puts(s->prefix,s);
- for (i=0;i<ql;++i) state_putc('>',s);
- if (option(OPTSTUFFQUOTED))
- state_putc(' ',s);
- }
- state_putc('\n',s);
- return;
- }
-
- pos = line + width;
- oldpos = line;
-
- /* fprintf(stderr,"oldpos = %p line+len = %p\n",oldpos,line+len); */
-
- for (; oldpos < line + len; pos += width) {
- /* fprintf(stderr,"outer for loop\n"); */
- if (pos < line + len) { /* only search a new position when we're not over the end of the string w/ pos */
- /* fprintf(stderr,"if 1\n"); */
- if (*pos == ' ') {
- /* fprintf(stderr,"if 2: good luck! found a space\n"); */
- *pos = '\0';
- ++pos;
- }
- else {
- /* fprintf(stderr,"if 2: else\n"); */
- char *save = pos;
-
- while (pos >= oldpos && !isspace (*pos)) {
- /* fprintf(stderr,"pos(%p) > oldpos(%p)\n",pos,oldpos); */
- --pos;
- }
- if (pos < oldpos) {
- /* fprintf(stderr,"wow, no space found, searching the other direction\n"); */
- pos = save;
- while (pos < line + len && *pos && !isspace (*pos)) {
- /* fprintf(stderr,"pos(%p) < line+len(%p)\n",pos,line+len); */
- ++pos;
- }
- /* fprintf(stderr,"found a space pos = %p\n",pos); */
- }
- *pos = '\0';
- ++pos;
- }
- }
- else {
- /* fprintf(stderr,"if 1 else\n"); */
- }
- if (s->prefix)
- state_puts (s->prefix, s);
- for (i = 0; i < ql; ++i)
- state_putc ('>', s);
- if (option (OPTSTUFFQUOTED) && (ql > 0 || s->prefix))
- state_putc (' ', s);
- state_puts (oldpos, s);
- /* fprintf(stderr,"print_flowed_line: `%s'\n",oldpos); */
- if (pos < line + len)
- state_putc (' ', s);
- state_putc ('\n', s);
- oldpos = pos;
- }
- /*state_puts(line,s);
- state_putc('\n',s); */
-}
-
-static int text_plain_flowed_handler (BODY * a, STATE * s)
-{
- int bytes = a->length;
- char buf[LONG_STRING];
- char *curline = str_dup ("");
- char *t = NULL;
- unsigned int curline_len = 1;
- unsigned int quotelevel = 0, newql = 0;
- int buf_off, buf_len;
-
- while (bytes > 0 && fgets (buf, sizeof (buf), s->fpin)) {
- buf_len = str_len (buf);
- bytes -= buf_len;
-
- newql = get_quote_level (buf);
-
- /* a change of quoting level in a paragraph - shouldn't happen,
- * but has to be handled - see RFC 3676, sec. 4.5.
- */
- if (newql != quotelevel && curline && *curline) {
- print_flowed_line (curline, s, quotelevel);
- *curline = '\0';
- curline_len = 1;
- }
- quotelevel = newql;
-
- /* XXX - If a line is longer than buf (shouldn't happen), it is split.
- * This will almost always cause an unintended line break, and
- * possibly a change in quoting level. But that's better than not
- * displaying it at all.
- */
- if ((t = strrchr (buf, '\n')) || (t = strrchr (buf, '\r'))) {
- *t = '\0';
- buf_len = t - buf;
- }
- buf_off = newql;
- if (buf[buf_off] == ' ')
- buf_off++;
-
- /* signature separator also flushes the previous paragraph */
- if (strcmp(buf + buf_off, "-- ") == 0 && curline && *curline) {
- print_flowed_line (curline, s, quotelevel);
- *curline = '\0';
- curline_len = 1;
- }
-
- curline = realloc (curline, curline_len + buf_len - buf_off);
- strcpy (curline + curline_len - 1, buf + buf_off);
- curline_len += buf_len - buf_off;
-
- /* if this was a fixed line the paragraph is finished */
- if (buf_len == 0 || buf[buf_len - 1] != ' ' || strcmp(buf + buf_off, "-- ") == 0) {
- print_flowed_line (curline, s, quotelevel);
- *curline = '\0';
- curline_len = 1;
- }
-
- }
- mem_free (&curline);
- return (0);
-}
-
#define TXTHTML 1
#define TXTPLAIN 2
#define TXTENRICHED 3
if (choice) {
if (s->flags & M_DISPLAY && !option (OPTWEED)) {
- fseek (s->fpin, choice->hdr_offset, 0);
+ fseeko (s->fpin, choice->hdr_offset, 0);
mutt_copy_bytes (s->fpin, s->fpout,
choice->offset - choice->hdr_offset);
}
{
struct stat st;
BODY *b;
- long off_start;
+ off_t off_start;
int rc = 0;
- off_start = ftell (s->fpin);
+ off_start = ftello (s->fpin);
if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE ||
a->encoding == ENCUUENCODED) {
fstat (fileno (s->fpin), &st);
state_printf (s, _("[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"),
TYPE (p), p->subtype, ENCODING (p->encoding), length);
if (!option (OPTWEED)) {
- fseek (s->fpin, p->hdr_offset, 0);
+ fseeko (s->fpin, p->hdr_offset, 0);
mutt_copy_bytes (s->fpin, s->fpout, p->offset - p->hdr_offset);
}
else
state_printf (s, _("[-- name: %s --]\n"), b->parts->filename);
}
- mutt_copy_hdr (s->fpin, s->fpout, ftell (s->fpin), b->parts->offset,
+ mutt_copy_hdr (s->fpin, s->fpout, ftello (s->fpin), b->parts->offset,
(option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) |
CH_DECODE, NULL);
}
state_attach_puts (_("[-- and the indicated external source has --]\n"
"[-- expired. --]\n"), s);
- mutt_copy_hdr (s->fpin, s->fpout, ftell (s->fpin), b->parts->offset,
+ mutt_copy_hdr (s->fpin, s->fpout, ftello (s->fpin), b->parts->offset,
(option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) |
CH_DECODE, NULL);
}
_
("[-- and the indicated access-type %s is unsupported --]\n"),
access_type);
- mutt_copy_hdr (s->fpin, s->fpout, ftell (s->fpin), b->parts->offset,
+ mutt_copy_hdr (s->fpin, s->fpout, ftello (s->fpin), b->parts->offset,
(option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) |
CH_DECODE, NULL);
}
if (istext) {
if (s->flags & M_CHARCONV) {
- char *charset = mutt_get_parameter ("charset", b->parameter);
+ const char *charset = mutt_get_parameter ("charset", b->parameter);
if (!option (OPTSTRICTMIME) && !charset)
charset = mutt_get_first_charset (AssumedCharset);
}
}
- fseek (s->fpin, b->offset, 0);
+ fseeko (s->fpin, b->offset, 0);
switch (b->encoding) {
case ENCQUOTEDPRINTABLE:
- mutt_decode_quoted (s, b->length, istext, cd);
+ mutt_decode_quoted (s, b->length, istext ||
+ ((WithCrypto & APPLICATION_PGP) &&
+ mutt_is_application_pgp (b)), cd);
break;
case ENCBASE64:
- mutt_decode_base64 (s, b->length, istext, cd);
+ mutt_decode_base64 (s, b->length, istext ||
+ ((WithCrypto & APPLICATION_PGP) &&
+ mutt_is_application_pgp (b)), cd);
break;
case ENCUUENCODED:
- mutt_decode_uuencoded (s, b->length, istext, cd);
+ mutt_decode_uuencoded (s, b->length, istext
+ || ((WithCrypto & APPLICATION_PGP) &&
+ mutt_is_application_pgp (b)), cd);
break;
default:
- mutt_decode_xbit (s, b->length, istext, cd);
+ mutt_decode_xbit (s, b->length, istext
+ || ((WithCrypto & APPLICATION_PGP) &&
+ mutt_is_application_pgp (b)), cd);
break;
}
else
if (ascii_strcasecmp
("flowed", mutt_get_parameter ("format", b->parameter)) == 0)
- handler = text_plain_flowed_handler;
+ handler = rfc3676_handler;
else
plaintext = 1;
}
if (plaintext || handler) {
- fseek (s->fpin, b->offset, 0);
+ fseeko (s->fpin, b->offset, 0);
/* see if we need to decode this part before processing it */
if (b->encoding == ENCBASE64 || b->encoding == ENCQUOTEDPRINTABLE || b->encoding == ENCUUENCODED || plaintext || mutt_is_text_part (b)) { /* text subtypes may
mutt_decode_attachment (b, s);
if (decode) {
- b->length = ftell (s->fpout);
+ b->length = ftello (s->fpout);
b->offset = 0;
fclose (s->fpout);
projects / apps / madmutt.git / blobdiff