X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=7106e97f7603dfda2b831db84f979a451f742945;hp=d7ff973ad07471eb1dc6ccb4a8df7b65de126c70;hb=0ec2f0f11f8b044e4f85dbc3e19cab67fd2400a8;hpb=05039d8ea34618b385736ae6d7578b1643fad3d2 diff --git a/init.c b/init.c index d7ff973..7106e97 100644 --- a/init.c +++ b/init.c @@ -14,18 +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" -#include "mutt_libesmtp.h" #include "alias.h" #include "init.h" @@ -83,9 +81,6 @@ 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 */ @@ -329,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; @@ -338,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) @@ -360,24 +353,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); @@ -393,7 +368,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 }, - { DT_ADDR, addr_to_string, addr_from_string }, }; @@ -460,7 +434,7 @@ int query_quadoption2(int v, const char *prompt) default: v = mutt_yesorno(prompt, (v == M_ASKYES)); - CLEARLINE (LINES - 1); + CLEARLINE(main_w, LINES - 1); return (v); } } @@ -476,7 +450,7 @@ int query_quadoption (int opt, const char *prompt) default: v = mutt_yesorno (prompt, (v == M_ASKYES)); - CLEARLINE (LINES - 1); + CLEARLINE(main_w, LINES - 1); return (v); } @@ -967,18 +941,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, @@ -1035,15 +1003,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) { @@ -1108,7 +1067,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); } } @@ -1138,7 +1096,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) @@ -1148,23 +1105,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; } } @@ -1175,7 +1124,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 @@ -1190,7 +1138,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) @@ -1224,18 +1171,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); } @@ -1261,12 +1202,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; @@ -1597,9 +1538,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) @@ -1633,12 +1571,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; @@ -1668,36 +1603,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; @@ -1746,7 +1651,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); } @@ -1774,11 +1679,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); } @@ -1801,20 +1702,13 @@ void mutt_init (int skip_sys_rc, string_list_t * commands) 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); @@ -1865,9 +1759,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)); } @@ -1910,26 +1804,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 (!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; -}