/* this checks that numbers are >= 0 */
static int check_num (const char* option, unsigned long val,
char* errbuf, size_t errlen);
+#ifdef DEBUG
+static int check_debug (const char* option, unsigned long val,
+ char* errbuf, size_t errlen);
+#endif
/* use this to check only */
static int check_special (const char* option, unsigned long val,
#endif
{ "history", check_history },
{ "pager_index_lines", check_num },
+#ifdef DEBUG
+ { "debug_level", check_debug },
+#endif
/* last */
{ NULL, NULL }
};
static void magic_to_string (char* dst, size_t dstlen, struct option_t* option);
static void addr_to_string (char* dst, size_t dstlen, struct option_t* option);
static void user_to_string (char* dst, size_t dstlen, struct option_t* option);
+static void sys_to_string (char* dst, size_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,
{ DT_SYN, NULL, NULL },
{ DT_ADDR, addr_to_string, addr_from_string },
{ DT_USER, user_to_string, user_from_string },
+ { DT_SYS, sys_to_string, NULL },
};
static void bool_to_string (char* dst, size_t dstlen,
set_option (dst->data);
else
unset_option (dst->data);
- return (0);
+ return (1);
}
static void num_to_string (char* dst, size_t dstlen,
NONULL (((char*) option->data)));
}
+static void sys_to_string (char* dst, size_t dstlen,
+ struct option_t* option) {
+ char* val = NULL, *t = NULL;
+ int clean = 0;
+
+ /* get some $muttng_ values dynamically */
+ if (ascii_strcmp ("muttng_pwd", option->option) == 0) {
+ val = mem_malloc (_POSIX_PATH_MAX);
+ val = getcwd (val, _POSIX_PATH_MAX-1);
+ clean = 1;
+ } else if (ascii_strcmp ("muttng_folder_path", option->option) == 0 &&
+ CurrentFolder && *CurrentFolder) {
+ val = CurrentFolder;
+ } else if (ascii_strcmp ("muttng_folder_name", option->option) == 0 &&
+ CurrentFolder && *CurrentFolder) {
+ if ((t = strrchr (CurrentFolder, '/')) != NULL)
+ val = t+1;
+ else
+ val = CurrentFolder;
+ } else
+ val = option->init;
+
+ snprintf (dst, dstlen, "%s=\"%s\"", option->option, NONULL (val));
+ if (clean)
+ mem_free (&val);
+}
+
static int path_from_string (struct option_t* dst, const char* val,
char* errbuf, size_t errlen) {
char path[_POSIX_PATH_MAX];
static int user_from_string (struct option_t* dst, const char* val,
char* errbuf, size_t errlen) {
+ /* if dst == NULL, we may get here in case the user did unset it,
+ * see parse_set() where item is free()'d before coming here; so
+ * just silently ignore it */
if (!dst)
- return (0);
+ return (1);
if (str_len ((char*) dst->data) == 0)
dst->data = (unsigned long) str_dup (val);
else {
char* s = (char*) dst->data;
str_replace (&s, val);
}
+ if (str_len (dst->init) == 0)
+ dst->init = str_dup ((char*) dst->data);
return (1);
}
regerror (e, rx, errbuf, errlen);
regfree (rx);
mem_free (&rx);
+ return (0);
}
- if (p->pattern) {
+ if (p->rx) {
regfree (p->rx);
mem_free (&p->rx);
}
static void addr_to_string (char* dst, size_t dstlen,
struct option_t* option) {
- char s[STRING];
+ char s[HUGE_STRING];
s[0] = '\0';
rfc822_write_address (s, sizeof (s), *((ADDRESS**) 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, size_t errlen) {
- if (!dst || !val || !*val)
+ if (!dst)
return (0);
rfc822_free_address ((ADDRESS**) dst->data);
- *((ADDRESS**) dst->data) = rfc822_parse_adrlist (NULL, val);
+ if (val && *val)
+ *((ADDRESS**) dst->data) = rfc822_parse_adrlist (NULL, val);
return (1);
}
mutt_extract_token (tmp, s, 0);
/* is the item defined as a variable or a function? */
- if ((option = hash_find (ConfigOptions, tmp->data)))
+ if ((option = hash_find (ConfigOptions, tmp->data)) != NULL)
res = 1;
else {
for (i = 0; !res && i < MENU_MAX; i++) {
}
}
/* check for feature_* */
- if (!res) {
- char *p = NULL;
-
+ if (!res && ascii_strncasecmp (tmp->data, "feature_", 8) == 0 &&
+ (j = str_len (tmp->data)) > 8) {
i = 0;
- j = str_len (tmp->data);
- /* need at least input of 'feature_X' */
- if (j >= 7) {
- p = tmp->data + 7;
- j -= 7;
- while (Features[i].name) {
- if (str_len (Features[i].name) == j &&
- ascii_strncasecmp (Features[i].name, p, j)) {
- res = 1;
- break;
- }
- i++;
+ while (Features[i]) {
+ if (str_len (Features[i]) == j-8 &&
+ ascii_strncasecmp (Features[i], tmp->data+8, j-8) == 0) {
+ res = 1;
+ break;
}
+ i++;
}
}
snprintf (err->data, err->dsize, _("ifndef: too few arguments"));
return (-1);
}
+
mutt_extract_token (tmp, s, M_TOKEN_SPACE);
- if ((data && res) || (!data && !res)) {
+ if (data == res) {
if (mutt_parse_rc_line (tmp->data, &token, err) == -1) {
mutt_error ("Error: %s", err->data);
mem_free (&token.data);
return;
ptr = hash_find (ConfigOptions, (char*) ptr->data);
}
- if (!ptr || *ptr->init)
+ if (!ptr || *ptr->init || !FuncTable[DTYPE (ptr->type)].opt_from_string)
return;
mutt_option_value (ptr->option, buf, sizeof (buf));
if (str_len (ptr->init) == 0 && buf && *buf)
ptr->init = str_dup (buf);
}
+static struct option_t* add_option (const char* name, const char* init,
+ short type, short dup) {
+ struct option_t* option = mem_calloc (1, sizeof (struct option_t));
+
+ debug_print (1, ("adding $%s\n", name));
+
+ option->option = str_dup (name);
+ option->type = type;
+ if (init)
+ option->init = dup ? str_dup (init) : (char*) init;
+ return (option);
+}
+
+/* creates new option_t* of type DT_USER for $user_ var */
+static struct option_t* add_user_option (const char* name) {
+ return (add_option (name, NULL, DT_USER, 1));
+}
+
+/* free()'s option_t* */
+static void del_option (void* p) {
+ struct option_t* ptr = (struct option_t*) p;
+ char* s = (char*) ptr->data;
+ debug_print (1, ("removing option '%s' from table\n", NONULL (ptr->option)));
+ mem_free (&ptr->option);
+ mem_free (&s);
+ mem_free (&ptr->init);
+ mem_free (&ptr);
+}
+
+static int init_expand (char** dst, struct option_t* src) {
+ BUFFER token, in;
+ size_t len = 0;
+
+ mem_free (dst);
+
+ 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) {
+ memset (&token, 0, sizeof (BUFFER));
+ memset (&in, 0, sizeof (BUFFER));
+ len = str_len (src->init) + 2;
+ in.data = mem_malloc (len+1);
+ snprintf (in.data, len, "\"%s\"", src->init);
+ in.dptr = in.data;
+ in.dsize = len;
+ mutt_extract_token (&token, &in, 0);
+ if (token.data && *token.data)
+ *dst = str_dup (token.data);
+ else
+ *dst = str_dup ("");
+ mem_free (&in.data);
+ mem_free (&token.data);
+ } else
+ *dst = str_dup ("");
+ } else
+ /* for non-string: take value as is */
+ *dst = str_dup (src->init);
+ return (1);
+}
+
/* if additional data more == 1, we want to resolve synonyms */
-static void mutt_restore_default (const char* name, void* p, unsigned long more) {
+static void mutt_restore_default (const char* name, void* p,
+ unsigned long more) {
char errbuf[STRING];
struct option_t* ptr = (struct option_t*) p;
+ char* init = NULL;
if (DTYPE (ptr->type) == DT_SYN) {
if (!more)
}
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 (FuncTable[DTYPE (ptr->type)].opt_from_string) {
+ init_expand (&init, ptr);
+ if (!FuncTable[DTYPE (ptr->type)].opt_from_string (ptr, init, errbuf,
+ sizeof (errbuf))) {
+ if (!option (OPTNOCURSES))
+ mutt_endwin (NULL);
+ fprintf (stderr, _("Invalid default setting for $%s found: \"%s\".\n"
+ "Please report this error: \"%s\"\n"),
+ ptr->option, NONULL (init), errbuf);
+ exit (1);
+ }
+ mem_free (&init);
}
if (ptr->flags & R_INDEX)
return (1);
}
+#ifdef DEBUG
+static int check_debug (const char* option, unsigned long p,
+ char* errbuf, size_t errlen) {
+ if ((int) p <= DEBUG_MAX_LEVEL &&
+ (int) p >= DEBUG_MIN_LEVEL)
+ return (1);
+
+ if (errbuf)
+ snprintf (errbuf, errlen, _("'%d' is invalid for $%s"), (int) p, option);
+ return (0);
+}
+#endif
+
static int check_history (const char* option, unsigned long p,
char* errbuf, size_t errlen) {
if (!check_num ("history", p, errbuf, errlen))
return (map);
}
-/* 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)
{
}
/* 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 && ascii_strncmp ("user_", tmp->data, 5) == 0) {
+ /* there's no option named like this yet so only add one
+ * if the action isn't any of: reset, unset, query */
+ if (!(reset || unset || query || *s->dptr != '=')) {
+ 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)) {
hash_map (ConfigOptions, mutt_restore_default, 1);
return (0);
}
- else
+ else if (!FuncTable[DTYPE (option->type)].opt_from_string) {
+ snprintf (err->data, err->dsize, _("$%s is read-only"), option->option);
+ r = -1;
+ break;
+ } else
mutt_restore_default (NULL, option, 1);
}
else if (DTYPE (option->type) == DT_BOOL) {
DTYPE (option->type) == DT_NUM ||
DTYPE (option->type) == DT_SORT ||
DTYPE (option->type) == DT_RX ||
- DTYPE (option->type) == DT_USER) {
+ DTYPE (option->type) == DT_USER ||
+ DTYPE (option->type) == DT_SYS) {
/* 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) {
+ DTYPE (option->type) == DT_USER ||
+ DTYPE (option->type) == DT_SYS) {
if (unset) {
- if (DTYPE (option->type) == DT_ADDR)
+ if (!FuncTable[DTYPE (option->type)].opt_from_string) {
+ snprintf (err->data, err->dsize, _("$%s is read-only"),
+ option->option);
+ r = -1;
+ break;
+ } else 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
+ else if (DTYPE (option->type) == DT_USER)
+ /* to unset $user_ means remove */
+ hash_delete (ConfigOptions, option->option,
+ option, del_option);
+ else
mem_free ((void *) option->data);
break;
}
break;
}
- s->dptr++;
- mutt_extract_token (tmp, s, 0);
- if (!FuncTable[DTYPE (option->type)].opt_from_string
- (option, tmp->data, err->data, err->dsize))
+ /* the $muttng_ variables are read-only */
+ if (!FuncTable[DTYPE (option->type)].opt_from_string) {
+ snprintf (err->data, err->dsize, _("$%s is read-only"),
+ option->option);
r = -1;
+ break;
+ } else {
+ s->dptr++;
+ mutt_extract_token (tmp, s, 0);
+ if (!FuncTable[DTYPE (option->type)].opt_from_string
+ (option, tmp->data, err->data, err->dsize))
+ r = -1;
+ }
}
else if (DTYPE (option->type) == DT_QUAD) {
*err->data = 0;
+ debug_print (1, ("expand '%s'\n", line));
+
SKIPWS (expn.dptr);
while (*expn.dptr) {
if (*expn.dptr == '#')
err.data = error;
err.dsize = sizeof (error);
- /* use 3*sizeof(muttvars) to have some room for $user_ vars */
+ /* use 3*sizeof(muttvars) instead of 2*sizeof()
+ * 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);
+ for (i = 0; MuttVars[i].option; i++) {
+ if (DTYPE (MuttVars[i].type) != DT_SYS)
+ hash_insert (ConfigOptions, MuttVars[i].option, &MuttVars[i], 0);
+ else
+ hash_insert (ConfigOptions, MuttVars[i].option,
+ add_option (MuttVars[i].option, MuttVars[i].init,
+ DT_SYS, 0), 0);
+ }
/*
* XXX - use something even more difficult to predict?
Realname = str_dup (mutt_gecos_name (rnbuf, sizeof (rnbuf), pw));
Shell = str_dup (pw->pw_shell);
+ endpwent ();
}
else {
if (!Homedir) {
/* Read the user's initialization file. */
if (access (Muttrc, F_OK) != -1) {
if (!option (OPTNOCURSES))
- endwin ();
+ mutt_endwin (NULL);
if (source_rc (Muttrc, &err) != 0) {
fputs (err.data, stderr);
fputc ('\n', stderr);
projects / apps / madmutt.git / blobdiff