X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=a0d194dff292bf451e4f2ea6dadf084fdf542d9a;hp=80b669dac08ed9d5d2153eeb511bfff6e8e94d0e;hb=94d1107856bbba2b77fbd3c0512b9e18f6ed574b;hpb=c22cd6df714617b338e9a23bcb61543c4f3ba97e diff --git a/init.c b/init.c index 80b669d..a0d194d 100644 --- a/init.c +++ b/init.c @@ -14,22 +14,16 @@ #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,8 +81,8 @@ 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 }, +#ifdef USE_LIBESMTP + { "smtp_use_tls", send_smtp_check_usetls }, #endif { "history", check_history }, { "pager_index_lines", check_num }, @@ -333,7 +327,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; @@ -342,15 +335,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) @@ -364,24 +356,6 @@ 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 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); @@ -397,10 +371,6 @@ static struct { { 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 }, }; @@ -911,11 +881,6 @@ 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; @@ -930,8 +895,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) { @@ -964,11 +928,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) { @@ -1094,21 +1053,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); @@ -1180,23 +1125,16 @@ 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; } } @@ -1293,12 +1231,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; @@ -1629,9 +1567,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) @@ -1665,12 +1600,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; @@ -1778,7 +1710,7 @@ 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); } @@ -1806,11 +1738,7 @@ void mutt_init (int skip_sys_rc, string_list_t * commands) 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); } @@ -1828,9 +1756,6 @@ 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); @@ -1846,10 +1771,10 @@ void mutt_init (int skip_sys_rc, string_list_t * commands) 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); @@ -1900,9 +1825,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)); } @@ -1954,9 +1879,6 @@ int mutt_dump_variables (int full) { 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))