* 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 <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
+#include <lib-mime/mime.h>
+#include <lib-mime/rfc3676.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
+#include <lib-ui/curses.h>
+
+#include <lib-sys/unix.h>
#include "mutt.h"
-#include "ascii.h"
#include "recvattach.h"
#include "handler.h"
-#include "mutt_curses.h"
-#include "rfc1524.h"
-#include "rfc3676.h"
#include "keymap.h"
-#include "mime.h"
#include "copy.h"
#include "charset.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
#include "state.h"
#include "attach.h"
#include "lib.h"
-#include "lib/debug.h"
typedef int handler_f (BODY *, STATE *);
typedef handler_f *handler_t;
-int Index_hex[128] = {
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1,
- -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
-};
-
-int Index_64[128] = {
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1,
- -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
- -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1
-};
-
-void mutt_decode_xbit (STATE * s, long len, int istext, iconv_t cd)
+static void mutt_decode_xbit (STATE * s, long len, int istext, iconv_t cd)
{
int c, ch;
char bufi[BUFI_SIZE];
- size_t l = 0;
+ ssize_t l = 0;
if (istext) {
state_set_prefix (s);
return -1;
}
-static void qp_decode_line (char *dest, char *src, size_t * l, int last)
+static void qp_decode_line (char *dest, char *src, ssize_t * l, int last)
{
char *d, *s;
char c;
*
*/
-void mutt_decode_quoted (STATE * s, long len, int istext, iconv_t cd)
+static void mutt_decode_quoted (STATE * s, long len, int istext, iconv_t cd)
{
char line[STRING];
char decline[2 * STRING];
- size_t l = 0;
- size_t linelen; /* number of input bytes in `line' */
- size_t l3;
+ ssize_t l = 0;
+ ssize_t linelen; /* number of input bytes in `line' */
+ ssize_t l3;
int last; /* store the last character in the input line */
char buf[5];
int c1, c2, c3, c4, ch, cr = 0, i;
char bufi[BUFI_SIZE];
- size_t l = 0;
+ ssize_t l = 0;
buf[4] = 0;
for (i = 0; i < 4 && len > 0; len--) {
if ((ch = fgetc (s->fpin)) == EOF)
break;
- if (ch >= 0 && ch < 128 && (base64val (ch) != -1 || ch == '='))
+ if (base64val(ch) >= 0 || ch == '=')
buf[i++] = ch;
}
if (i != 4) {
- debug_print (2, ("didn't get a multiple of 4 chars.\n"));
break;
}
- c1 = base64val (buf[0]);
- c2 = base64val (buf[1]);
+ c1 = base64val(buf[0]);
+ c2 = base64val(buf[1]);
ch = (c1 << 2) | (c2 >> 4);
if (cr && ch != '\n')
if (buf[2] == '=')
break;
- c3 = base64val (buf[2]);
+ c3 = base64val(buf[2]);
ch = ((c2 & 0xf) << 4) | (c3 >> 2);
if (cr && ch != '\n')
if (buf[3] == '=')
break;
- c4 = base64val (buf[3]);
+ c4 = base64val(buf[3]);
ch = ((c3 & 0x3) << 6) | c4;
if (cr && ch != '\n')
else
bufi[l++] = ch;
- if (l + 8 >= sizeof (bufi))
+ if (l + 8 >= ssizeof (bufi))
mutt_convert_to_state (cd, bufi, &l, s);
}
state_reset_prefix (s);
}
-unsigned char decode_byte (char ch)
+static unsigned char decode_byte (char ch)
{
if (ch == 96)
return 0;
return ch - 32;
}
-void mutt_decode_uuencoded (STATE * s, long len, int istext, iconv_t cd)
+static void mutt_decode_uuencoded (STATE * s, long len, int istext, iconv_t cd)
{
char tmps[SHORT_STRING];
char linelen, c, l, out;
char *pt;
char bufi[BUFI_SIZE];
- size_t k = 0;
+ ssize_t k = 0;
if (istext)
state_set_prefix (s);
if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL)
return;
len -= m_strlen(tmps);
- if ((!str_ncmp (tmps, "begin", 5)) && ISSPACE (tmps[5]))
+ if ((!m_strncmp(tmps, "begin", 5)) && ISSPACE (tmps[5]))
break;
}
while (len > 0) {
if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL)
return;
len -= m_strlen(tmps);
- if (!str_ncmp (tmps, "end", 3))
+ if (!m_strncmp(tmps, "end", 3))
break;
pt = tmps;
linelen = decode_byte (*pt);
char *buffer;
char *line;
char *param;
- size_t buff_len;
- size_t line_len;
- size_t line_used;
- size_t line_max;
- size_t indent_len;
- size_t word_len;
- size_t buff_used;
- size_t param_used;
- size_t param_len;
+ ssize_t buff_len;
+ ssize_t line_len;
+ ssize_t line_used;
+ ssize_t line_max;
+ ssize_t indent_len;
+ ssize_t word_len;
+ ssize_t buff_used;
+ ssize_t param_used;
+ ssize_t param_len;
int tag_level[RICH_LAST_TAG];
int WrapMargin;
STATE *s;
if (stte->line_len) {
if (stte->tag_level[RICH_CENTER] || stte->tag_level[RICH_FLUSHRIGHT]) {
/* Strip trailing white space */
- size_t y = stte->line_used - 1;
+ ssize_t y = stte->line_used - 1;
while (y && ISSPACE (stte->line[y])) {
stte->line[y] = '\0';
while (stte->line[y] && ISSPACE (stte->line[y]))
y++;
if (y) {
- size_t z;
+ ssize_t z;
for (z = y; z <= stte->line_used; z++) {
stte->line[z - y] = stte->line[z];
}
}
-int text_enriched_handler (BODY * a, STATE * s)
+static int text_enriched_handler (BODY * a, STATE * s)
{
enum {
TEXT, LANGLE, TAG, BOGUS_TAG, NEWLINE, ST_EOF, DONE
int tag_len = 0;
char tag[LONG_STRING + 1];
- memset (&stte, 0, sizeof (stte));
+ p_clear(&stte, 1);
stte.s = s;
stte.WrapMargin =
((s->flags & M_DISPLAY) ? (COLS - 4) : ((COLS - 4) <
{
BODY *choice = NULL;
BODY *b;
- LIST *t;
+ string_list_t *t;
char buf[STRING];
int type = 0;
int mustfree = 0;
mustfree = 1;
fstat (fileno (s->fpin), &st);
- b = mutt_new_body ();
+ b = body_new();
b->length = (long) st.st_size;
- b->parts = mutt_parse_multipart (s->fpin,
- mutt_get_parameter ("boundary",
- a->parameter),
- (long) st.st_size,
- ascii_strcasecmp ("digest",
- a->subtype) == 0);
+ b->parts = mutt_parse_multipart(s->fpin,
+ parameter_getval(a->parameter, "boundary"),
+ (long)st.st_size,
+ !ascii_strcasecmp("digest", a->subtype));
}
else
b = a;
while (b) {
snprintf (buf, sizeof (buf), "%s/%s", TYPE (b), b->subtype);
if (mutt_is_autoview (b, buf)) {
- rfc1524_entry *entry = rfc1524_new_entry ();
+ rfc1524_entry *entry = rfc1524_entry_new();
if (rfc1524_mailcap_lookup (b, buf, entry, M_AUTOVIEW)) {
choice = b;
}
- rfc1524_free_entry (&entry);
+ rfc1524_entry_delete(&entry);
}
b = b->next;
}
}
if (mustfree)
- mutt_free_body (&a);
+ body_list_wipe(&a);
return (rc);
}
if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE ||
a->encoding == ENCUUENCODED) {
fstat (fileno (s->fpin), &st);
- b = mutt_new_body ();
+ b = body_new();
b->length = (long) st.st_size;
b->parts = mutt_parse_messageRFC822 (s->fpin, b);
}
if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE ||
a->encoding == ENCUUENCODED)
- mutt_free_body (&b);
+ body_list_wipe(&b);
return (rc);
}
else if (a->type == TYPEMULTIPART) {
BODY *p;
- if (WithCrypto) {
- if (ascii_strcasecmp (a->subtype, "signed") == 0 ||
- ascii_strcasecmp (a->subtype, "encrypted") == 0)
- return (1);
- }
+ if (ascii_strcasecmp (a->subtype, "signed") == 0 ||
+ ascii_strcasecmp (a->subtype, "encrypted") == 0)
+ return (1);
for (p = a->parts; p; p = p->next) {
if (mutt_can_decode (p))
}
}
- else if (WithCrypto && a->type == TYPEAPPLICATION) {
- if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (a))
+ else if (a->type == TYPEAPPLICATION) {
+ if (mutt_is_application_pgp(a))
return (1);
- if ((WithCrypto & APPLICATION_SMIME) && mutt_is_application_smime (a))
+ if (mutt_is_application_smime (a))
return (1);
}
if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE ||
a->encoding == ENCUUENCODED) {
fstat (fileno (s->fpin), &st);
- b = mutt_new_body ();
+ b = body_new();
b->length = (long) st.st_size;
- b->parts = mutt_parse_multipart (s->fpin,
- mutt_get_parameter ("boundary",
- a->parameter),
- (long) st.st_size,
- ascii_strcasecmp ("digest",
- a->subtype) == 0);
+ b->parts = mutt_parse_multipart(s->fpin,
+ parameter_getval(a->parameter, "boundary"),
+ (long)st.st_size,
+ !ascii_strcasecmp("digest", a->subtype));
}
else
b = a;
if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE ||
a->encoding == ENCUUENCODED)
- mutt_free_body (&b);
+ body_list_wipe(&b);
return (rc);
}
static int autoview_handler (BODY * a, STATE * s)
{
- rfc1524_entry *entry = rfc1524_new_entry ();
+ rfc1524_entry *entry = rfc1524_entry_new();
char buffer[LONG_STRING];
char type[STRING];
char command[LONG_STRING];
p_delete(&fname);
if (entry->command) {
- strfcpy (command, entry->command, sizeof (command));
+ m_strcpy(command, sizeof(command), entry->command);
/* rfc1524_expand_command returns 0 if the file is required */
piped =
if ((fpin = safe_fopen (tempfile, "w+")) == NULL) {
mutt_perror ("fopen");
- rfc1524_free_entry (&entry);
+ rfc1524_entry_delete(&entry);
return (-1);
}
mutt_copy_bytes (s->fpin, fpin, a->length);
if (!piped) {
- safe_fclose (&fpin);
+ m_fclose(&fpin);
thepid = mutt_create_filter (command, NULL, &fpout, &fperr);
}
else {
}
bail:
- safe_fclose (&fpout);
- safe_fclose (&fperr);
+ m_fclose(&fpout);
+ m_fclose(&fperr);
mutt_wait_filter (thepid);
if (piped)
- safe_fclose (&fpin);
+ m_fclose(&fpin);
else
mutt_unlink (tempfile);
if (s->flags & M_DISPLAY)
mutt_clear_error ();
}
- rfc1524_free_entry (&entry);
+ rfc1524_entry_delete(&entry);
return (rc);
}
const char *expiration;
time_t expire;
- access_type = mutt_get_parameter ("access-type", b->parameter);
+ access_type = parameter_getval(b->parameter, "access-type");
if (!access_type) {
if (s->flags & M_DISPLAY) {
state_mark_attach (s);
return (-1);
}
- expiration = mutt_get_parameter ("expiration", b->parameter);
+ expiration = parameter_getval(b->parameter, "expiration");
if (expiration)
expire = mutt_parse_date (expiration, NULL);
else
state_mark_attach (s);
state_printf (s, _("[-- This %s/%s attachment "),
TYPE (b->parts), b->parts->subtype);
- length = mutt_get_parameter ("length", b->parameter);
+ length = parameter_getval(b->parameter, "length");
if (length) {
mutt_pretty_size (pretty_size, sizeof (pretty_size),
strtol (length, NULL, 10));
void mutt_decode_attachment (BODY * b, STATE * s)
{
int istext = mutt_is_text_part (b);
- iconv_t cd = (iconv_t) (-1);
+ iconv_t cd = MUTT_ICONV_ERROR;
Quotebuf[0] = '\0';
if (istext) {
if (s->flags & M_CHARCONV) {
- const char *charset = mutt_get_parameter ("charset", b->parameter);
+ const char *charset = parameter_getval(b->parameter, "charset");
if (!option (OPTSTRICTMIME) && !charset)
- charset = mutt_get_first_charset (AssumedCharset);
+ charset = charset_getfirst(AssumedCharset);
if (charset && Charset)
cd = mutt_iconv_open (Charset, charset, M_ICONV_HOOK_FROM);
}
fseeko (s->fpin, b->offset, 0);
switch (b->encoding) {
case ENCQUOTEDPRINTABLE:
- mutt_decode_quoted (s, b->length, istext ||
- ((WithCrypto & APPLICATION_PGP) &&
- mutt_is_application_pgp (b)), cd);
+ mutt_decode_quoted(s, b->length,
+ istext || mutt_is_application_pgp(b), cd);
break;
case ENCBASE64:
- mutt_decode_base64 (s, b->length, istext ||
- ((WithCrypto & APPLICATION_PGP) &&
- mutt_is_application_pgp (b)), cd);
+ mutt_decode_base64(s, b->length,
+ istext || mutt_is_application_pgp(b), cd);
break;
case ENCUUENCODED:
- mutt_decode_uuencoded (s, b->length, istext
- || ((WithCrypto & APPLICATION_PGP) &&
- mutt_is_application_pgp (b)), cd);
+ mutt_decode_uuencoded(s, b->length,
+ istext || mutt_is_application_pgp(b), cd);
break;
default:
- mutt_decode_xbit (s, b->length, istext
- || ((WithCrypto & APPLICATION_PGP) &&
- mutt_is_application_pgp (b)), cd);
+ mutt_decode_xbit(s, b->length,
+ istext || mutt_is_application_pgp(b), cd);
break;
}
- if (cd != (iconv_t) (-1))
+ if (cd != MUTT_ICONV_ERROR)
iconv_close (cd);
}
char tempfile[_POSIX_PATH_MAX];
handler_t handler = NULL;
long tmpoffset = 0;
- size_t tmplength = 0;
+ ssize_t tmplength = 0;
char type[STRING];
int rc = 0;
snprintf (type, sizeof (type), "%s/%s", TYPE (b), b->subtype);
if (mutt_is_autoview (b, type)) {
- rfc1524_entry *entry = rfc1524_new_entry ();
+ rfc1524_entry *entry = rfc1524_entry_new();
if (rfc1524_mailcap_lookup (b, type, entry, M_AUTOVIEW)) {
handler = autoview_handler;
s->flags &= ~M_CHARCONV;
}
- rfc1524_free_entry (&entry);
+ rfc1524_entry_delete(&entry);
}
else if (b->type == TYPETEXT) {
if (ascii_strcasecmp ("plain", b->subtype) == 0) {
/* avoid copying this part twice since removing the transfer-encoding is
* the only operation needed.
*/
- if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (b))
+ if (mutt_is_application_pgp (b))
handler = crypt_pgp_application_pgp_handler;
else
- if (ascii_strcasecmp
- ("flowed", mutt_get_parameter ("format", b->parameter)) == 0)
- handler = rfc3676_handler;
+ if (!ascii_strcasecmp("flowed", parameter_getval(b->parameter, "format")))
+ handler = rfc3676_handler;
else
plaintext = 1;
}
if (ascii_strcasecmp ("alternative", b->subtype) == 0)
handler = alternative_handler;
- else if (WithCrypto && ascii_strcasecmp ("signed", b->subtype) == 0) {
- p = mutt_get_parameter ("protocol", b->parameter);
+ else if (ascii_strcasecmp ("signed", b->subtype) == 0) {
+ p = parameter_getval(b->parameter, "protocol");
if (!p)
mutt_error (_("Error: multipart/signed has no protocol."));
else if (s->flags & M_VERIFY)
handler = mutt_signed_handler;
}
- else if ((WithCrypto & APPLICATION_PGP)
- && str_casecmp ("encrypted", b->subtype) == 0) {
- p = mutt_get_parameter ("protocol", b->parameter);
+ else if (m_strcasecmp("encrypted", b->subtype) == 0) {
+ p = parameter_getval(b->parameter, "protocol");
if (!p)
mutt_error (_
if (!handler)
handler = multipart_handler;
}
- else if (WithCrypto && b->type == TYPEAPPLICATION) {
- if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (b))
+ else if (b->type == TYPEAPPLICATION) {
+ if (mutt_is_application_pgp (b))
handler = crypt_pgp_application_pgp_handler;
- if ((WithCrypto & APPLICATION_SMIME) && mutt_is_application_smime (b))
+ if (mutt_is_application_smime (b))
handler = crypt_smime_application_smime_handler;
}
if (!plaintext) {
/* decode to a tempfile, saving the original destination */
fp = s->fpout;
- mutt_mktemp (tempfile);
- if ((s->fpout = safe_fopen (tempfile, "w")) == NULL) {
+ s->fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+ if (!s->fpout) {
mutt_error _("Unable to open temporary file!");
-
goto bail;
}
/* decoding the attachment changes the size and offset, so save a copy
s->prefix = NULL;
decode = 1;
- }
- else
+ } else {
b->type = TYPETEXT;
+ }
mutt_decode_attachment (b, s);
if (decode) {
b->length = ftello (s->fpout);
b->offset = 0;
- fclose (s->fpout);
+ m_fclose(&s->fpout);
/* restore final destination and substitute the tempfile for input */
s->fpout = fp;
b->offset = tmpoffset;
/* restore the original source stream */
- fclose (s->fpin);
+ m_fclose(&s->fpin);
s->fpin = fp;
}
}
projects / apps / madmutt.git / blobdiff