#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/lib-ui.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"
-
-#if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
-#include "mutt_libesmtp.h"
-#endif
-
#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 },
-#endif
{ "history", check_history },
{ "pager_index_lines", check_num },
/* last */
{ NULL, NULL }
};
-/* protos for config type handles: convert value to string */
-static void bool_to_string (char* dst, ssize_t dstlen, struct option_t* option);
-static void num_to_string (char* dst, ssize_t dstlen, struct option_t* option);
-static void str_to_string (char* dst, ssize_t dstlen, struct option_t* option);
-static void quad_to_string (char* dst, ssize_t dstlen, struct option_t* option);
-static void sort_to_string (char* dst, ssize_t dstlen, struct option_t* option);
-static void rx_to_string (char* dst, ssize_t dstlen, struct option_t* option);
-static void magic_to_string (char* dst, ssize_t dstlen, struct option_t* option);
-static void addr_to_string (char* dst, ssize_t dstlen, struct option_t* option);
-
-/* protos for config type handles: convert to value from string */
-static int bool_from_string (struct option_t* dst, const char* val,
- char* errbuf, ssize_t errlen);
-static int num_from_string (struct option_t* dst, const char* val,
- char* errbuf, ssize_t errlen);
-static int str_from_string (struct option_t* dst, const char* val,
- char* errbuf, ssize_t errlen);
-static int path_from_string (struct option_t* dst, const char* val,
- char* errbuf, ssize_t errlen);
-static int quad_from_string (struct option_t* dst, const char* val,
- char* errbuf, ssize_t errlen);
-static int sort_from_string (struct option_t* dst, const char* val,
- char* errbuf, ssize_t errlen);
-static int rx_from_string (struct option_t* dst, const char* val,
- char* errbuf, ssize_t errlen);
-static int magic_from_string (struct option_t* dst, const char* val,
- char* errbuf, ssize_t errlen);
-static int addr_from_string (struct option_t* dst, const char* val,
- char* errbuf, ssize_t errlen);
-
-static struct {
- unsigned short type;
- void (*opt_tostr) (char* dst, ssize_t dstlen, struct option_t* option);
- int (*opt_fromstr) (struct option_t* dst, const char* val,
- char* errbuf, ssize_t errlen);
-} FuncTable[] = {
- { 0, NULL, NULL }, /* there's no DT_ type with 0 */
- { DT_BOOL, bool_to_string, bool_from_string },
- { DT_NUM, num_to_string, num_from_string },
- { DT_STR, str_to_string, str_from_string },
- { DT_PATH, str_to_string, path_from_string },
- { DT_QUAD, quad_to_string, quad_from_string },
- { DT_SORT, sort_to_string, sort_from_string },
- { DT_RX, rx_to_string, rx_from_string },
- { DT_MAGIC, magic_to_string, magic_from_string },
- /* synonyms should be resolved already so we don't need this
- * but must define it as DT_ is used for indexing */
- { DT_SYN, NULL, NULL },
- { DT_ADDR, addr_to_string, addr_from_string },
-};
-
static void bool_to_string (char* dst, ssize_t dstlen,
struct option_t* option) {
snprintf (dst, dstlen, "%s=%s", option->option,
int flag = -1;
if (!dst)
- return (0);
+ return 0;
if (ascii_strncasecmp (val, "yes", 3) == 0)
flag = 1;
else if (ascii_strncasecmp (val, "no", 2) == 0)
flag = 0;
if (flag < 0)
- return (0);
+ return 0;
if (flag)
set_option (dst->data);
else
unset_option (dst->data);
- return (1);
+ return 1;
}
static void num_to_string (char* dst, ssize_t dstlen,
char* t = NULL;
if (!dst)
- return (0);
+ return 0;
num = strtol (val, &t, 0);
snprintf (errbuf, errlen, _("'%s' is invalid for $%s"),
val, dst->option);
}
- return (0);
+ return 0;
}
/* just temporarily accept new val so that check_special for
if (!check_special (dst->option, (unsigned long) num, errbuf, errlen)) {
*((short*) dst->data) = old;
- return (0);
+ return 0;
}
- return (1);
+ return 1;
}
static void str_to_string (char* dst, ssize_t dstlen,
char path[_POSIX_PATH_MAX];
if (!dst)
- return (0);
+ return 0;
if (m_strisempty(val)) {
p_delete((char**) dst->data);
- return (1);
+ return 1;
}
path[0] = '\0';
m_strcpy(path, sizeof(path), val);
mutt_expand_path (path, sizeof(path));
m_strreplace((char **) dst->data, path);
- return (1);
+ return 1;
}
static int str_from_string (struct option_t* dst, const char* val,
char* errbuf, ssize_t errlen) {
if (!dst)
- return (0);
+ return 0;
if (!check_special (dst->option, (unsigned long) val, errbuf, errlen))
- return (0);
+ return 0;
m_strreplace((char**) dst->data, val);
- return (1);
+ return 1;
}
static void quad_to_string (char* dst, ssize_t dstlen,
int flag = -1;
if (!dst)
- return (0);
+ return 0;
if (ascii_strncasecmp (val, "yes", 3) == 0)
flag = M_YES;
else if (ascii_strncasecmp (val, "no", 2) == 0)
flag = M_ASKNO;
if (flag < 0)
- return (0);
+ return 0;
set_quadoption (dst->data, flag);
- return (1);
+ return 1;
}
static void sort_to_string (char* dst, ssize_t dstlen,
if (errbuf)
snprintf (errbuf, errlen, _("%s: Unknown type."),
dst->option);
- return (0);
+ return 0;
}
if (parse_sort (dst, val, map, errbuf, errlen) == -1)
- return (0);
- return (1);
+ return 0;
+ return 1;
}
static void rx_to_string (char* dst, ssize_t dstlen,
char* s = NULL;
if (!dst)
- return (0);
+ return 0;
if (option (OPTATTACHMSG) && !m_strcmp(dst->option, "reply_regexp")) {
if (errbuf)
snprintf (errbuf, errlen,
"Operation not permitted when in attach-message mode.");
- return (0);
+ return 0;
}
if (!((rx_t*) dst->data))
/* something to do? */
if (m_strisempty(val) || (p->pattern && m_strcmp(p->pattern, val) == 0))
- return (1);
+ return 1;
if (m_strcmp(dst->option, "mask") != 0)
flags |= mutt_which_case (val);
regerror (e, rx, errbuf, errlen);
regfree (rx);
p_delete(&rx);
- return (0);
+ return 0;
}
if (p->rx) {
if (m_strcmp(dst->option, "reply_regexp") == 0)
mutt_adjust_all_subjects ();
- return (1);
-}
-
-static void magic_to_string (char* dst, ssize_t dstlen,
- struct option_t* option) {
- 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;
- }
- snprintf (dst, dstlen, "%s=%s", option->option, s);
-}
-
-static int magic_from_string (struct option_t* dst, const char* val,
- char* errbuf __attribute__ ((unused)), ssize_t errlen __attribute__ ((unused))) {
- 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)
- flag = M_MAILDIR;
-
- if (flag < 0)
- return (0);
-
- *((short*) dst->data) = flag;
- return (1);
-
+ return 1;
}
-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 struct {
+ unsigned short type;
+ void (*opt_tostr) (char* dst, ssize_t dstlen, struct option_t* option);
+ int (*opt_fromstr) (struct option_t* dst, const char* val,
+ char* errbuf, ssize_t errlen);
+} FuncTable[] = {
+ { 0, NULL, NULL }, /* there's no DT_ type with 0 */
+ { DT_BOOL, bool_to_string, bool_from_string },
+ { DT_NUM, num_to_string, num_from_string },
+ { DT_STR, str_to_string, str_from_string },
+ { DT_PATH, str_to_string, path_from_string },
+ { DT_QUAD, quad_to_string, quad_from_string },
+ { DT_SORT, sort_to_string, sort_from_string },
+ { DT_RX, rx_to_string, rx_from_string },
+};
-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);
-}
int mutt_option_value (const char* val, char* dst, ssize_t dstlen) {
struct option_t* option = NULL;
if (!(option = hash_find (ConfigOptions, val))) {
*dst = '\0';
- return (0);
+ return 0;
}
tmp = p_new(char, dstlen+1);
FuncTable[DTYPE(option->type)].opt_tostr (tmp, dstlen, option);
memcpy (dst, t, l+1);
p_delete(&tmp);
- return (1);
+ return 1;
}
static void toggle_quadoption (int opt)
switch (v) {
case M_YES:
case M_NO:
- return (v);
+ return v;
default:
- v = mutt_yesorno(prompt, (v == M_ASKYES));
- CLEARLINE (LINES - 1);
- return (v);
+ return mutt_yesorno(prompt, (v == M_ASKYES));
}
}
switch (v) {
case M_YES:
case M_NO:
- return (v);
+ return v;
default:
- v = mutt_yesorno (prompt, (v == M_ASKYES));
- CLEARLINE (LINES - 1);
- return (v);
+ return mutt_yesorno(prompt, (v == M_ASKYES));
}
-
- /* not reached */
}
/* always wise to do what someone else did before */
if (!MoreArgs (s)) {
m_strcpy(err->data, err->dsize, _("alias: no address"));
- return (-1);
+ return -1;
}
mutt_extract_token (buf, s, 0);
mutt_extract_token (buf, s, M_TOKEN_SPACE | M_TOKEN_QUOTE);
if ((p = strpbrk (buf->data, ": \t")) == NULL || *p != ':') {
m_strcpy(err->data, err->dsize, _("invalid header field"));
- return (-1);
+ return -1;
}
keylen = p - buf->data + 1;
if ((i = mutt_getvaluebyname (s, map)) == -1) {
if (errbuf)
snprintf (errbuf, errlen, _("'%s' is invalid for $%s"), s, dst->option);
- return (-1);
+ return -1;
}
*((short*) dst->data) = i | flags;
char buf[LONG_STRING];
struct option_t *ptr = p;
- if (DTYPE(ptr->type) == DT_SYN) {
- if (!more)
- return;
- ptr = hash_find(ConfigOptions, (const char *)ptr->data);
- }
if (!ptr || *ptr->init || !FuncTable[DTYPE (ptr->type)].opt_fromstr)
return;
mutt_option_value(ptr->option, buf, sizeof(buf));
- if (m_strlen(ptr->init) == 0 && buf && *buf)
+ if (m_strlen(ptr->init) == 0 && *buf)
ptr->init = m_strdup(buf);
}
p_delete(dst);
- if (DTYPE(src->type) == DT_STR ||
- DTYPE(src->type) == DT_PATH) {
+ if (DTYPE(src->type) == DT_STR || DTYPE(src->type) == DT_PATH) {
/* only expand for string as it's the only place where
* we want to expand vars right now */
if (src->init && *src->init) {
} else
/* for non-string: take value as is */
*dst = m_strdup(src->init);
- return (1);
+ return 1;
}
/* if additional data more == 1, we want to resolve synonyms */
struct option_t* ptr = (struct option_t*) p;
char* init = NULL;
- if (DTYPE (ptr->type) == DT_SYN) {
- if (!more)
- return;
- ptr = hash_find (ConfigOptions, (char*) ptr->data);
- }
if (!ptr)
return;
if (FuncTable[DTYPE (ptr->type)].opt_fromstr) {
p_delete(&init);
}
- if (ptr->flags & R_INDEX)
- set_option (OPTFORCEREDRAWINDEX);
- if (ptr->flags & R_PAGER)
- set_option (OPTFORCEREDRAWPAGER);
- if (ptr->flags & R_RESORT_SUB)
- set_option (OPTSORTSUBTHREADS);
- if (ptr->flags & R_RESORT)
- set_option (OPTNEEDRESORT);
- if (ptr->flags & R_RESORT_INIT)
- set_option (OPTRESORTINIT);
- if (ptr->flags & R_TREE)
- set_option (OPTREDRAWTREE);
+ set_option (OPTFORCEREDRAWINDEX);
+ set_option (OPTFORCEREDRAWPAGER);
+ set_option (OPTSORTSUBTHREADS);
+ set_option (OPTNEEDRESORT);
+ set_option (OPTRESORTINIT);
+ set_option (OPTREDRAWTREE);
}
static int check_num (const char* option, unsigned long p,
if ((int) p < 0) {
if (errbuf)
snprintf (errbuf, errlen, _("'%d' is invalid for $%s"), (int) p, option);
- return (0);
+ return 0;
}
- return (1);
+ return 1;
}
static int check_history (const char* option __attribute__ ((unused)), unsigned long p,
char* errbuf, ssize_t errlen) {
if (!check_num ("history", p, errbuf, errlen))
- return (0);
+ return 0;
mutt_init_history ();
- return (1);
+ return 1;
}
static int check_special (const char* name, unsigned long val,
val, errbuf, errlen));
}
}
- return (1);
+ return 1;
}
static const struct mapping_t* get_sortmap (struct option_t* option) {
map = SortMethods;
break;
}
- return (map);
+ return map;
}
-#define CHECK_PAGER \
- if ((CurrentMenu == MENU_PAGER) && \
- (!option || (option->flags & R_RESORT))) \
- { \
- snprintf (err->data, err->dsize, \
- _("Not available in this menu.")); \
- return (-1); \
- }
-
static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
BUFFER * err)
{
/* get the variable name */
mutt_extract_token (tmp, s, M_TOKEN_EQUAL);
-
- /* resolve synonyms */
- if ((option = hash_find (ConfigOptions, tmp->data)) != NULL &&
- DTYPE (option->type == DT_SYN))
- {
- struct option_t* newopt = hash_find (ConfigOptions, (char*) option->data);
- syn_t* syn = syn_new();
- syn->f = m_strdup(CurRCFile);
- syn->l = CurRCLine;
- syn->n = newopt;
- syn->o = option;
- syn_list_push(&Synonyms, syn);
- option = newopt;
- }
-
+ option = hash_find(ConfigOptions, tmp->data);
if (!option && !(reset && m_strcmp("all", tmp->data) == 0)) {
snprintf (err->data, err->dsize, _("%s: unknown variable"), tmp->data);
- return (-1);
+ return -1;
}
s->dptr = vskipspaces(s->dptr);
if (reset) {
if (query || unset || inv) {
snprintf (err->data, err->dsize, _("prefix is illegal with reset"));
- return (-1);
+ return -1;
}
if (s && *s->dptr == '=') {
snprintf (err->data, err->dsize, _("value is illegal with reset"));
- return (-1);
+ return -1;
}
if (!m_strcmp("all", tmp->data)) {
if (CurrentMenu == MENU_PAGER) {
snprintf (err->data, err->dsize, _("Not available in this menu."));
- return (-1);
+ return -1;
}
hash_map (ConfigOptions, mutt_restore_default, 1);
set_option (OPTFORCEREDRAWINDEX);
set_option (OPTNEEDRESORT);
set_option (OPTRESORTINIT);
set_option (OPTREDRAWTREE);
- return (0);
+ return 0;
} else {
- CHECK_PAGER;
mutt_restore_default (NULL, option, 1);
}
}
if (s && *s->dptr == '=') {
if (unset || inv || query) {
snprintf (err->data, err->dsize, "Usage: set variable=yes|no");
- return (-1);
+ return -1;
}
s->dptr++;
unset = 1;
else {
snprintf (err->data, err->dsize, "Usage: set variable=yes|no");
- return (-1);
+ return -1;
}
}
return 0;
}
- CHECK_PAGER;
if (unset)
unset_option (option->data);
else if (inv)
}
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;
}
}
break;
}
- CHECK_PAGER;
s->dptr++;
mutt_extract_token (tmp, s, 0);
if (!FuncTable[DTYPE (option->type)].opt_fromstr
}
if (*s->dptr == '=') {
- CHECK_PAGER;
s->dptr++;
mutt_extract_token (tmp, s, 0);
if (ascii_strcasecmp ("yes", tmp->data) == 0)
break;
}
- if (option->flags & R_INDEX)
- set_option (OPTFORCEREDRAWINDEX);
- if (option->flags & R_PAGER)
- set_option (OPTFORCEREDRAWPAGER);
- if (option->flags & R_RESORT_SUB)
- set_option (OPTSORTSUBTHREADS);
- if (option->flags & R_RESORT)
- set_option (OPTNEEDRESORT);
- if (option->flags & R_RESORT_INIT)
- set_option (OPTRESORTINIT);
- if (option->flags & R_TREE)
- set_option (OPTREDRAWTREE);
+ set_option (OPTFORCEREDRAWINDEX);
+ set_option (OPTFORCEREDRAWPAGER);
+ set_option (OPTSORTSUBTHREADS);
+ set_option (OPTNEEDRESORT);
+ set_option (OPTRESORTINIT);
+ set_option (OPTREDRAWTREE);
}
- return (r);
+ return r;
}
#define MAXERRS 128
if ((f = mutt_open_read (rcfile, &pid)) == NULL) {
snprintf (err->data, err->dsize, "%s: %s", rcfile, strerror (errno));
- return (-1);
+ return -1;
}
p_clear(&token, 1);
while ((linebuf = mutt_read_line(linebuf, &buflen, f, &line)) != NULL) {
- conv = ConfigCharset && (*ConfigCharset) && MCharset.charset;
+ conv = ConfigCharset && (*ConfigCharset) && mod_cset.charset;
if (conv) {
currentline = m_strdup(linebuf);
if (!currentline)
continue;
- mutt_convert_string (¤tline, ConfigCharset, MCharset.charset, 0);
+ mutt_convert_string (¤tline, ConfigCharset, mod_cset.charset, 0);
}
else
currentline = linebuf;
rcfile);
rc = -1;
}
- return (rc);
+ return rc;
}
#undef MAXERRS
do {
if (mutt_extract_token (tmp, s, 0) != 0) {
snprintf (err->data, err->dsize, _("source: error at %s"), s->dptr);
- return (-1);
+ return -1;
}
m_strcpy(path, sizeof(path), tmp->data);
}
while (MoreArgs (s));
- return ((rc < 0) ? -1 : 0);
+ return (rc < 0) ? -1 : 0;
}
/* line command to execute
finish:
if (expn.destroy)
p_delete(&expn.data);
- return (r);
+ return r;
}
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)
(*((short *)option->data) & SORT_REVERSE) ? "reverse-" : "",
(*((short *)option->data) & SORT_LAST) ? "last-" : "", p);
}
- else if (DTYPE (option->type) == DT_MAGIC) {
- const char *p;
- switch (DefaultMagic) {
- case M_MBOX:
- p = "mbox";
- break;
- case M_MMDF:
- p = "MMDF";
- break;
- case M_MH:
- p = "MH";
- break;
- case M_MAILDIR:
- p = "Maildir";
- break;
- default:
- p = "unknown";
- }
- m_strcpy(tmp, sizeof(tmp), p);
- }
else if (DTYPE (option->type) == DT_BOOL)
m_strcpy(tmp, sizeof(tmp), option(option->data) ? "yes" : "no");
else
return 0;
}
-/* Implement the -Q command line flag */
-int mutt_query_variables (string_list_t * queries)
-{
- string_list_t *p;
-
- char errbuff[STRING];
- char command[STRING];
-
- BUFFER err, token;
-
- p_clear(&err, 1);
- p_clear(&token, 1);
-
- err.data = errbuff;
- err.dsize = sizeof(errbuff);
-
- for (p = queries; p; p = p->next) {
- snprintf (command, sizeof(command), "set ?%s\n", p->data);
- if (mutt_parse_rc_line (command, &token, &err) == -1) {
- fprintf (stderr, "%s\n", err.data);
- p_delete(&token.data);
- return 1;
- }
- printf ("%s\n", err.data);
- }
-
- p_delete(&token.data);
- return 0;
-}
-
static int mutt_execute_commands (string_list_t * p)
{
BUFFER err, token;
if (mutt_parse_rc_line (p->data, &token, &err) != 0) {
fprintf (stderr, _("Error in command line: %s\n"), err.data);
p_delete(&token.data);
- return (-1);
+ return -1;
}
}
p_delete(&token.data);
/* Get some information about the user */
if ((pw = getpwuid (getuid ()))) {
char rnbuf[STRING];
- mutt_gecos_name(rnbuf, sizeof(rnbuf), pw, MCore.gecos_mask);
+ mutt_gecos_name(rnbuf, sizeof(rnbuf), pw, mod_core.gecos_mask);
Realname = m_strdup(rnbuf);
}
-#ifdef USE_NNTP
- {
- FILE *f;
- char *q;
-
- if ((f = safe_fopen (SYSCONFDIR "/nntpserver", "r"))) {
- buffer[0] = '\0';
- fgets (buffer, sizeof(buffer), f);
- p = vskipspaces(buffer);
- q = (char*)p;
- while (*q && !isspace(*q))
- q++;
- *q = '\0';
- NewsServer = m_strdup(p);
- m_fclose(&f);
- }
- }
- if ((p = getenv ("NNTPSERVER")))
- NewsServer = m_strdup(p);
-#endif
-
if ((p = getenv("MAIL") ?: getenv("MAILDIR"))) {
Spoolfile = m_strdup(p);
} else {
-#ifdef HOMESPOOL
- mutt_concat_path(buffer, sizeof(buffer), NONULL(MCore.homedir), MAILPATH);
-#else
- mutt_concat_path(buffer, sizeof(buffer), MAILPATH, NONULL(MCore.username));
-#endif
+ mutt_concat_path(buffer, sizeof(buffer), NONULL(mod_core.homedir), MAILPATH);
Spoolfile = m_strdup(buffer);
}
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);
CurrentMenu = MENU_MAIN;
-
-#ifdef HAVE_GETSID
- /* Unset suspend by default if we're the session leader */
- if (getsid (0) == getpid ())
- unset_option (OPTSUSPEND);
-#endif
-
mutt_init_history ();
if (!Muttrc) {
- snprintf (buffer, sizeof(buffer), "%s/.madmuttrc", NONULL(MCore.homedir));
+ snprintf (buffer, sizeof(buffer), "%s/.madmuttrc", NONULL(mod_core.homedir));
if (access (buffer, F_OK) == -1)
snprintf (buffer, sizeof(buffer), "%s/.madmutt/madmuttrc",
- NONULL(MCore.homedir));
+ NONULL(mod_core.homedir));
default_rc = 1;
Muttrc = m_strdup(buffer);
}
/* LUA {{{ */
- snprintf(buffer, sizeof(buffer), "%s/.madmutt.lua", NONULL(MCore.homedir));
+ snprintf(buffer, sizeof(buffer), "%s/.madmutt.lua", NONULL(mod_core.homedir));
if (access(buffer, F_OK) < 0)
- snprintf(buffer, sizeof(buffer), "%s/.madmutt/cfg.lua", NONULL(MCore.homedir));
+ snprintf(buffer, sizeof(buffer), "%s/.madmutt/cfg.lua", NONULL(mod_core.homedir));
if (!access(buffer, F_OK)) {
need_pause = luaM_wrap(mutt_error, luaM_dofile(buffer));
}
}
}
-int mutt_get_hook_type (const char *name)
-{
- struct command_t *c;
-
- for (c = Commands; c->name; c++)
- if (c->func == mutt_parse_hook && ascii_strcasecmp (c->name, name) == 0)
- return c->data;
- return 0;
-}
-
-/* dump out the value of all the variables we have */
-int mutt_dump_variables (int full) {
- ssize_t i = 0;
-
- /* get all non-synonyms into list... */
- for (i = 0; MuttVars[i].option; i++) {
- struct option_t *option = MuttVars + i;
- char buf[LONG_STRING];
-
- if (DTYPE(option->type) == DT_SYN)
- continue;
-
- if (!full) {
- mutt_option_value(option->option, buf, sizeof(buf));
- if (!m_strcmp(buf, option->init))
- continue;
- }
-
- printf("set ");
- FuncTable[DTYPE(option->type)].opt_tostr(buf, sizeof(buf), option);
- printf ("%s\n", buf);
- }
-
- printf ("\n# vi""m:set ft=muttrc:\n");
- return 0;
-}
projects / apps / madmutt.git / blobdiff