X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=c3db611ad1165dd681f8fdd5c4489ddbf90667e5;hp=ce0bd20a5d17e4d5b4f6244e9fcfc84f5b03ab49;hb=031280cca515ce7949dfef0c6c8265c6112b1e34;hpb=9cefec7431f4f98c37c72c294902f2406890711d diff --git a/init.c b/init.c index ce0bd20..c3db611 100644 --- a/init.c +++ b/init.c @@ -18,6 +18,7 @@ #include #include +#include #include "mutt.h" #include "keymap.h" @@ -31,11 +32,8 @@ #endif #include "alias.h" -#include "mx.h" #include "init.h" -#include "lib/list.h" - /* * prototypes */ @@ -47,15 +45,24 @@ static int parse_sort (struct option_t* dst, const char *s, static HASH *ConfigOptions = NULL; /* for synonym warning reports: synonym found during parsing */ -typedef struct { +typedef struct syn_t { + struct syn_t *next; char* f; /* file */ int l; /* line */ struct option_t* n; /* new */ struct option_t* o; /* old */ } syn_t; +DO_INIT(syn_t, syn); +static void syn_wipe(syn_t *syn) { + p_delete(&syn->f); +} +DO_NEW(syn_t, syn); +DO_DELETE(syn_t, syn); +DO_SLIST(syn_t, syn, syn_delete); + /* for synonym warning reports: list of synonyms found */ -static list2_t* Synonyms; +static syn_t *Synonyms = NULL; /* for synonym warning reports: current rc file */ static const char* CurRCFile = NULL; /* for synonym warning reports: current rc line */ @@ -535,22 +542,6 @@ int mutt_option_value (const char* val, char* dst, ssize_t dstlen) { return (1); } -/* for synonym warning reports: adds synonym to end of list */ -static void syn_add (struct option_t* n, struct option_t* o) { - syn_t* tmp = p_new(syn_t, 1); - tmp->f = m_strdup(CurRCFile); - tmp->l = CurRCLine; - tmp->n = n; - tmp->o = o; - list_push_back (&Synonyms, tmp); -} - -/* for synonym warning reports: free single item (for list_del()) */ -static void syn_del (void** p) { - p_delete(&(*(syn_t**) p)->f); - p_delete(p); -} - static void toggle_quadoption (int opt) { int n = opt / 4; @@ -1681,7 +1672,7 @@ check_dsn_notify (const char* option __attribute__ ((unused)), { const char *p = (const char*)val; - while (*p) { + while (p && *p) { const char *q = m_strchrnul(p, ','); int len = q - p; @@ -1798,9 +1789,15 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data, /* resolve synonyms */ if ((option = hash_find (ConfigOptions, tmp->data)) != NULL && - DTYPE (option->type == DT_SYN)) { + DTYPE (option->type == DT_SYN)) + { struct option_t* newopt = hash_find (ConfigOptions, (char*) option->data); - syn_add (newopt, option); + syn_t* tmp = syn_new(); + tmp->f = m_strdup(CurRCFile); + tmp->l = CurRCLine; + tmp->n = newopt; + tmp->o = option; + syn_list_push(&Synonyms, tmp); option = newopt; } @@ -2724,22 +2721,20 @@ void mutt_init (int skip_sys_rc, string_list_t * commands) need_pause = 1; /* warn about synonym variables */ - if (!list_empty(Synonyms)) { - i = 0; + if (Synonyms) { + syn_t *syn; + fprintf (stderr, _("Warning: the following synonym variables were found:\n")); - for (i = 0; i < Synonyms->length; i++) { - struct option_t* newopt = NULL, *oldopt = NULL; - newopt = (struct option_t*) ((syn_t*) Synonyms->data[i])->n; - oldopt = (struct option_t*) ((syn_t*) Synonyms->data[i])->o; - fprintf (stderr, "$%s ($%s should be used) (%s:%d)\n", - oldopt ? NONULL (oldopt->option) : "", - newopt ? NONULL (newopt->option) : "", - NONULL(((syn_t*) Synonyms->data[i])->f), - ((syn_t*) Synonyms->data[i])->l); + + for (syn = Synonyms; syn; syn = syn->next) { + fprintf(stderr, "$%s ($%s should be used) (%s:%d)\n", + syn->o ? NONULL(syn->o->option) : "", + syn->n ? NONULL(syn->n->option) : "", + NONULL(syn->f), syn->l); } fprintf (stderr, _("Warning: synonym variables are scheduled" " for removal.\n")); - list_del (&Synonyms, syn_del); + syn_list_wipe(&Synonyms); need_pause = 1; } @@ -2747,10 +2742,6 @@ void mutt_init (int skip_sys_rc, string_list_t * commands) if (mutt_any_key_to_continue (NULL) == -1) mutt_exit (1); } - -#if 0 - set_option (OPTWEED); /* turn weeding on by default */ -#endif } int mutt_get_hook_type (const char *name) @@ -2763,61 +2754,30 @@ int mutt_get_hook_type (const char *name) return 0; } -/* compare two option_t*'s for sorting -t/-T output */ -static int opt_cmp (const void* a, const void* b) { - return (m_strcmp((*(struct option_t**) a)->option, - (*(struct option_t**) b)->option)); -} - -/* callback for hash_map() to put all non-synonym vars into list */ -static void opt_sel_full (const char* key __attribute__ ((unused)), - void* data, - unsigned long more) { - list2_t** l = (list2_t**) more; - struct option_t* option = (struct option_t*) data; - - if (DTYPE (option->type) == DT_SYN) - return; - list_push_back (l, option); -} - -/* callback for hash_map() to put all changed non-synonym vars into list */ -static void opt_sel_diff (const char* key __attribute__ ((unused)), - void* data, - unsigned long more) { - list2_t** l = (list2_t**) more; - struct option_t* option = (struct option_t*) data; - char buf[LONG_STRING]; +/* dump out the value of all the variables we have */ +int mutt_dump_variables (int full) { + ssize_t i = 0; - if (DTYPE (option->type) == DT_SYN) - return; + /* get all non-synonyms into list... */ + for (i = 0; MuttVars[i].option; i++) { + struct option_t *option = MuttVars + i; + char buf[LONG_STRING]; - mutt_option_value (option->option, buf, sizeof(buf)); - if (m_strcmp(buf, option->init) != 0) - list_push_back (l, option); -} + if (DTYPE(option->type) == DT_SYN) + continue; -/* dump out the value of all the variables we have */ -int mutt_dump_variables (int full) { - ssize_t i = 0; - char outbuf[STRING]; - list2_t* tmp = NULL; - struct option_t* option = NULL; + if (!full) { + mutt_option_value(option->option, buf, sizeof(buf)); + if (!m_strcmp(buf, option->init)) + continue; + } - /* get all non-synonyms into list... */ - hash_map (ConfigOptions, full ? opt_sel_full : opt_sel_diff, - (unsigned long) &tmp); - - if (!list_empty(tmp)) { - /* ...and dump list sorted */ - qsort (tmp->data, tmp->length, sizeof(void*), opt_cmp); - for (i = 0; i < tmp->length; i++) { - option = (struct option_t*) tmp->data[i]; - FuncTable[DTYPE (option->type)].opt_to_string - (outbuf, sizeof(outbuf), option); - printf ("%s\n", outbuf); + printf("set "); + FuncTable[DTYPE(option->type)].opt_to_string + (buf, sizeof(buf), option); + printf ("%s\n", buf); } - } - list_del (&tmp, NULL); - return 0; + + printf ("\n# vi""m:set ft=muttrc:\n"); + return 0; }