X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=323d5ac2b5653c06eef3079411dc12f2644618f4;hp=3b57790ab72b9d72d67b8e90c89c79bdf04701ac;hb=3438f31945bb94bc4f4b9603ac47fcde03d5c073;hpb=6aac4a85332ec3647c29a7b996cade972895a8b8 diff --git a/init.c b/init.c index 3b57790..323d5ac 100644 --- a/init.c +++ b/init.c @@ -14,22 +14,16 @@ #include #include -#include -#include +#include #include #include -#include #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" @@ -87,66 +81,12 @@ static struct { 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, @@ -324,7 +264,7 @@ static int rx_from_string (struct option_t* dst, const char* val, char* errbuf, ssize_t errlen) { rx_t* p = NULL; regex_t* rx = NULL; - int flags = 0, e = 0, not = 0; + int flags = 0, e = 0, neg = 0; char* s = NULL; if (!dst) @@ -351,7 +291,7 @@ static int rx_from_string (struct option_t* dst, const char* val, s = (char*) val; if (m_strcmp(dst->option, "mask") == 0 && *s == '!') { - not = 1; + neg = 1; s++; } @@ -371,7 +311,7 @@ static int rx_from_string (struct option_t* dst, const char* val, m_strreplace(&p->pattern, val); p->rx = rx; - p->not = not; + p->neg = neg; if (m_strcmp(dst->option, "reply_regexp") == 0) mutt_adjust_all_subjects (); @@ -384,7 +324,6 @@ static void magic_to_string (char* dst, ssize_t dstlen, 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; @@ -393,15 +332,14 @@ static void magic_to_string (char* dst, ssize_t dstlen, } 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) @@ -415,23 +353,23 @@ static int magic_from_string (struct option_t* dst, const char* val, } -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 }, + { DT_MAGIC, magic_to_string, magic_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; @@ -495,9 +433,7 @@ int query_quadoption2(int v, const char *prompt) return (v); default: - v = mutt_yesorno(prompt, (v == M_ASKYES)); - CLEARLINE (LINES - 1); - return (v); + return mutt_yesorno(prompt, (v == M_ASKYES)); } } @@ -511,170 +447,10 @@ int query_quadoption (int opt, const char *prompt) return (v); default: - v = mutt_yesorno (prompt, (v == M_ASKYES)); - CLEARLINE (LINES - 1); - return (v); - } - - /* not reached */ -} - -static void add_to_list(string_list_t **list, const char *str) -{ - /* don't add a NULL or empty string to the list */ - if (m_strisempty(str)) - return; - - /* check to make sure the item is not already on this list */ - while (*list) { - if (!ascii_strcasecmp(str, (*list)->data)) - return; - list = &(*list)->next; - } - - *list = p_new(string_list_t, 1); - (*list)->data = m_strdup(str); -} - -static int -add_to_rx_list(rx_t **list, const char *s, int flags, BUFFER *err) -{ - rx_t *rx; - - if (m_strisempty(s)) - return 0; - - if (rx_lookup(list, s)) - return 0; - - rx = rx_compile(s, flags); - if (!rx) { - snprintf(err->data, err->dsize, "Bad regexp: %s\n", s); - return -1; - } - - rx_list_append(list, rx); - return 0; -} - -static void remove_from_list(string_list_t **l, const char *str) -{ - if (!m_strcmp("*", str)) { - string_list_wipe(l); /* ``unCMD *'' means delete all current entries */ - return; - } - - while (*l) { - if (!ascii_strcasecmp(str, (*l)->data)) { - string_list_t *it = string_list_pop(l); - string_item_delete(&it); - } else { - l = &(*l)->next; - } - } -} - -static int remove_from_rx_list(rx_t **l, const char *str) -{ - if (m_strcmp("*", str) == 0) { - rx_list_wipe(l); - return 0; - } - - l = rx_lookup(l, str); - if (*l) { - rx_t *r = rx_list_pop(l); - rx_delete(&r); - return 0; - } - - return -1; -} - -static int parse_unignore (BUFFER * buf, BUFFER * s, - unsigned long data __attribute__ ((unused)), - BUFFER * err __attribute__ ((unused))) -{ - do { - mutt_extract_token (buf, s, 0); - - /* don't add "*" to the unignore list */ - if (m_strcmp (buf->data, "*")) - add_to_list (&UnIgnore, buf->data); - - remove_from_list (&Ignore, buf->data); - } while (MoreArgs (s)); - - return 0; -} - -static int parse_ignore (BUFFER * buf, BUFFER * s, - unsigned long data __attribute__ ((unused)), - BUFFER * err __attribute__ ((unused))) -{ - do { - mutt_extract_token (buf, s, 0); - remove_from_list (&UnIgnore, buf->data); - add_to_list (&Ignore, buf->data); - } while (MoreArgs(s)); - return 0; -} - -static int parse_list(BUFFER * buf, BUFFER * s, unsigned long data, - BUFFER * err __attribute__ ((unused))) -{ - do { - mutt_extract_token (buf, s, 0); - add_to_list ((string_list_t **) data, buf->data); - } while (MoreArgs(s)); - return 0; -} - -static void _alternates_clean (void) -{ - int i; - - if (Context && Context->msgcount) { - for (i = 0; i < Context->msgcount; i++) - Context->hdrs[i]->recip_valid = 0; + return mutt_yesorno(prompt, (v == M_ASKYES)); } } -static int parse_unlist (BUFFER * buf, BUFFER * s, unsigned long data, - BUFFER * err __attribute__ ((unused))) -{ - do { - mutt_extract_token (buf, s, 0); - /* - * Check for deletion of entire list - */ - if (m_strcmp(buf->data, "*") == 0) { - string_list_wipe((string_list_t **) data); - break; - } - remove_from_list ((string_list_t **) data, buf->data); - } - while (MoreArgs (s)); - - return 0; -} - -static int parse_lists (BUFFER * buf, BUFFER * s, - unsigned long data __attribute__ ((unused)), - BUFFER * err) -{ - do { - mutt_extract_token (buf, s, 0); - remove_from_rx_list (&UnMailLists, buf->data); - - if (add_to_rx_list (&MailLists, buf->data, REG_ICASE, err) != 0) - return -1; - } - while (MoreArgs (s)); - - return 0; -} - /* always wise to do what someone else did before */ static void _attachments_clean (void) { int i; @@ -777,7 +553,7 @@ static int parse_unattach_list (BUFFER *buf, BUFFER *s, string_list_t **ldata, } major = mutt_check_mime_type(tmp); - /* We must do our own walk here because remove_from_list() will only + /* We must do our own walk here because string_list_remove() will only * remove the string_list_t->data, not anything pointed to by the string_list_t->data. */ lastp = NULL; for(lp = *ldata; lp; ) { @@ -909,59 +685,6 @@ static int parse_unattachments (BUFFER *buf, BUFFER *s, unsigned long data __att return parse_unattach_list(buf, s, listp, err); } -static int parse_unlists (BUFFER * buf, BUFFER * s, - unsigned long data __attribute__ ((unused)), - BUFFER * err __attribute__ ((unused))) -{ - do { - mutt_extract_token (buf, s, 0); - remove_from_rx_list (&SubscribedLists, buf->data); - remove_from_rx_list (&MailLists, buf->data); - - if (m_strcmp(buf->data, "*") && - add_to_rx_list (&UnMailLists, buf->data, REG_ICASE, err) != 0) - return -1; - } - while (MoreArgs (s)); - - return 0; -} - -static int parse_subscribe (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)), - BUFFER * err) -{ - do { - mutt_extract_token (buf, s, 0); - remove_from_rx_list (&UnMailLists, buf->data); - remove_from_rx_list (&UnSubscribedLists, buf->data); - - if (add_to_rx_list (&MailLists, buf->data, REG_ICASE, err) != 0) - return -1; - if (add_to_rx_list (&SubscribedLists, buf->data, REG_ICASE, err) != 0) - return -1; - } - while (MoreArgs (s)); - - return 0; -} - -static int parse_unsubscribe (BUFFER * buf, BUFFER * s, - unsigned long data __attribute__ ((unused)), - BUFFER * err __attribute__ ((unused))) -{ - do { - mutt_extract_token (buf, s, 0); - remove_from_rx_list (&SubscribedLists, buf->data); - - if (m_strcmp(buf->data, "*") && - add_to_rx_list (&UnSubscribedLists, buf->data, REG_ICASE, err) != 0) - return -1; - } - while (MoreArgs (s)); - - return 0; -} - static int parse_unalias (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)), BUFFER * err __attribute__ ((unused))) @@ -1149,16 +872,11 @@ static void mutt_set_default(const char *name __attribute__ ((unused)), void* p, 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); } @@ -1168,8 +886,7 @@ static int init_expand (char** dst, struct option_t* src) { 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) { @@ -1202,11 +919,6 @@ static void mutt_restore_default (const char* name __attribute__ ((unused)), 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) { @@ -1223,18 +935,12 @@ static void mutt_restore_default (const char* name __attribute__ ((unused)), 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, @@ -1291,15 +997,6 @@ static const struct mapping_t* get_sortmap (struct option_t* option) { 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) { @@ -1332,21 +1029,7 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data, /* 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); @@ -1378,7 +1061,6 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data, set_option (OPTREDRAWTREE); return (0); } else { - CHECK_PAGER; mutt_restore_default (NULL, option, 1); } } @@ -1408,7 +1090,6 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data, return 0; } - CHECK_PAGER; if (unset) unset_option (option->data); else if (inv) @@ -1418,23 +1099,15 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data, } 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; } } @@ -1445,7 +1118,6 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data, break; } - CHECK_PAGER; s->dptr++; mutt_extract_token (tmp, s, 0); if (!FuncTable[DTYPE (option->type)].opt_fromstr @@ -1460,7 +1132,6 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data, } if (*s->dptr == '=') { - CHECK_PAGER; s->dptr++; mutt_extract_token (tmp, s, 0); if (ascii_strcasecmp ("yes", tmp->data) == 0) @@ -1494,18 +1165,12 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data, 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); } @@ -1531,12 +1196,12 @@ static int source_rc (const char *rcfile, BUFFER * err) 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; @@ -1867,9 +1532,6 @@ int mutt_var_value_complete (char *buffer, ssize_t len, int pos) 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) @@ -1903,12 +1565,9 @@ int mutt_var_value_complete (char *buffer, ssize_t len, int pos) 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; @@ -1938,36 +1597,6 @@ int mutt_var_value_complete (char *buffer, ssize_t len, int pos) 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; @@ -2016,51 +1645,17 @@ void mutt_init (int skip_sys_rc, string_list_t * commands) /* 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); } - if ((p = getenv ("MAILCAPS"))) - MailcapPath = m_strdup(p); - else { - /* Default search path from RFC1524 */ - MailcapPath = - m_strdup("~/.mailcap:" PKGDATADIR "/mailcap:" SYSCONFDIR - "/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap"); - } - if ((p = getenv ("REPLYTO")) != NULL) { BUFFER buf, token; @@ -2075,28 +1670,18 @@ void mutt_init (int skip_sys_rc, string_list_t * commands) 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); @@ -2147,9 +1732,9 @@ void mutt_init (int skip_sys_rc, string_list_t * commands) } /* 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)); } @@ -2192,29 +1777,3 @@ int mutt_get_hook_type (const char *name) 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; -}