#endif
#include "mutt.h"
+#include "buffer.h"
+#include "ascii.h"
#include "mapping.h"
#include "mutt_curses.h"
#include "history.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 int mutt_option_index (char*);
+static const struct mapping_t* get_sortmap (int idx);
+
/* for synonym warning reports: synonym found during parsing */
typedef struct {
char* f; /* file */
} 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,
+ 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));
+ 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)
/* 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)
+static int mutt_option_index (char *s)
{
int 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;
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;
rx_t *pp = (rx_t *) p->data;
int flags = 0;
- FREE (&pp->pattern);
+ mem_free (&pp->pattern);
if (pp->rx) {
regfree (pp->rx);
- FREE (&pp->rx);
+ mem_free (&pp->rx);
}
if (p->init) {
char *s = (char *) p->init;
- pp->rx = safe_calloc (1, sizeof (regex_t));
+ pp->rx = mem_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 == '!') {
fprintf (stderr,
_("mutt_restore_default(%s): error in regexp: %s\n"),
p->option, pp->pattern);
- FREE (&pp->pattern);
+ mem_free (&pp->pattern);
regfree (pp->rx);
- FREE (&pp->rx);
+ mem_free (&pp->rx);
}
else
str_replace (&pp->pattern, (char *) p->init);
set_option (OPTREDRAWTREE);
}
+/* check whether value for $dsn_return would be valid */
+static int check_dsn_return (const char* val) {
+ if (val && *val && str_ncmp (val, "hdrs", 4) != 0 &&
+ str_ncmp (val, "full", 4) != 0)
+ return (0);
+ return (1);
+}
+
+/* check whether value for $dsn_notify would be valid */
+static int check_dsn_notify (const char* val) {
+ list2_t* list = NULL;
+ int i = 0, rc = 1;
+
+ 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) {
+ rc = 0;
+ break;
+ }
+ list_del (&list, (list_del_t*) _mem_free);
+ return (rc);
+}
+
+static int check_special (const char* name, const char* val) {
+ int i = 0;
+
+ for (i = 0; SpecialVars[i].name; i++) {
+ if (str_cmp (SpecialVars[i].name, name) == 0)
+ return (SpecialVars[i].check (val));
+ }
+ return (1);
+}
+
+static const struct mapping_t* get_sortmap (int idx) {
+ 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;
+ }
+ return (map);
+}
+
static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
BUFFER * err)
{
}
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, idx);
return 0;
}
if (DTYPE (MuttVars[idx].type) == DT_ADDR)
rfc822_free_address ((ADDRESS **) MuttVars[idx].data);
else
- FREE ((void *) MuttVars[idx].data);
+ mem_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));
+ FuncTable[DTYPE (MuttVars[idx].type)].opt_to_string (err->data, err->dsize, idx);
break;
}
else {
if (DTYPE (MuttVars[idx].type) == DT_ADDR)
rfc822_free_address ((ADDRESS **) MuttVars[idx].data);
else
- FREE ((void *) MuttVars[idx].data);
+ mem_free ((void *) MuttVars[idx].data);
mutt_extract_token (tmp, s, 0);
if (DTYPE (MuttVars[idx].type) == DT_PATH) {
*((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);
+ /* see if the value may only be a certain value... */
+ if (check_special (MuttVars[idx].option, tmp->data)) {
+ *((char **) MuttVars[idx].data) = str_dup (tmp->data);
+ if (str_cmp (MuttVars[idx].option, "charset") == 0)
+ mutt_set_charset (Charset);
+ } else {
+ /* ... and abort if it fails */
+ snprintf (err->data, err->dsize, "'%s' is invalid for $%s",
+ tmp->data, MuttVars[idx].option);
+ return (-1);
+ }
}
else {
*((ADDRESS **) MuttVars[idx].data) =
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));
+ rx_to_string (err->data, err->dsize, idx);
break;
}
}
}
- rx = (regex_t *) safe_malloc (sizeof (regex_t));
+ rx = (regex_t *) mem_malloc (sizeof (regex_t));
if ((e = REGCOMP (rx, p, flags)) != 0) {
regerror (e, rx, err->data, err->dsize);
regfree (rx);
- FREE (&rx);
+ mem_free (&rx);
break;
}
/* get here only if everything went smootly */
if (ptr->pattern) {
- FREE (&ptr->pattern);
+ mem_free (&ptr->pattern);
regfree ((regex_t *) ptr->rx);
- FREE (&ptr->rx);
+ mem_free (&ptr->rx);
}
ptr->pattern = str_dup (tmp->data);
}
}
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);
+ magic_to_string (err->data, err->dsize, idx);
break;
}
char *t;
if (query || *s->dptr != '=') {
- /* user requested the value of this variable */
- snprintf (err->data, err->dsize, "%s=%d", MuttVars[idx].option, *ptr);
+ num_to_string (err->data, err->dsize, idx);
break;
}
}
}
else if (DTYPE (MuttVars[idx].type) == DT_QUAD) {
- if (query) {
- char *vals[] = { "no", "yes", "ask-no", "ask-yes" };
- snprintf (err->data, err->dsize, "%s=%s", MuttVars[idx].option,
- vals[quadoption (MuttVars[idx].data)]);
+ if (query) {
+ quad_to_string (err->data, err->dsize, idx);
break;
}
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 (query || *s->dptr != '=') {
+ sort_to_string (err->data, err->dsize, idx);
+ return 0;
}
- if (!map) {
+ /* do this here so we don't ordinarily do it twice for queries */
+ if (!(map = get_sortmap (idx))) {
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);
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);
}
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;
}
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)
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
MuttVars[((syn_t*) Synonyms->data[i])->n].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)
/* dump out the value of all the variables we have */
int mutt_dump_variables (void) {
- int i;
-
- char errbuff[STRING];
- char command[STRING];
+ int i = 0, idx = 0;
+ char outbuf[STRING];
list2_t* tmp = NULL;
- BUFFER err, token;
-
- memset (&err, 0, sizeof (err));
- memset (&token, 0, sizeof (token));
-
- err.data = errbuff;
- err.dsize = sizeof (errbuff);
-
/* get all non-synonyms into list... */
for (i = 0; MuttVars[i].option; i++) {
if (MuttVars[i].type == DT_SYN)
/* ...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);
+ idx = mutt_option_index (((struct option_t*) tmp->data[i])->option);
+ FuncTable[DTYPE (MuttVars[idx].type)].opt_to_string (outbuf, sizeof (outbuf), idx);
+ printf ("%s\n", outbuf);
}
}
- FREE (&token.data);
list_del (&tmp, NULL);
return 0;
}
projects / apps / madmutt.git / blobdiff