* Copyright notice from original mutt:
* Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>
*
+ * Parts were written/modified by:
+ * Rocco Rutte <pdmef@cs.tu-berlin.de>
+ *
* This file is part of mutt-ng, see http://www.muttng.org/.
* It's licensed under the GNU General Public License,
* please see the file GPL in the top level source directory.
#endif
#include "mutt.h"
+#include "buffer.h"
+#include "ascii.h"
#include "mapping.h"
#include "mutt_curses.h"
#include "history.h"
#include "keymap.h"
#include "mbyte.h"
#include "charset.h"
+#include "thread.h"
#include "mutt_crypt.h"
#include "mutt_idna.h"
#include "mutt_ssl.h"
#endif
+#if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
+#include "mutt_libesmtp.h"
+#endif
+
#include "mx.h"
#include "init.h"
#include <errno.h>
#include <sys/wait.h>
+/*
+ * prototypes
+ */
+static const struct mapping_t* get_sortmap (struct option_t* option);
+static int parse_sort (struct option_t* dst, const char *s,
+ const struct mapping_t *map,
+ char* errbuf, size_t errlen);
+
+static HASH* ConfigOptions = NULL;
+
/* for synonym warning reports: synonym found during parsing */
typedef struct {
- char* f; /* file */
- int l; /* line */
- int n; /* new name (index) */
- int o; /* old name (index) */
+ char* f; /* file */
+ int l; /* line */
+ struct option_t* n; /* new */
+ struct option_t* o; /* old */
} syn_t;
/* for synonym warning reports: list of synonyms found */
-list2_t* Synonyms;
+static list2_t* Synonyms;
/* for synonym warning reports: current rc file */
-char* CurRCFile = NULL;
+static const char* CurRCFile = NULL;
/* for synonym warning reports: current rc line */
-int CurRCLine = 0;
+static int CurRCLine = 0;
+
+/* prototypes for checking for special vars */
+static int check_dsn_return (const char*);
+static int check_dsn_notify (const char*);
+
+/* variable <-> sanity check function mappings */
+static struct {
+ const char* name;
+ int (*check) (const char*);
+} SpecialVars[] = {
+ { "dsn_notify", check_dsn_notify },
+ { "dsn_return", check_dsn_return },
+#if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
+ { "smtp_use_tls", mutt_libesmtp_check_usetls },
+#endif
+ /* last */
+ { NULL, NULL }
+};
+
+/* protos for config type handles */
+static void bool_to_string (char* dst, size_t dstlen, int idx);
+static void num_to_string (char* dst, size_t dstlen, int idx);
+static void str_to_string (char* dst, size_t dstlen, int idx);
+static void quad_to_string (char* dst, size_t dstlen, int idx);
+static void sort_to_string (char* dst, size_t dstlen, int idx);
+static void rx_to_string (char* dst, size_t dstlen, int idx);
+static void magic_to_string (char* dst, size_t dstlen, int idx);
+static void syn_to_string (char* dst, size_t dstlen, int idx);
+static void addr_to_string (char* dst, size_t dstlen, int idx);
+
+static struct {
+ unsigned short type;
+ void (*opt_to_string) (char* dst, size_t dstlen, int idx);
+} FuncTable[] = {
+ { 0, NULL }, /* there's no DT_ type with 0 */
+ { DT_BOOL, bool_to_string },
+ { DT_NUM, num_to_string },
+ { DT_STR, str_to_string },
+ { DT_PATH, str_to_string },
+ { DT_QUAD, quad_to_string },
+ { DT_SORT, sort_to_string },
+ { DT_RX, rx_to_string },
+ { DT_MAGIC, magic_to_string },
+ { DT_SYN, syn_to_string },
+ { DT_ADDR, addr_to_string }
+};
+
+static void bool_to_string (char* dst, size_t dstlen, int idx) {
+ snprintf (dst, dstlen, "%s=%s", MuttVars[idx].option,
+ option (MuttVars[idx].data) ? "yes" : "no");
+}
+
+static void num_to_string (char* dst, size_t dstlen, int idx) {
+ /* XXX puke */
+ const char* fmt = (idx == mutt_option_index ("umask")) ? "%s=%04o" : "%s=%d";
+ snprintf (dst, dstlen, fmt, MuttVars[idx].option,
+ *((short*) MuttVars[idx].data));
+}
+
+static void str_to_string (char* dst, size_t dstlen, int idx) {
+ snprintf (dst, dstlen, "%s=\"%s\"", MuttVars[idx].option,
+ NONULL (*((char**) MuttVars[idx].data)));
+}
+
+static void quad_to_string (char* dst, size_t dstlen, int idx) {
+ char *vals[] = { "no", "yes", "ask-no", "ask-yes" };
+ snprintf (dst, dstlen, "%s=%s", MuttVars[idx].option,
+ vals[quadoption (MuttVars[idx].data)]);
+}
+
+static void sort_to_string (char* dst, size_t dstlen, int idx) {
+ const struct mapping_t *map = get_sortmap (idx);
+ char* p = NULL;
+
+ if (!map) {
+ snprintf (dst, sizeof (dst), "%s=unknown", MuttVars[idx].option);
+ return;
+ }
+
+ p = mutt_getnamebyvalue (*((short *) MuttVars[idx].data) & SORT_MASK,
+ map);
+
+ snprintf (dst, dstlen, "%s=%s%s%s", MuttVars[idx].option,
+ (*((short *) MuttVars[idx].data) & SORT_REVERSE) ?
+ "reverse-" : "",
+ (*((short *) MuttVars[idx].data) & SORT_LAST) ? "last-" :
+ "", NONULL (p));
+}
+
+static void rx_to_string (char* dst, size_t dstlen, int idx) {
+ rx_t* p = (rx_t*) MuttVars[idx].data;
+ snprintf (dst, dstlen, "%s=\"%s\"", MuttVars[idx].option,
+ NONULL (p->pattern));
+}
+
+static void magic_to_string (char* dst, size_t dstlen, int idx) {
+ const char* s = NULL;
+ switch (MuttVars[idx].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", MuttVars[idx].option, s);
+}
+
+static void syn_to_string (char* dst, size_t dstlen, int idx) {
+ int i = mutt_option_index ((char*) MuttVars[idx].data);
+ FuncTable[MuttVars[i].type].opt_to_string (dst, dstlen, i);
+}
+
+static void addr_to_string (char* dst, size_t dstlen, int idx) {
+ char s[STRING];
+ s[0] = '\0';
+ rfc822_write_address (s, sizeof (s), *((ADDRESS**) MuttVars[idx].data), 0);
+ snprintf (dst, dstlen, "%s=\"%s\"", MuttVars[idx].option, NONULL (s));
+}
+
+int mutt_option_value (const char* val, char* dst, size_t dstlen) {
+ int i = mutt_option_index ((char*) val);
+ char* tmp = NULL, *t = NULL;
+ size_t l = 0;
+
+ if (i < 0) {
+ debug_print (1, ("var '%s' not found, i = %d\n", val, i));
+ *dst = '\0';
+ return (0);
+ }
+ tmp = mem_malloc (dstlen+1);
+ FuncTable[DTYPE (MuttVars[i].type)].opt_to_string (tmp, dstlen, i);
+
+ /* as we get things of type $var=value and don't want to bloat the
+ * above "just" for expansion, we do the stripping here */
+ debug_print (1, ("orig == '%s'\n", tmp));
+ t = strchr (tmp, '=');
+ t++;
+ l = str_len (t);
+ if (l >= 2) {
+ if (t[l-1] == '"' && *t == '"') {
+ t[l-1] = '\0';
+ t++;
+ }
+ }
+ memcpy (dst, t, l+1);
+ mem_free (&tmp);
+ debug_print (1, ("stripped == '%s'\n", dst));
+
+ return (1);
+}
/* for synonym warning reports: adds synonym to end of list */
-static void syn_add (int n, int o) {
- syn_t* tmp = safe_malloc (sizeof (syn_t));
+static void syn_add (struct option_t* n, struct option_t* o) {
+ syn_t* tmp = mem_malloc (sizeof (syn_t));
tmp->f = str_dup (CurRCFile);
tmp->l = CurRCLine;
tmp->n = n;
/* for synonym warning reports: free single item (for list_del()) */
static void syn_del (void** p) {
- FREE(&(*(syn_t**) p)->f);
- FREE(p);
+ mem_free(&(*(syn_t**) p)->f);
+ mem_free(p);
}
void toggle_quadoption (int opt)
/* not reached */
}
-/* given the variable ``s'', return the index into the rc_vars array which
- matches, or -1 if the variable is not found. */
-int mutt_option_index (char *s)
-{
- int i;
-
- for (i = 0; MuttVars[i].option; i++)
- if (str_cmp (s, MuttVars[i].option) == 0) {
- if (MuttVars[i].type == DT_SYN)
- syn_add (mutt_option_index ((char *) MuttVars[i].data), i);
- return (MuttVars[i].type ==
- DT_SYN ? mutt_option_index ((char *) MuttVars[i].data) : i);
- }
- return (-1);
-}
-
-int mutt_extract_token (BUFFER * dest, BUFFER * tok, int flags)
-{
- char ch;
- char qc = 0; /* quote char */
- char *pc;
-
- /* reset the destination pointer to the beginning of the buffer */
- dest->dptr = dest->data;
-
- SKIPWS (tok->dptr);
- while ((ch = *tok->dptr)) {
- if (!qc) {
- if ((ISSPACE (ch) && !(flags & M_TOKEN_SPACE)) ||
- (ch == '#' && !(flags & M_TOKEN_COMMENT)) ||
- (ch == '=' && (flags & M_TOKEN_EQUAL)) ||
- (ch == ';' && !(flags & M_TOKEN_SEMICOLON)) ||
- ((flags & M_TOKEN_PATTERN) && strchr ("~!|", ch)))
- break;
- }
-
- tok->dptr++;
-
- if (ch == qc)
- qc = 0; /* end of quote */
- else if (!qc && (ch == '\'' || ch == '"') && !(flags & M_TOKEN_QUOTE))
- qc = ch;
- else if (ch == '\\' && qc != '\'') {
- if (!*tok->dptr)
- return -1; /* premature end of token */
- switch (ch = *tok->dptr++) {
- case 'c':
- case 'C':
- if (!*tok->dptr)
- return -1; /* premature end of token */
- mutt_buffer_addch (dest, (toupper ((unsigned char) *tok->dptr)
- - '@') & 0x7f);
- tok->dptr++;
- break;
- case 'r':
- mutt_buffer_addch (dest, '\r');
- break;
- case 'n':
- mutt_buffer_addch (dest, '\n');
- break;
- case 't':
- mutt_buffer_addch (dest, '\t');
- break;
- case 'f':
- mutt_buffer_addch (dest, '\f');
- break;
- case 'e':
- mutt_buffer_addch (dest, '\033');
- break;
- default:
- if (isdigit ((unsigned char) ch) &&
- isdigit ((unsigned char) *tok->dptr) &&
- isdigit ((unsigned char) *(tok->dptr + 1))) {
-
- mutt_buffer_addch (dest,
- (ch << 6) + (*tok->dptr << 3) + *(tok->dptr +
- 1) - 3504);
- tok->dptr += 2;
- }
- else
- mutt_buffer_addch (dest, ch);
- }
- }
- else if (ch == '^' && (flags & M_TOKEN_CONDENSE)) {
- if (!*tok->dptr)
- return -1; /* premature end of token */
- ch = *tok->dptr++;
- if (ch == '^')
- mutt_buffer_addch (dest, ch);
- else if (ch == '[')
- mutt_buffer_addch (dest, '\033');
- else if (isalpha ((unsigned char) ch))
- mutt_buffer_addch (dest, toupper ((unsigned char) ch) - '@');
- else {
- mutt_buffer_addch (dest, '^');
- mutt_buffer_addch (dest, ch);
- }
- }
- else if (ch == '`' && (!qc || qc == '"')) {
- FILE *fp;
- pid_t pid;
- char *cmd, *ptr;
- size_t expnlen;
- BUFFER expn;
- int line = 0;
-
- pc = tok->dptr;
- do {
- if ((pc = strpbrk (pc, "\\`"))) {
- /* skip any quoted chars */
- if (*pc == '\\')
- pc += 2;
- }
- } while (pc && *pc != '`');
- if (!pc) {
- debug_print (1, ("mismatched backtics\n"));
- return (-1);
- }
- cmd = str_substrdup (tok->dptr, pc);
- if ((pid = mutt_create_filter (cmd, NULL, &fp, NULL)) < 0) {
- debug_print (1, ("unable to fork command: %s\n", cmd));
- FREE (&cmd);
- return (-1);
- }
- FREE (&cmd);
-
- tok->dptr = pc + 1;
-
- /* read line */
- memset (&expn, 0, sizeof (expn));
- expn.data = mutt_read_line (NULL, &expn.dsize, fp, &line);
- fclose (fp);
- mutt_wait_filter (pid);
-
- /* if we got output, make a new string consiting of the shell ouptput
- plus whatever else was left on the original line */
- /* BUT: If this is inside a quoted string, directly add output to
- * the token */
- if (expn.data && qc) {
- mutt_buffer_addstr (dest, expn.data);
- FREE (&expn.data);
- }
- else if (expn.data) {
- expnlen = str_len (expn.data);
- tok->dsize = expnlen + str_len (tok->dptr) + 1;
- ptr = safe_malloc (tok->dsize);
- memcpy (ptr, expn.data, expnlen);
- strcpy (ptr + expnlen, tok->dptr); /* __STRCPY_CHECKED__ */
- if (tok->destroy)
- FREE (&tok->data);
- tok->data = ptr;
- tok->dptr = ptr;
- tok->destroy = 1; /* mark that the caller should destroy this data */
- ptr = NULL;
- FREE (&expn.data);
- }
- }
- else if (ch == '$' && (!qc || qc == '"')
- && (*tok->dptr == '{' || isalpha ((unsigned char) *tok->dptr))) {
- char *env = NULL, *var = NULL;
-
- if (*tok->dptr == '{') {
- tok->dptr++;
- if ((pc = strchr (tok->dptr, '}'))) {
- var = str_substrdup (tok->dptr, pc);
- tok->dptr = pc + 1;
- }
- }
- else {
- for (pc = tok->dptr; isalnum ((unsigned char) *pc) || *pc == '_';
- pc++);
- var = str_substrdup (tok->dptr, pc);
- tok->dptr = pc;
- }
- if (var && (env = getenv (var)))
- mutt_buffer_addstr (dest, env);
- FREE (&var);
- }
- else
- mutt_buffer_addch (dest, ch);
- }
- mutt_buffer_addch (dest, 0); /* terminate the string */
- SKIPWS (tok->dptr);
- return 0;
-}
-
static void add_to_list (LIST ** list, const char *str)
{
LIST *t, *last = NULL;
}
if (!*list || last) {
- t = (LIST *) safe_calloc (1, sizeof (LIST));
+ t = (LIST *) mem_calloc (1, sizeof (LIST));
t->data = str_dup (str);
if (last) {
last->next = t;
* the template, and leaving t pointed at the current item.
*/
t = last;
- FREE(t->template);
+ mem_free(t->template);
break;
}
if (!last->next)
if (spam->rx && !str_cmp (spam->rx->pattern, pat)) {
*list = spam->next;
rx_free (&spam->rx);
- FREE(&spam->template);
- FREE(&spam);
+ mem_free(&spam->template);
+ mem_free(&spam);
return 1;
}
if (!str_cmp (spam->rx->pattern, pat)) {
prev->next = spam->next;
rx_free (&spam->rx);
- FREE(spam->template);
- FREE(spam);
+ mem_free(spam->template);
+ mem_free(spam);
spam = prev->next;
++nremoved;
}
last = NULL;
while (p) {
if (ascii_strcasecmp (str, p->data) == 0) {
- FREE (&p->data);
+ mem_free (&p->data);
if (last)
last->next = p->next;
else
(*l) = p->next;
- FREE (&p);
+ mem_free (&p);
}
else {
last = p;
{
int i, j, res = 0;
BUFFER token;
+ struct option_t* option = NULL;
memset (&token, 0, sizeof (token));
mutt_extract_token (tmp, s, 0);
/* is the item defined as a variable or a function? */
- if (!(res = (mutt_option_index (tmp->data) != -1)))
+ if ((option = hash_find (ConfigOptions, tmp->data)))
+ res = 1;
+ else {
for (i = 0; !res && i < MENU_MAX; i++) {
struct binding_t *b = km_get_table (Menus[i].value);
break;
}
}
+ }
/* check for feature_* */
if (!res) {
char *p = NULL;
if ((data && res) || (!data && !res)) {
if (mutt_parse_rc_line (tmp->data, &token, err) == -1) {
mutt_error ("Error: %s", err->data);
- FREE (&token.data);
+ mem_free (&token.data);
return (-1);
}
- FREE (&token.data);
+ mem_free (&token.data);
}
return 0;
}
/* Add to the spam list. */
if (add_to_spam_list (&SpamList, buf->data, templ.data, err) != 0) {
- FREE (&templ.data);
+ mem_free (&templ.data);
return -1;
}
- FREE (&templ.data);
+ mem_free (&templ.data);
}
/* If not, try to remove from the nospam list. */
if (!tmp) {
/* create a new alias */
- tmp = (ALIAS *) safe_calloc (1, sizeof (ALIAS));
+ tmp = (ALIAS *) mem_calloc (1, sizeof (ALIAS));
tmp->self = tmp;
tmp->name = str_dup (buf->data);
/* give the main addressbook code a chance */
/* see if there is already a field by this name */
if (ascii_strncasecmp (buf->data, tmp->data, keylen) == 0) {
/* replace the old value */
- FREE (&tmp->data);
+ mem_free (&tmp->data);
tmp->data = buf->data;
memset (buf, 0, sizeof (BUFFER));
return 0;
}
static int
-parse_sort (short *val, const char *s, const struct mapping_t *map,
- BUFFER * err)
-{
+parse_sort (struct option_t* dst, const char *s, const struct mapping_t *map,
+ char* errbuf, size_t errlen) {
int i, flags = 0;
if (str_ncmp ("reverse-", s, 8) == 0) {
}
if ((i = mutt_getvaluebyname (s, map)) == -1) {
- snprintf (err->data, err->dsize, _("%s: unknown sorting method"), s);
+ if (errbuf)
+ snprintf (errbuf, errlen, _("'%s' is invalid for $%s"), s, dst->option);
return (-1);
}
- *val = i | flags;
-
+ *((short*) dst->data) = i | flags;
return 0;
}
-static void mutt_set_default (struct option_t *p)
-{
- switch (p->type & DT_MASK) {
- case DT_STR:
- if (!p->init && *((char **) p->data))
- p->init = (unsigned long) str_dup (*((char **) p->data));
- break;
- case DT_PATH:
- if (!p->init && *((char **) p->data)) {
- char *cp = str_dup (*((char **) p->data));
+/* if additional data more == 1, we want to resolve synonyms */
+static void mutt_set_default (const char* name, void* p, unsigned long more) {
+ char buf[LONG_STRING];
+ struct option_t* ptr = (struct option_t*) p;
- /* mutt_pretty_mailbox (cp); */
- p->init = (unsigned long) cp;
- }
- break;
- case DT_ADDR:
- if (!p->init && *((ADDRESS **) p->data)) {
- char tmp[HUGE_STRING];
+ if (DTYPE (ptr->type) == DT_SYN) {
+ if (!more)
+ return;
+ ptr = hash_find (ConfigOptions, (char*) ptr->data);
+ }
+ if (!ptr || *ptr->init)
+ return;
+ mutt_option_value (ptr->option, buf, sizeof (buf));
+ if (str_len (ptr->init) == 0 && buf && *buf)
+ ptr->init = str_dup (buf);
+}
- *tmp = '\0';
- rfc822_write_address (tmp, sizeof (tmp), *((ADDRESS **) p->data), 0);
- p->init = (unsigned long) str_dup (tmp);
- }
- break;
- case DT_RX:
- {
- rx_t* pp = (rx_t*) p->data;
+/* if additional data more == 1, we want to resolve synonyms */
+static void mutt_restore_default (const char* name, void* p, unsigned long more) {
+ char errbuf[STRING];
+ struct option_t* ptr = (struct option_t*) p;
+
+ 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_from_string (ptr, ptr->init, errbuf,
+ sizeof (errbuf)) < 0) {
+ mutt_endwin (NULL);
+ fprintf (stderr, _("Invalid default setting found. Please report this "
+ "error:\n\"%s\"\n"), errbuf);
+ exit (1);
+ }
- if (!p->init && pp->pattern)
- p->init = (unsigned long) str_dup (pp->pattern);
+ 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);
+}
+
+/* check whether value for $dsn_return would be valid */
+static int check_dsn_return (const char* option, unsigned long p,
+ char* errbuf, size_t errlen) {
+ char* val = (char*) p;
+ if (val && *val && str_ncmp (val, "hdrs", 4) != 0 &&
+ str_ncmp (val, "full", 4) != 0) {
+ if (errbuf)
+ snprintf (errbuf, errlen, _("'%s' is invalid for $%s"), val, "dsn_return");
+ return (0);
+ }
+ return (1);
+}
+
+/* check whether value for $dsn_notify would be valid */
+static int check_dsn_notify (const char* option, unsigned long p,
+ char* errbuf, size_t errlen) {
+ list2_t* list = NULL;
+ int i = 0, rc = 1;
+ char* val = (char*) p;
+
+ if (!val || !*val)
+ return (1);
+ list = list_from_str (val, ",");
+ if (list_empty (list))
+ return (1);
+
+ for (i = 0; i < list->length; i++)
+ if (str_ncmp (list->data[i], "never", 5) != 0 &&
+ str_ncmp (list->data[i], "failure", 7) != 0 &&
+ str_ncmp (list->data[i], "delay", 5) != 0 &&
+ str_ncmp (list->data[i], "success", 7) != 0) {
+ if (errbuf)
+ snprintf (errbuf, errlen, _("'%s' is invalid for $%s"),
+ (char*) list->data[i], "dsn_notify");
+ rc = 0;
break;
}
+ list_del (&list, (list_del_t*) _mem_free);
+ return (rc);
+}
+
+static int check_num (const char* option, unsigned long p,
+ char* errbuf, size_t errlen) {
+ if ((int) p < 0) {
+ if (errbuf)
+ snprintf (errbuf, errlen, _("'%d' is invalid for $%s"), (int) p, option);
+ return (0);
}
+ return (1);
}
-static void mutt_restore_default (struct option_t *p)
-{
- switch (p->type & DT_MASK) {
- case DT_STR:
- if (p->init)
- str_replace ((char **) p->data, (char *) p->init);
- break;
- case DT_PATH:
- if (p->init) {
- char path[_POSIX_PATH_MAX];
+static int check_history (const char* option, unsigned long p,
+ char* errbuf, size_t errlen) {
+ if (!check_num ("history", p, errbuf, errlen))
+ return (0);
+ mutt_init_history ();
+ return (1);
+}
- strfcpy (path, (char *) p->init, sizeof (path));
- mutt_expand_path (path, sizeof (path));
- str_replace ((char **) p->data, path);
- }
- break;
- case DT_ADDR:
- if (p->init) {
- rfc822_free_address ((ADDRESS **) p->data);
- *((ADDRESS **) p->data) = rfc822_parse_adrlist (NULL, (char *) p->init);
+static int check_special (const char* name, unsigned long val,
+ char* errbuf, size_t errlen) {
+ int i = 0;
+
+ for (i = 0; SpecialVars[i].name; i++) {
+ if (str_cmp (SpecialVars[i].name, name) == 0) {
+ return (SpecialVars[i].check (SpecialVars[i].name,
+ val, errbuf, errlen));
}
+ }
+ return (1);
+}
+
+static const struct mapping_t* get_sortmap (struct option_t* option) {
+ const struct mapping_t* map = NULL;
+
+ switch (option->type & DT_SUBTYPE_MASK) {
+ case DT_SORT_ALIAS:
+ map = SortAliasMethods;
break;
- case DT_BOOL:
- if (p->init)
- set_option (p->data);
- else
- unset_option (p->data);
+ case DT_SORT_BROWSER:
+ map = SortBrowserMethods;
break;
- case DT_QUAD:
- set_quadoption (p->data, p->init);
+ case DT_SORT_KEYS:
+ if ((WithCrypto & APPLICATION_PGP))
+ map = SortKeyMethods;
break;
- case DT_NUM:
- case DT_SORT:
- case DT_MAGIC:
- *((short *) p->data) = p->init;
+ case DT_SORT_AUX:
+ map = SortAuxMethods;
break;
- case DT_RX:
- {
- rx_t *pp = (rx_t *) p->data;
- int flags = 0;
-
- FREE (&pp->pattern);
- if (pp->rx) {
- regfree (pp->rx);
- FREE (&pp->rx);
- }
-
- if (p->init) {
- char *s = (char *) p->init;
-
- pp->rx = safe_calloc (1, sizeof (regex_t));
- if (str_cmp (p->option, "mask") != 0)
- flags |= mutt_which_case ((const char *) p->init);
- if (str_cmp (p->option, "mask") == 0 && *s == '!') {
- s++;
- pp->not = 1;
- }
- if (REGCOMP (pp->rx, s, flags) != 0) {
- fprintf (stderr,
- _("mutt_restore_default(%s): error in regexp: %s\n"),
- p->option, pp->pattern);
- FREE (&pp->pattern);
- regfree (pp->rx);
- FREE (&pp->rx);
- }
- else
- str_replace (&pp->pattern, (char *) p->init);
- }
- }
+ default:
+ map = SortMethods;
break;
}
+ return (map);
+}
- if (p->flags & R_INDEX)
- set_option (OPTFORCEREDRAWINDEX);
- if (p->flags & R_PAGER)
- set_option (OPTFORCEREDRAWPAGER);
- if (p->flags & R_RESORT_SUB)
- set_option (OPTSORTSUBTHREADS);
- if (p->flags & R_RESORT)
- set_option (OPTNEEDRESORT);
- if (p->flags & R_RESORT_INIT)
- set_option (OPTRESORTINIT);
- if (p->flags & R_TREE)
- set_option (OPTREDRAWTREE);
+/* creates new option_t* of type DT_USER for $user_ var */
+static struct option_t* add_user_option (const char* name) {
+ struct option_t* option = mem_calloc (1, sizeof (struct option_t));
+ option->option = str_dup (name);
+ option->type = DT_USER;
+ return (option);
}
static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
BUFFER * err)
{
- int idx, query, unset, inv, reset, r = 0;
- char *p, scratch[_POSIX_PATH_MAX];
+ int query, unset, inv, reset, r = 0;
+ struct option_t* option = NULL;
while (MoreArgs (s)) {
/* reset state variables */
/* get the variable name */
mutt_extract_token (tmp, s, M_TOKEN_EQUAL);
- if ((idx = mutt_option_index (tmp->data)) == -1 &&
- !(reset && !str_cmp ("all", tmp->data))) {
+ /* 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_add (newopt, option);
+ option = newopt;
+ }
+
+ /* see if we need to add $user_ var */
+ if (!option && !reset && !unset &&
+ ascii_strncasecmp ("user_", tmp->data, 5) == 0) {
+ debug_print (1, ("adding user option '%s'\n", tmp->data));
+ option = add_user_option (tmp->data);
+ hash_insert (ConfigOptions, option->option, option, 0);
+ }
+
+ if (!option && !(reset && str_cmp ("all", tmp->data) == 0)) {
snprintf (err->data, err->dsize, _("%s: unknown variable"), tmp->data);
return (-1);
}
}
if (!str_cmp ("all", tmp->data)) {
- for (idx = 0; MuttVars[idx].option; idx++)
- mutt_restore_default (&MuttVars[idx]);
- return 0;
+ hash_map (ConfigOptions, mutt_restore_default, 1);
+ return (0);
}
else
- mutt_restore_default (&MuttVars[idx]);
+ mutt_restore_default (NULL, option, 1);
}
- else if (DTYPE (MuttVars[idx].type) == DT_BOOL) {
+ else if (DTYPE (option->type) == DT_BOOL) {
+ /* XXX this currently ignores the function table
+ * as we don't get invert and stuff into it */
if (s && *s->dptr == '=') {
if (unset || inv || query) {
snprintf (err->data, err->dsize, "Usage: set variable=yes|no");
}
if (query) {
- snprintf (err->data, err->dsize, option (MuttVars[idx].data)
- ? _("%s is set") : _("%s is unset"), tmp->data);
+ bool_to_string (err->data, err->dsize, option);
return 0;
}
if (unset)
- unset_option (MuttVars[idx].data);
+ unset_option (option->data);
else if (inv)
- toggle_option (MuttVars[idx].data);
+ toggle_option (option->data);
else
- set_option (MuttVars[idx].data);
- }
- else if (DTYPE (MuttVars[idx].type) == DT_STR ||
- DTYPE (MuttVars[idx].type) == DT_PATH ||
- DTYPE (MuttVars[idx].type) == DT_ADDR) {
- if (unset) {
- if (DTYPE (MuttVars[idx].type) == DT_ADDR)
- rfc822_free_address ((ADDRESS **) MuttVars[idx].data);
- else
- FREE ((void *) MuttVars[idx].data);
- }
- else if (query || *s->dptr != '=') {
- char _tmp[STRING];
- char *val = NULL;
-
- if (DTYPE (MuttVars[idx].type) == DT_ADDR) {
- _tmp[0] = '\0';
- rfc822_write_address (_tmp, sizeof (_tmp),
- *((ADDRESS **) MuttVars[idx].data), 0);
- val = _tmp;
- }
- else
- val = *((char **) MuttVars[idx].data);
-
- /* user requested the value of this variable */
- snprintf (err->data, err->dsize, "%s=\"%s\"", MuttVars[idx].option,
- NONULL (val));
- break;
- }
- else {
- s->dptr++;
-
- /* copy the value of the string */
- if (DTYPE (MuttVars[idx].type) == DT_ADDR)
- rfc822_free_address ((ADDRESS **) MuttVars[idx].data);
- else
- FREE ((void *) MuttVars[idx].data);
-
- mutt_extract_token (tmp, s, 0);
- if (DTYPE (MuttVars[idx].type) == DT_PATH) {
- strfcpy (scratch, tmp->data, sizeof (scratch));
- mutt_expand_path (scratch, sizeof (scratch));
- *((char **) MuttVars[idx].data) = str_dup (scratch);
- }
- else if (DTYPE (MuttVars[idx].type) == DT_STR) {
- *((char **) MuttVars[idx].data) = str_dup (tmp->data);
- if (str_cmp (MuttVars[idx].option, "charset") == 0)
- mutt_set_charset (Charset);
- }
- else {
- *((ADDRESS **) MuttVars[idx].data) =
- rfc822_parse_adrlist (NULL, tmp->data);
- }
- }
- }
- else if (DTYPE (MuttVars[idx].type) == DT_RX) {
- rx_t *ptr = (rx_t *) MuttVars[idx].data;
- regex_t *rx;
- int e, flags = 0;
-
- if (query || *s->dptr != '=') {
- /* user requested the value of this variable */
- snprintf (err->data, err->dsize, "%s=\"%s\"", MuttVars[idx].option,
- NONULL (ptr->pattern));
- break;
- }
-
- if (option (OPTATTACHMSG)
- && !str_cmp (MuttVars[idx].option, "reply_regexp")) {
- snprintf (err->data, err->dsize,
- "Operation not permitted when in attach-message mode.");
- r = -1;
- break;
- }
-
- s->dptr++;
-
- /* copy the value of the string */
- mutt_extract_token (tmp, s, 0);
-
- if (!ptr->pattern || str_cmp (ptr->pattern, tmp->data) != 0) {
- int not = 0;
-
- /* $mask is case-sensitive */
- if (str_cmp (MuttVars[idx].option, "mask") != 0)
- flags |= mutt_which_case (tmp->data);
-
- p = tmp->data;
- if (str_cmp (MuttVars[idx].option, "mask") == 0) {
- if (*p == '!') {
- not = 1;
- p++;
- }
- }
-
- rx = (regex_t *) safe_malloc (sizeof (regex_t));
- if ((e = REGCOMP (rx, p, flags)) != 0) {
- regerror (e, rx, err->data, err->dsize);
- regfree (rx);
- FREE (&rx);
+ set_option (option->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 ||
+ DTYPE (option->type) == DT_USER) {
+
+ /* 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 ||
+ DTYPE (option->type) == DT_USER) {
+ if (unset) {
+ if (DTYPE (option->type) == DT_ADDR)
+ rfc822_free_address ((ADDRESS **) option->data);
+ else if (DTYPE (option->type == DT_USER)) {
+ void* p = (void*) option->data;
+ mem_free (&p);
+ } else
+ mem_free ((void *) option->data);
break;
}
-
- /* get here only if everything went smootly */
- if (ptr->pattern) {
- FREE (&ptr->pattern);
- regfree ((regex_t *) ptr->rx);
- FREE (&ptr->rx);
- }
-
- ptr->pattern = str_dup (tmp->data);
- ptr->rx = rx;
- ptr->not = not;
-
- /* $reply_regexp and $alterantes require special treatment */
-
- if (Context && Context->msgcount &&
- str_cmp (MuttVars[idx].option, "reply_regexp") == 0) {
- regmatch_t pmatch[1];
- int i;
-
-#define CUR_ENV Context->hdrs[i]->env
- for (i = 0; i < Context->msgcount; i++) {
- if (CUR_ENV && CUR_ENV->subject) {
- CUR_ENV->real_subj = (regexec (ReplyRegexp.rx,
- CUR_ENV->subject, 1, pmatch,
- 0)) ? CUR_ENV->
- subject : CUR_ENV->subject + pmatch[0].rm_eo;
- }
- }
-#undef CUR_ENV
- }
- }
- }
- else if (DTYPE (MuttVars[idx].type) == DT_MAGIC) {
- if (query || *s->dptr != '=') {
- 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";
- break;
- }
- snprintf (err->data, err->dsize, "%s=%s", MuttVars[idx].option, p);
- break;
- }
-
- s->dptr++;
-
- /* copy the value of the string */
- mutt_extract_token (tmp, s, 0);
- if (mx_set_magic (tmp->data)) {
- snprintf (err->data, err->dsize, _("%s: invalid mailbox type"),
- tmp->data);
- r = -1;
- break;
}
- }
- else if (DTYPE (MuttVars[idx].type) == DT_NUM) {
- short *ptr = (short *) MuttVars[idx].data;
- int val;
- char *t;
if (query || *s->dptr != '=') {
- /* user requested the value of this variable */
- snprintf (err->data, err->dsize, "%s=%d", MuttVars[idx].option, *ptr);
+ FuncTable[DTYPE (option->type)].opt_to_string
+ (err->data, err->dsize, option);
break;
}
s->dptr++;
-
mutt_extract_token (tmp, s, 0);
- val = strtol (tmp->data, &t, 0);
-
- if (!*tmp->data || *t || (short) val != val) {
- snprintf (err->data, err->dsize, _("%s: invalid value"), tmp->data);
+ if (!FuncTable[DTYPE (option->type)].opt_from_string
+ (option, tmp->data, err->data, err->dsize))
r = -1;
- break;
- }
- else
- *ptr = (short) val;
-
- /* these ones need a sanity check */
- if (str_cmp (MuttVars[idx].option, "history") == 0) {
- if (*ptr < 0)
- *ptr = 0;
- mutt_init_history ();
- }
- else if (str_cmp (MuttVars[idx].option, "pager_index_lines") == 0) {
- if (*ptr < 0)
- *ptr = 0;
- }
}
- else if (DTYPE (MuttVars[idx].type) == DT_QUAD) {
- if (query) {
- char *vals[] = { "no", "yes", "ask-no", "ask-yes" };
+ else if (DTYPE (option->type) == DT_QUAD) {
- snprintf (err->data, err->dsize, "%s=%s", MuttVars[idx].option,
- vals[quadoption (MuttVars[idx].data)]);
+ if (query) {
+ quad_to_string (err->data, err->dsize, option);
break;
}
s->dptr++;
mutt_extract_token (tmp, s, 0);
if (ascii_strcasecmp ("yes", tmp->data) == 0)
- set_quadoption (MuttVars[idx].data, M_YES);
+ set_quadoption (option->data, M_YES);
else if (ascii_strcasecmp ("no", tmp->data) == 0)
- set_quadoption (MuttVars[idx].data, M_NO);
+ set_quadoption (option->data, M_NO);
else if (ascii_strcasecmp ("ask-yes", tmp->data) == 0)
- set_quadoption (MuttVars[idx].data, M_ASKYES);
+ set_quadoption (option->data, M_ASKYES);
else if (ascii_strcasecmp ("ask-no", tmp->data) == 0)
- set_quadoption (MuttVars[idx].data, M_ASKNO);
+ set_quadoption (option->data, M_ASKNO);
else {
- snprintf (err->data, err->dsize, _("%s: invalid value"), tmp->data);
+ snprintf (err->data, err->dsize, _("'%s' is invalid for $%s\n"),
+ tmp->data, option->option);
r = -1;
break;
}
}
else {
if (inv)
- toggle_quadoption (MuttVars[idx].data);
+ toggle_quadoption (option->data);
else if (unset)
- set_quadoption (MuttVars[idx].data, M_NO);
+ set_quadoption (option->data, M_NO);
else
- set_quadoption (MuttVars[idx].data, M_YES);
- }
- }
- else if (DTYPE (MuttVars[idx].type) == DT_SORT) {
- const struct mapping_t *map = NULL;
-
- switch (MuttVars[idx].type & DT_SUBTYPE_MASK) {
- case DT_SORT_ALIAS:
- map = SortAliasMethods;
- break;
- case DT_SORT_BROWSER:
- map = SortBrowserMethods;
- break;
- case DT_SORT_KEYS:
- if ((WithCrypto & APPLICATION_PGP))
- map = SortKeyMethods;
- break;
- case DT_SORT_AUX:
- map = SortAuxMethods;
- break;
- default:
- map = SortMethods;
- break;
- }
-
- if (!map) {
- snprintf (err->data, err->dsize, _("%s: Unknown type."),
- MuttVars[idx].option);
- r = -1;
- break;
- }
-
- if (query || *s->dptr != '=') {
- p =
- mutt_getnamebyvalue (*((short *) MuttVars[idx].data) & SORT_MASK,
- map);
-
- snprintf (err->data, err->dsize, "%s=%s%s%s", MuttVars[idx].option,
- (*((short *) MuttVars[idx].data) & SORT_REVERSE) ?
- "reverse-" : "",
- (*((short *) MuttVars[idx].data) & SORT_LAST) ? "last-" :
- "", p);
- return 0;
- }
- s->dptr++;
- mutt_extract_token (tmp, s, 0);
-
- if (parse_sort ((short *) MuttVars[idx].data, tmp->data, map, err) ==
- -1) {
- r = -1;
- break;
+ set_quadoption (option->data, M_YES);
}
}
else {
snprintf (err->data, err->dsize, _("%s: unknown type"),
- MuttVars[idx].option);
+ option->option);
r = -1;
break;
}
- if (MuttVars[idx].flags & R_INDEX)
+ if (option->flags & R_INDEX)
set_option (OPTFORCEREDRAWINDEX);
- if (MuttVars[idx].flags & R_PAGER)
+ if (option->flags & R_PAGER)
set_option (OPTFORCEREDRAWPAGER);
- if (MuttVars[idx].flags & R_RESORT_SUB)
+ if (option->flags & R_RESORT_SUB)
set_option (OPTSORTSUBTHREADS);
- if (MuttVars[idx].flags & R_RESORT)
+ if (option->flags & R_RESORT)
set_option (OPTNEEDRESORT);
- if (MuttVars[idx].flags & R_RESORT_INIT)
+ if (option->flags & R_RESORT_INIT)
set_option (OPTRESORTINIT);
- if (MuttVars[idx].flags & R_TREE)
+ if (option->flags & R_TREE)
set_option (OPTREDRAWTREE);
}
return (r);
pid_t pid;
debug_print (2, ("reading configuration file '%s'.\n", rcfile));
- str_replace (&CurRCFile, rcfile);
- CurRCLine = 0;
if ((f = mutt_open_read (rcfile, &pid)) == NULL) {
snprintf (err->data, err->dsize, "%s: %s", rcfile, strerror (errno));
memset (&token, 0, sizeof (token));
while ((linebuf = mutt_read_line (linebuf, &buflen, f, &line)) != NULL) {
- CurRCLine++;
conv = ConfigCharset && (*ConfigCharset) && Charset;
if (conv) {
currentline = str_dup (linebuf);
else
currentline = linebuf;
+ CurRCLine = line;
+ CurRCFile = rcfile;
+
if (mutt_parse_rc_line (currentline, &token, err) == -1) {
mutt_error (_("Error in %s, line %d: %s"), rcfile, line, err->data);
if (--rc < -MAXERRS) {
if (conv)
- FREE (¤tline);
+ mem_free (¤tline);
break;
}
}
rc = -1;
}
if (conv)
- FREE (¤tline);
+ mem_free (¤tline);
}
- FREE (&token.data);
- FREE (&linebuf);
+ mem_free (&token.data);
+ mem_free (&linebuf);
fclose (f);
if (pid != -1)
mutt_wait_filter (pid);
r = 0;
finish:
if (expn.destroy)
- FREE (&expn.data);
+ mem_free (&expn.data);
return (r);
}
{
char var[STRING], *pt = buffer;
int spaces;
+ struct option_t* option = NULL;
if (buffer[0] == 0)
return 0;
return 0;
if (str_ncmp (buffer, "set", 3) == 0) {
- int idx;
-
strfcpy (var, pt, sizeof (var));
/* ignore the trailing '=' when comparing */
var[str_len (var) - 1] = 0;
- if ((idx = mutt_option_index (var)) == -1)
+ if (!(option = hash_find (ConfigOptions, var)))
return 0; /* no such variable. */
else {
char tmp[LONG_STRING], tmp2[LONG_STRING];
tmp[0] = '\0';
- if ((DTYPE (MuttVars[idx].type) == DT_STR) ||
- (DTYPE (MuttVars[idx].type) == DT_PATH) ||
- (DTYPE (MuttVars[idx].type) == DT_RX)) {
- strfcpy (tmp, NONULL (*((char **) MuttVars[idx].data)), sizeof (tmp));
- if (DTYPE (MuttVars[idx].type) == DT_PATH)
+ if ((DTYPE (option->type) == DT_STR) ||
+ (DTYPE (option->type) == DT_PATH) ||
+ (DTYPE (option->type) == DT_RX)) {
+ strfcpy (tmp, NONULL (*((char **) option->data)), sizeof (tmp));
+ if (DTYPE (option->type) == DT_PATH)
mutt_pretty_mailbox (tmp);
}
- else if (DTYPE (MuttVars[idx].type) == DT_ADDR) {
+ else if (DTYPE (option->type) == DT_ADDR) {
rfc822_write_address (tmp, sizeof (tmp),
- *((ADDRESS **) MuttVars[idx].data), 0);
+ *((ADDRESS **) option->data), 0);
}
- else if (DTYPE (MuttVars[idx].type) == DT_QUAD)
- strfcpy (tmp, vals[quadoption (MuttVars[idx].data)], sizeof (tmp));
- else if (DTYPE (MuttVars[idx].type) == DT_NUM)
- snprintf (tmp, sizeof (tmp), "%d", (*((short *) MuttVars[idx].data)));
- else if (DTYPE (MuttVars[idx].type) == DT_SORT) {
+ else if (DTYPE (option->type) == DT_QUAD)
+ strfcpy (tmp, vals[quadoption (option->data)], sizeof (tmp));
+ else if (DTYPE (option->type) == DT_NUM)
+ snprintf (tmp, sizeof (tmp), "%d", (*((short *) option->data)));
+ else if (DTYPE (option->type) == DT_SORT) {
const struct mapping_t *map;
char *p;
- switch (MuttVars[idx].type & DT_SUBTYPE_MASK) {
+ switch (option->type & DT_SUBTYPE_MASK) {
case DT_SORT_ALIAS:
map = SortAliasMethods;
break;
break;
}
p =
- mutt_getnamebyvalue (*((short *) MuttVars[idx].data) & SORT_MASK,
+ mutt_getnamebyvalue (*((short *) option->data) & SORT_MASK,
map);
snprintf (tmp, sizeof (tmp), "%s%s%s",
- (*((short *) MuttVars[idx].data) & SORT_REVERSE) ?
+ (*((short *) option->data) & SORT_REVERSE) ?
"reverse-" : "",
- (*((short *) MuttVars[idx].data) & SORT_LAST) ? "last-" :
+ (*((short *) option->data) & SORT_LAST) ? "last-" :
"", p);
}
- else if (DTYPE (MuttVars[idx].type) == DT_MAGIC) {
+ else if (DTYPE (option->type) == DT_MAGIC) {
char *p;
switch (DefaultMagic) {
case M_MBOX:
}
strfcpy (tmp, p, sizeof (tmp));
}
- else if (DTYPE (MuttVars[idx].type) == DT_BOOL)
- strfcpy (tmp, option (MuttVars[idx].data) ? "yes" : "no",
+ else if (DTYPE (option->type) == DT_BOOL)
+ strfcpy (tmp, option (option->data) ? "yes" : "no",
sizeof (tmp));
else
return 0;
snprintf (command, sizeof (command), "set ?%s\n", p->data);
if (mutt_parse_rc_line (command, &token, &err) == -1) {
fprintf (stderr, "%s\n", err.data);
- FREE (&token.data);
+ mem_free (&token.data);
return 1;
}
printf ("%s\n", err.data);
}
- FREE (&token.data);
+ mem_free (&token.data);
return 0;
}
for (; p; p = p->next) {
if (mutt_parse_rc_line (p->data, &token, &err) != 0) {
fprintf (stderr, _("Error in command line: %s\n"), err.data);
- FREE (&token.data);
+ mem_free (&token.data);
return (-1);
}
}
- FREE (&token.data);
+ mem_free (&token.data);
return 0;
}
err.data = error;
err.dsize = sizeof (error);
+ /* use 3*sizeof(muttvars) to have some room for $user_ vars */
+ ConfigOptions = hash_create (sizeof (MuttVars) * 3);
+ for (i = 0; MuttVars[i].option; i++)
+ hash_insert (ConfigOptions, MuttVars[i].option, &MuttVars[i], 0);
+
/*
* XXX - use something even more difficult to predict?
*/
else
#endif /* DOMAIN */
if (*DOMAIN != '@') {
- Fqdn = safe_malloc (str_len (DOMAIN) + str_len (Hostname) + 2);
+ Fqdn = mem_malloc (str_len (DOMAIN) + str_len (Hostname) + 2);
sprintf (Fqdn, "%s.%s", NONULL (Hostname), DOMAIN); /* __SPRINTF_CHECKED__ */
}
else
memset (&token, 0, sizeof (token));
parse_my_hdr (&token, &buf, 0, &err);
- FREE (&token.data);
+ mem_free (&token.data);
}
if ((p = getenv ("EMAIL")) != NULL)
/* Set standard defaults */
- for (i = 0; MuttVars[i].option; i++) {
- mutt_set_default (&MuttVars[i]);
- mutt_restore_default (&MuttVars[i]);
- }
+ hash_map (ConfigOptions, mutt_set_default, 0);
+ hash_map (ConfigOptions, mutt_restore_default, 0);
CurrentMenu = MENU_MAIN;
if (!Muttrc) {
+#if 0
snprintf (buffer, sizeof (buffer), "%s/.muttngrc-%s", NONULL (Homedir),
MUTT_VERSION);
if (access (buffer, F_OK) == -1)
+#endif
snprintf (buffer, sizeof (buffer), "%s/.muttngrc", NONULL (Homedir));
if (access (buffer, F_OK) == -1)
+#if 0
snprintf (buffer, sizeof (buffer), "%s/.muttng/muttngrc-%s",
NONULL (Homedir), MUTT_VERSION);
if (access (buffer, F_OK) == -1)
+#endif
snprintf (buffer, sizeof (buffer), "%s/.muttng/muttngrc",
NONULL (Homedir));
}
else {
strfcpy (buffer, Muttrc, sizeof (buffer));
- FREE (&Muttrc);
+ mem_free (&Muttrc);
mutt_expand_path (buffer, sizeof (buffer));
Muttrc = str_dup (buffer);
}
- FREE (&AliasFile);
+ mem_free (&AliasFile);
AliasFile = str_dup (NONULL (Muttrc));
/* Process the global rc file if it exists and the user hasn't explicity
if (!list_empty(Synonyms)) {
int i = 0;
fprintf (stderr, _("Warning: the following synonym variables were found:\n"));
- for (i = 0; i < Synonyms->length; i++)
+ 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",
- MuttVars[((syn_t*) Synonyms->data[i])->o].option,
- MuttVars[((syn_t*) Synonyms->data[i])->n].option,
+ oldopt ? NONULL (oldopt->option) : "",
+ newopt ? NONULL (newopt->option) : "",
NONULL(((syn_t*) Synonyms->data[i])->f),
((syn_t*) Synonyms->data[i])->l);
- fprintf (stderr, _("Warning: Synonym variables are scheduled for removal.\n"));
+ }
+ fprintf (stderr, _("Warning: synonym variables are scheduled"
+ " for removal.\n"));
list_del (&Synonyms, syn_del);
need_pause = 1;
}
- /* this is not needed during runtime */
- FREE(&CurRCFile);
if (need_pause && !option (OPTNOCURSES)) {
if (mutt_any_key_to_continue (NULL) == -1)
return 0;
}
+/* compare two option_t*'s for sorting -t/-T output */
static int opt_cmp (const void* a, const void* b) {
return (str_cmp ((*(struct option_t**) a)->option,
(*(struct option_t**) b)->option));
}
-/* dump out the value of all the variables we have */
-int mutt_dump_variables (void) {
- int i;
+/* callback for hash_map() to put all non-synonym vars into list */
+static void opt_sel_full (const char* key, void* data,
+ unsigned long more) {
+ list2_t** l = (list2_t**) more;
+ struct option_t* option = (struct option_t*) data;
- char errbuff[STRING];
- char command[STRING];
- list2_t* tmp = NULL;
+ if (DTYPE (option->type) == DT_SYN)
+ return;
+ list_push_back (l, option);
+}
- BUFFER err, token;
+/* callback for hash_map() to put all changed non-synonym vars into list */
+static void opt_sel_diff (const char* key, void* data,
+ unsigned long more) {
+ list2_t** l = (list2_t**) more;
+ struct option_t* option = (struct option_t*) data;
+ char buf[LONG_STRING];
- memset (&err, 0, sizeof (err));
- memset (&token, 0, sizeof (token));
+ if (DTYPE (option->type) == DT_SYN)
+ return;
- err.data = errbuff;
- err.dsize = sizeof (errbuff);
+ mutt_option_value (option->option, buf, sizeof (buf));
+ if (str_cmp (buf, option->init) != 0)
+ list_push_back (l, option);
+}
+
+/* dump out the value of all the variables we have */
+int mutt_dump_variables (int full) {
+ int i = 0;
+ char outbuf[STRING];
+ list2_t* tmp = NULL;
+ struct option_t* option = NULL;
/* get all non-synonyms into list... */
- for (i = 0; MuttVars[i].option; i++) {
- if (MuttVars[i].type == DT_SYN)
- continue;
- list_push_back (&tmp, &MuttVars[i]);
- }
+ 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++) {
- snprintf (command, sizeof (command), "set ?%s\n",
- ((struct option_t*) tmp->data[i])->option);
- if (mutt_parse_rc_line (command, &token, &err) == -1) {
- fprintf (stderr, "%s\n", err.data);
- FREE (&token.data);
- list_del (&tmp, NULL);
- return 1;
- }
- printf("%s\n", err.data);
+ option = (struct option_t*) tmp->data[i];
+ FuncTable[DTYPE (option->type)].opt_to_string
+ (outbuf, sizeof (outbuf), option);
+ printf ("%s\n", outbuf);
}
}
- FREE (&token.data);
list_del (&tmp, NULL);
return 0;
}