static void sys_to_string (char* dst, size_t dstlen,
struct option_t* option) {
- snprintf (dst, dstlen, "%s=\"%s\"", option->option, option->init);
+ 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,
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);
*err->data = 0;
+ debug_print (1, ("expand '%s'\n", line));
+
SKIPWS (expn.dptr);
while (*expn.dptr) {
if (*expn.dptr == '#')