#include <lib-lua/lib-lua.h>
#include <lib-sys/unix.h>
-#include <lib-sys/mutt_ssl.h>
#include <lib-ui/curses.h>
#include <lib-ui/history.h>
#include <lib-mx/mx.h>
-#include <lib-crypt/crypt.h>
#include "mutt.h"
#include "keymap.h"
+#include "crypt.h"
#include "charset.h"
#include "thread.h"
#include "mutt_idna.h"
-#include "mutt_libesmtp.h"
+#include "send_smtp.h"
#include "alias.h"
#include "init.h"
int (*check) (const char* option, unsigned long val,
char* errbuf, ssize_t errlen);
} SpecialVars[] = {
-#if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
- { "smtp_use_tls", mutt_libesmtp_check_usetls },
+#ifdef USE_LIBESMTP
+ { "smtp_use_tls", send_smtp_check_usetls },
#endif
{ "history", check_history },
{ "pager_index_lines", check_num },
const char* s = NULL;
switch (option->data) {
case M_MBOX: s = "mbox"; break;
- case M_MMDF: s = "MMDF"; break;
case M_MH: s = "MH"; break;
case M_MAILDIR: s = "Maildir"; break;
default: s = "unknown"; break;
}
static int magic_from_string (struct option_t* dst, const char* val,
- char* errbuf __attribute__ ((unused)), ssize_t errlen __attribute__ ((unused))) {
+ char *errbuf, ssize_t errlen)
+{
int flag = -1;
if (!dst || m_strisempty(val))
return (0);
if (ascii_strncasecmp (val, "mbox", 4) == 0)
flag = M_MBOX;
- else if (ascii_strncasecmp (val, "mmdf", 4) == 0)
- flag = M_MMDF;
else if (ascii_strncasecmp (val, "mh", 2) == 0)
flag = M_MH;
else if (ascii_strncasecmp (val, "maildir", 7) == 0)
}
-static void addr_to_string (char* dst, ssize_t dstlen,
- struct option_t* option) {
- char s[HUGE_STRING];
- s[0] = '\0';
- rfc822_addrcat(s, sizeof(s), *((address_t**) option->data), 0);
- snprintf (dst, dstlen, "%s=\"%s\"", option->option, NONULL (s));
-}
-
-static int addr_from_string (struct option_t* dst, const char* val,
- char* errbuf __attribute__ ((unused)), ssize_t errlen __attribute__ ((unused))) {
- if (!dst)
- return (0);
- address_list_wipe((address_t**) dst->data);
- if (val && *val)
- *((address_t**) dst->data) = rfc822_parse_adrlist (NULL, val);
- return (1);
-}
-
static struct {
unsigned short type;
void (*opt_tostr) (char* dst, ssize_t dstlen, struct option_t* option);
{ DT_SORT, sort_to_string, sort_from_string },
{ DT_RX, rx_to_string, rx_from_string },
{ DT_MAGIC, magic_to_string, magic_from_string },
- { DT_ADDR, addr_to_string, addr_from_string },
};
}
else if (DTYPE (option->type) == DT_STR ||
DTYPE (option->type) == DT_PATH ||
- DTYPE (option->type) == DT_ADDR ||
DTYPE (option->type) == DT_MAGIC ||
DTYPE (option->type) == DT_NUM ||
DTYPE (option->type) == DT_SORT ||
DTYPE (option->type) == DT_RX)
{
/* XXX maybe we need to get unset into handlers? */
- if (DTYPE (option->type) == DT_STR ||
- DTYPE (option->type) == DT_PATH ||
- DTYPE (option->type) == DT_ADDR)
- {
+ if (DTYPE (option->type) == DT_STR || DTYPE (option->type) == DT_PATH) {
if (unset) {
CHECK_PAGER;
- if (DTYPE (option->type) == DT_ADDR)
- address_list_wipe((address_t **) option->data);
- else
- p_delete((void **)(void *)&option->data);
+ p_delete((void **)(void *)&option->data);
break;
}
}
if (DTYPE (option->type) == DT_PATH)
mutt_pretty_mailbox (tmp);
}
- else if (DTYPE (option->type) == DT_ADDR) {
- rfc822_addrcat(tmp, sizeof(tmp), *((address_t **) option->data), 0);
- }
else if (DTYPE (option->type) == DT_QUAD)
m_strcpy(tmp, sizeof(tmp), vals[quadoption(option->data)]);
else if (DTYPE (option->type) == DT_NUM)
case M_MBOX:
p = "mbox";
break;
- case M_MMDF:
- p = "MMDF";
- break;
case M_MH:
p = "MH";
- break;
+ break;
case M_MAILDIR:
p = "Maildir";
break;
p_delete(&token.data);
}
- if ((p = getenv ("EMAIL")) != NULL)
- From = rfc822_parse_adrlist (NULL, p);
-
/* Set standard defaults */
hash_map (ConfigOptions, mutt_set_default, 0);
hash_map (ConfigOptions, mutt_restore_default, 0);