* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
+#include <sys/utsname.h>
+
+#include <lib-sys/unix.h>
+#include <lib-sys/mutt_ssl.h>
+
+#include <lib-ui/curses.h>
+#include <lib-ui/history.h>
+#include <lib-mx/mx.h>
#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 <lib-crypt/crypt.h>
#include "mutt_idna.h"
-#if defined(USE_SSL) || defined(USE_GNUTLS)
-#include "mutt_ssl.h"
-#endif
-
#if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
#include "mutt_libesmtp.h"
#endif
-#include "mx.h"
+#include "alias.h"
#include "init.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
-#include "lib/rx.h"
-#include "lib/list.h"
-#include "lib/debug.h"
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/utsname.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);
+ char* errbuf, ssize_t errlen);
-static HASH* ConfigOptions = NULL;
+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 */
/* prototypes for checking for special vars */
static int check_dsn_return (const char* option, unsigned long val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
static int check_dsn_notify (const char* option, unsigned long val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
static int check_history (const char* option, unsigned long val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
/* 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
+ char* errbuf, ssize_t errlen);
/* use this to check only */
static int check_special (const char* option, unsigned long val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
/* variable <-> sanity check function mappings
* when changing these, make sure the proper _from_string handler
static struct {
const char* name;
int (*check) (const char* option, unsigned long val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
} SpecialVars[] = {
{ "dsn_notify", check_dsn_notify },
{ "dsn_return", check_dsn_return },
#endif
{ "history", check_history },
{ "pager_index_lines", check_num },
-#ifdef DEBUG
- { "debug_level", check_debug },
-#endif
/* last */
{ NULL, NULL }
};
/* protos for config type handles: convert value to string */
-static void bool_to_string (char* dst, size_t dstlen, struct option_t* option);
-static void num_to_string (char* dst, size_t dstlen, struct option_t* option);
-static void str_to_string (char* dst, size_t dstlen, struct option_t* option);
-static void quad_to_string (char* dst, size_t dstlen, struct option_t* option);
-static void sort_to_string (char* dst, size_t dstlen, struct option_t* option);
-static void rx_to_string (char* dst, size_t dstlen, struct option_t* option);
-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);
+static void bool_to_string (char* dst, ssize_t dstlen, struct option_t* option);
+static void num_to_string (char* dst, ssize_t dstlen, struct option_t* option);
+static void str_to_string (char* dst, ssize_t dstlen, struct option_t* option);
+static void quad_to_string (char* dst, ssize_t dstlen, struct option_t* option);
+static void sort_to_string (char* dst, ssize_t dstlen, struct option_t* option);
+static void rx_to_string (char* dst, ssize_t dstlen, struct option_t* option);
+static void magic_to_string (char* dst, ssize_t dstlen, struct option_t* option);
+static void addr_to_string (char* dst, ssize_t dstlen, struct option_t* option);
+static void user_to_string (char* dst, ssize_t dstlen, struct option_t* option);
+static void sys_to_string (char* dst, ssize_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,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
static int num_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
static int str_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
static int path_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
static int quad_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
static int sort_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
static int rx_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
static int magic_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
static int addr_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
static int user_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen);
+ char* errbuf, ssize_t errlen);
static struct {
unsigned short type;
- void (*opt_to_string) (char* dst, size_t dstlen, struct option_t* option);
- int (*opt_from_string) (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen);
+ void (*opt_tostr) (char* dst, ssize_t dstlen, struct option_t* option);
+ int (*opt_fromstr) (struct option_t* dst, const char* val,
+ char* errbuf, ssize_t errlen);
} FuncTable[] = {
{ 0, NULL, NULL }, /* there's no DT_ type with 0 */
{ DT_BOOL, bool_to_string, bool_from_string },
{ DT_SYS, sys_to_string, NULL },
};
-static void bool_to_string (char* dst, size_t dstlen,
+static void bool_to_string (char* dst, ssize_t dstlen,
struct option_t* option) {
snprintf (dst, dstlen, "%s=%s", option->option,
option (option->data) ? "yes" : "no");
}
static int bool_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen) {
+ char* errbuf __attribute__ ((unused)),
+ ssize_t errlen __attribute__ ((unused))) {
int flag = -1;
if (!dst)
set_option (dst->data);
else
unset_option (dst->data);
- return (0);
+ return (1);
}
-static void num_to_string (char* dst, size_t dstlen,
+static void num_to_string (char* dst, ssize_t dstlen,
struct option_t* option) {
/* XXX puke */
- const char* fmt = (str_cmp (option->option, "umask") == 0) ?
+ const char* fmt = (m_strcmp(option->option, "umask") == 0) ?
"%s=%04o" : "%s=%d";
snprintf (dst, dstlen, fmt, option->option,
*((short*) option->data));
}
static int num_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen) {
+ char* errbuf, ssize_t errlen) {
int num = 0, old = 0;
char* t = NULL;
num = strtol (val, &t, 0);
- if (!*val || *t || (short) num != num) {
+ if (m_strisempty(val) || *t || (short) num != num) {
if (errbuf) {
snprintf (errbuf, errlen, _("'%s' is invalid for $%s"),
val, dst->option);
return (1);
}
-static void str_to_string (char* dst, size_t dstlen,
+static void str_to_string (char* dst, ssize_t dstlen,
struct option_t* option) {
snprintf (dst, dstlen, "%s=\"%s\"", option->option,
NONULL (*((char**) option->data)));
}
-static void user_to_string (char* dst, size_t dstlen,
+static void user_to_string (char* dst, ssize_t dstlen,
struct option_t* option) {
snprintf (dst, dstlen, "%s=\"%s\"", option->option,
NONULL (((char*) option->data)));
}
-static void sys_to_string (char* dst, size_t dstlen,
+static void sys_to_string (char* dst, ssize_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 $madmutt_ values dynamically */
+ if (m_strcmp("madmutt_pwd", option->option) == 0) {
+ val = p_new(char, _POSIX_PATH_MAX);
+ val = getcwd (val, _POSIX_PATH_MAX-1);
+ clean = 1;
+ } else if (m_strcmp("madmutt_folder_path", option->option) == 0 &&
+ CurrentFolder && *CurrentFolder) {
+ val = CurrentFolder;
+ } else if (m_strcmp("madmutt_folder_name", option->option) == 0 &&
+ CurrentFolder && *CurrentFolder) {
+
+ ssize_t Maildirlength = m_strlen(Maildir);
+
+ /*
+ * if name starts with $folder, just strip it to keep hierarchy
+ * $folder=imap://host, path=imap://host/inbox/b -> inbox/b
+ */
+ if (Maildirlength > 0 && m_strncmp(CurrentFolder, Maildir,
+ Maildirlength) == 0 &&
+ m_strlen(CurrentFolder) > Maildirlength) {
+ val = CurrentFolder + Maildirlength;
+ if (Maildir[Maildirlength]!='/')
+ val += 1;
+ /* if not $folder, just use everything after last / */
+ } else if ((t = strrchr (CurrentFolder, '/')) != NULL)
+ val = t+1;
+ /* default: use as-is */
+ else
+ val = (char *) CurrentFolder;
+
+ } else
+ val = (char *) option->init;
+
+ snprintf (dst, dstlen, "%s=\"%s\"", option->option, NONULL (val));
+ if (clean)
+ p_delete(&val);
}
static int path_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen) {
+ char* errbuf __attribute__ ((unused)), ssize_t errlen __attribute__ ((unused))) {
char path[_POSIX_PATH_MAX];
if (!dst)
return (0);
- if (!val || !*val) {
- mem_free ((char**) dst->data);
+ if (m_strisempty(val)) {
+ p_delete((char**) dst->data);
return (1);
}
path[0] = '\0';
- strfcpy (path, val, sizeof (path));
- mutt_expand_path (path, sizeof (path));
- str_replace ((char **) dst->data, path);
+ m_strcpy(path, sizeof(path), val);
+ mutt_expand_path (path, sizeof(path));
+ m_strreplace((char **) dst->data, path);
return (1);
}
static int str_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen) {
+ char* errbuf, ssize_t errlen) {
if (!dst)
return (0);
if (!check_special (dst->option, (unsigned long) val, errbuf, errlen))
return (0);
- str_replace ((char**) dst->data, val);
+ m_strreplace((char**) dst->data, val);
return (1);
}
static int user_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen) {
+ char* errbuf __attribute__ ((unused)), ssize_t errlen __attribute__ ((unused))) {
/* 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 (1);
- if (str_len ((char*) dst->data) == 0)
- dst->data = (unsigned long) str_dup (val);
+ if (m_strlen((char*) dst->data) == 0)
+ dst->data = (unsigned long) m_strdup(val);
else {
char* s = (char*) dst->data;
- str_replace (&s, val);
+ m_strreplace(&s, val);
}
- if (str_len (dst->init) == 0)
- dst->init = str_dup ((char*) dst->data);
+ if (m_strlen(dst->init) == 0)
+ dst->init = m_strdup((char*) dst->data);
return (1);
}
-static void quad_to_string (char* dst, size_t dstlen,
+static void quad_to_string (char* dst, ssize_t dstlen,
struct option_t* option) {
- char *vals[] = { "no", "yes", "ask-no", "ask-yes" };
+ const char *vals[] = { "no", "yes", "ask-no", "ask-yes" };
snprintf (dst, dstlen, "%s=%s", option->option,
vals[quadoption (option->data)]);
}
static int quad_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen) {
+ char* errbuf __attribute__ ((unused)), ssize_t errlen __attribute__ ((unused))) {
int flag = -1;
if (!dst)
return (1);
}
-static void sort_to_string (char* dst, size_t dstlen,
+static void sort_to_string (char* dst, ssize_t dstlen,
struct option_t* option) {
const struct mapping_t *map = get_sortmap (option);
- char* p = NULL;
+ const char *p = NULL;
if (!map) {
- snprintf (dst, sizeof (dst), "%s=unknown", option->option);
+ snprintf (dst, sizeof(dst), "%s=unknown", option->option);
return;
}
- p = mutt_getnamebyvalue (*((short *) option->data) & SORT_MASK,
- map);
+ p = mutt_getnamebyvalue(*((short *)option->data) & SORT_MASK, map);
snprintf (dst, dstlen, "%s=%s%s%s", option->option,
(*((short *) option->data) & SORT_REVERSE) ?
}
static int sort_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen) {
+ char* errbuf, ssize_t errlen) {
const struct mapping_t *map = NULL;
if (!(map = get_sortmap (dst))) {
if (errbuf)
return (1);
}
-static void rx_to_string (char* dst, size_t dstlen,
+static void rx_to_string (char* dst, ssize_t dstlen,
struct option_t* option) {
rx_t* p = (rx_t*) option->data;
snprintf (dst, dstlen, "%s=\"%s\"", option->option,
}
static int rx_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen) {
+ char* errbuf, ssize_t errlen) {
rx_t* p = NULL;
regex_t* rx = NULL;
int flags = 0, e = 0, not = 0;
if (!dst)
return (0);
- if (option (OPTATTACHMSG) && !str_cmp (dst->option, "reply_regexp")) {
+ if (option (OPTATTACHMSG) && !m_strcmp(dst->option, "reply_regexp")) {
if (errbuf)
snprintf (errbuf, errlen,
"Operation not permitted when in attach-message mode.");
}
if (!((rx_t*) dst->data))
- *((rx_t**) dst->data) = mem_calloc (1, sizeof (rx_t));
+ *((rx_t**) dst->data) = p_new(rx_t, 1);
p = (rx_t*) dst->data;
/* something to do? */
- if (!val || !*val || (p->pattern && str_cmp (p->pattern, val) == 0))
+ if (m_strisempty(val) || (p->pattern && m_strcmp(p->pattern, val) == 0))
return (1);
- if (str_cmp (dst->option, "mask") != 0)
+ if (m_strcmp(dst->option, "mask") != 0)
flags |= mutt_which_case (val);
s = (char*) val;
- if (str_cmp (dst->option, "mask") == 0 && *s == '!') {
+ if (m_strcmp(dst->option, "mask") == 0 && *s == '!') {
not = 1;
s++;
}
- rx = mem_malloc (sizeof (regex_t));
+ rx = p_new(regex_t, 1);
if ((e = REGCOMP (rx, s, flags)) != 0) {
regerror (e, rx, errbuf, errlen);
regfree (rx);
- mem_free (&rx);
+ p_delete(&rx);
+ return (0);
}
- if (p->pattern) {
+ if (p->rx) {
regfree (p->rx);
- mem_free (&p->rx);
+ p_delete(&p->rx);
}
- str_replace (&p->pattern, val);
+ m_strreplace(&p->pattern, val);
p->rx = rx;
p->not = not;
- if (str_cmp (dst->option, "reply_regexp") == 0)
+ if (m_strcmp(dst->option, "reply_regexp") == 0)
mutt_adjust_all_subjects ();
return (1);
}
-static void magic_to_string (char* dst, size_t dstlen,
+static void magic_to_string (char* dst, ssize_t dstlen,
struct option_t* option) {
const char* s = NULL;
switch (option->data) {
}
static int magic_from_string (struct option_t* dst, const char* val,
- char* errbuf, size_t errlen) {
+ char* errbuf __attribute__ ((unused)), ssize_t errlen __attribute__ ((unused))) {
int flag = -1;
- if (!dst || !val || !*val)
+ if (!dst || m_strisempty(val))
return (0);
if (ascii_strncasecmp (val, "mbox", 4) == 0)
flag = M_MBOX;
}
-static void addr_to_string (char* dst, size_t dstlen,
+static void addr_to_string (char* dst, ssize_t dstlen,
struct option_t* option) {
char s[HUGE_STRING];
s[0] = '\0';
- rfc822_write_address (s, sizeof (s), *((ADDRESS**) option->data), 0);
+ rfc822_addrcat(s, sizeof(s), *((address_t**) 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)
+ char* errbuf __attribute__ ((unused)), ssize_t errlen __attribute__ ((unused))) {
+ if (!dst)
return (0);
- rfc822_free_address ((ADDRESS**) dst->data);
- *((ADDRESS**) dst->data) = rfc822_parse_adrlist (NULL, val);
+ address_list_wipe((address_t**) dst->data);
+ if (val && *val)
+ *((address_t**) dst->data) = rfc822_parse_adrlist (NULL, val);
return (1);
}
-int mutt_option_value (const char* val, char* dst, size_t dstlen) {
+int mutt_option_value (const char* val, char* dst, ssize_t dstlen) {
struct option_t* option = NULL;
char* tmp = NULL, *t = NULL;
- size_t l = 0;
+ ssize_t l = 0;
if (!(option = hash_find (ConfigOptions, val))) {
- debug_print (1, ("var '%s' not found\n", val));
*dst = '\0';
return (0);
}
- tmp = mem_malloc (dstlen+1);
- FuncTable[DTYPE (option->type)].opt_to_string (tmp, dstlen, option);
+ tmp = p_new(char, dstlen+1);
+ FuncTable[DTYPE(option->type)].opt_tostr (tmp, dstlen, option);
/* 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);
+ l = m_strlen(t);
if (l >= 2) {
if (t[l-1] == '"' && *t == '"') {
t[l-1] = '\0';
}
}
memcpy (dst, t, l+1);
- mem_free (&tmp);
- debug_print (1, ("stripped == '%s'\n", dst));
+ p_delete(&tmp);
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 = mem_malloc (sizeof (syn_t));
- tmp->f = str_dup (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) {
- mem_free(&(*(syn_t**) p)->f);
- mem_free(p);
-}
-
-void toggle_quadoption (int opt)
+static void toggle_quadoption (int opt)
{
int n = opt / 4;
int b = (opt % 4) * 2;
/* not reached */
}
-static void add_to_list (LIST ** list, const char *str)
+static void add_to_list(string_list_t **list, const char *str)
{
- LIST *t, *last = NULL;
-
- /* don't add a NULL or empty string to the list */
- if (!str || *str == '\0')
- return;
-
- /* check to make sure the item is not already on this list */
- for (last = *list; last; last = last->next) {
- if (ascii_strcasecmp (str, last->data) == 0) {
- /* already on the list, so just ignore it */
- last = NULL;
- break;
+ /* don't add a NULL or empty string to the list */
+ if (m_strisempty(str))
+ return;
+
+ /* check to make sure the item is not already on this list */
+ while (*list) {
+ if (!ascii_strcasecmp(str, (*list)->data))
+ return;
+ list = &(*list)->next;
}
- if (!last->next)
- break;
- }
- if (!*list || last) {
- t = (LIST *) mem_calloc (1, sizeof (LIST));
- t->data = str_dup (str);
- if (last) {
- last->next = t;
- last = last->next;
- }
- else
- *list = last = t;
- }
+ *list = p_new(string_list_t, 1);
+ (*list)->data = m_strdup(str);
}
-static int add_to_rx_list (list2_t** list, const char *s, int flags,
- BUFFER * err)
+static int
+add_to_rx_list(rx_t **list, const char *s, int flags, BUFFER *err)
{
- rx_t* rx;
- int i = 0;
+ rx_t *rx;
- if (!s || !*s)
- return 0;
+ if (m_strisempty(s))
+ return 0;
- if (!(rx = rx_compile (s, flags))) {
- snprintf (err->data, err->dsize, "Bad regexp: %s\n", s);
- return -1;
- }
+ if (rx_lookup(list, s))
+ return 0;
- i = rx_lookup ((*list), rx->pattern);
- if (i >= 0)
- rx_free (&rx);
- else
- list_push_back (list, rx);
- return 0;
+ rx = rx_compile(s, flags);
+ if (!rx) {
+ snprintf(err->data, err->dsize, "Bad regexp: %s\n", s);
+ return -1;
+ }
+
+ rx_list_append(list, rx);
+ return 0;
}
-static int add_to_spam_list (SPAM_LIST ** list, const char *pat,
+static int add_to_spam_list(rx_t **list, const char *pat,
const char *templ, BUFFER * err)
{
- SPAM_LIST *t = NULL, *last = NULL;
- rx_t* rx;
- int n;
- const char *p;
-
- if (!pat || !*pat || !templ)
- return 0;
+ rx_t *rx;
- if (!(rx = rx_compile (pat, REG_ICASE))) {
- snprintf (err->data, err->dsize, _("Bad regexp: %s"), pat);
- return -1;
- }
+ if (m_strisempty(pat) || !templ)
+ return 0;
- /* check to make sure the item is not already on this list */
- for (last = *list; last; last = last->next) {
- if (ascii_strcasecmp (rx->pattern, last->rx->pattern) == 0) {
- /* Already on the list. Formerly we just skipped this case, but
- * now we're supporting removals, which means we're supporting
- * re-adds conceptually. So we probably want this to imply a
- * removal, then do an add. We can achieve the removal by freeing
- * the template, and leaving t pointed at the current item.
- */
- t = last;
- mem_free(t->template);
- break;
+ if (!(rx = rx_compile (pat, REG_ICASE))) {
+ snprintf (err->data, err->dsize, _("Bad regexp: %s"), pat);
+ return -1;
}
- if (!last->next)
- break;
- }
-
- /* If t is set, it's pointing into an extant SPAM_LIST* that we want to
- * update. Otherwise we want to make a new one to link at the list's end.
- */
- if (!t) {
- t = mutt_new_spam_list ();
- t->rx = rx;
- if (last)
- last->next = t;
- else
- *list = t;
- }
-
- /* Now t is the SPAM_LIST* that we want to modify. It is prepared. */
- t->template = str_dup (templ);
- /* Find highest match number in template string */
- t->nmatch = 0;
- for (p = templ; *p;) {
- if (*p == '%') {
- n = atoi (++p);
- if (n > t->nmatch)
- t->nmatch = n;
- while (*p && isdigit ((int) *p))
- ++p;
+ /* check to make sure the item is not already on this list */
+ while (*list) {
+ if (!ascii_strcasecmp(rx->pattern, (*list)->pattern)) {
+ rx_t *tmp = rx_list_pop(list);
+ rx_delete(&tmp);
+ } else {
+ list = &(*list)->next;
+ }
}
- else
- ++p;
- }
- t->nmatch++; /* match 0 is always the whole expr */
- return 0;
+ *list = rx;
+ rx_set_template(rx, templ);
+ return 0;
}
-static int remove_from_spam_list (SPAM_LIST ** list, const char *pat)
+static int remove_from_spam_list (rx_t ** list, const char *pat)
{
- SPAM_LIST *spam, *prev;
- int nremoved = 0;
-
- /* Being first is a special case. */
- spam = *list;
- if (!spam)
- return 0;
- if (spam->rx && !str_cmp (spam->rx->pattern, pat)) {
- *list = spam->next;
- rx_free (&spam->rx);
- mem_free(&spam->template);
- mem_free(&spam);
- return 1;
- }
-
- prev = spam;
- for (spam = prev->next; spam;) {
- if (!str_cmp (spam->rx->pattern, pat)) {
- prev->next = spam->next;
- rx_free (&spam->rx);
- mem_free(spam->template);
- mem_free(spam);
- spam = prev->next;
- ++nremoved;
+ int nremoved = 0;
+
+ while (*list) {
+ if (!m_strcmp((*list)->pattern, pat)) {
+ rx_t *spam = rx_list_pop(list);
+ rx_delete(&spam);
+ nremoved++;
+ } else {
+ list = &(*list)->next;
+ }
}
- else
- spam = spam->next;
- }
- return nremoved;
+ return nremoved;
}
-static void remove_from_list (LIST ** l, const char *str)
+static void remove_from_list(string_list_t **l, const char *str)
{
- LIST *p, *last = NULL;
-
- if (str_cmp ("*", str) == 0)
- mutt_free_list (l); /* ``unCMD *'' means delete all current entries */
- else {
- p = *l;
- last = NULL;
- while (p) {
- if (ascii_strcasecmp (str, p->data) == 0) {
- mem_free (&p->data);
- if (last)
- last->next = p->next;
- else
- (*l) = p->next;
- mem_free (&p);
- }
- else {
- last = p;
- p = p->next;
- }
+ if (!m_strcmp("*", str)) {
+ string_list_wipe(l); /* ``unCMD *'' means delete all current entries */
+ return;
}
- }
-}
-
-static int remove_from_rx_list (list2_t** l, const char *str)
-{
- int i = 0;
- if (str_cmp ("*", str) == 0) {
- list_del (l, (list_del_t*) rx_free);
- return (0);
- }
- else {
- i = rx_lookup ((*l), str);
- if (i >= 0) {
- rx_t* r = list_pop_idx ((*l), i);
- rx_free (&r);
- return (0);
+ while (*l) {
+ if (!ascii_strcasecmp(str, (*l)->data)) {
+ string_list_t *it = string_list_pop(l);
+ string_item_delete(&it);
+ } else {
+ l = &(*l)->next;
+ }
}
- }
- return (-1);
}
-static int parse_ifdef (BUFFER * tmp, BUFFER * s, unsigned long data,
- BUFFER * err)
+static int remove_from_rx_list(rx_t **l, const char *str)
{
- 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 ((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);
-
- if (!b)
- continue;
-
- for (j = 0; b[j].name; j++)
- if (!ascii_strncasecmp (tmp->data, b[j].name, str_len (tmp->data))
- && (str_len (b[j].name) == str_len (tmp->data))) {
- res = 1;
- break;
- }
- }
- }
- /* check for feature_* */
- if (!res) {
- char *p = NULL;
-
- 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++;
- }
+ if (m_strcmp("*", str) == 0) {
+ rx_list_wipe(l);
+ return 0;
}
- }
- if (!MoreArgs (s)) {
- if (data)
- snprintf (err->data, err->dsize, _("ifdef: too few arguments"));
- else
- 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 (mutt_parse_rc_line (tmp->data, &token, err) == -1) {
- mutt_error ("Error: %s", err->data);
- mem_free (&token.data);
- return (-1);
+ l = rx_lookup(l, str);
+ if (l) {
+ rx_t *r = rx_list_pop(l);
+ rx_delete(&r);
+ return 0;
}
- mem_free (&token.data);
- }
- return 0;
+
+ return -1;
}
-static int parse_unignore (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+static int parse_unignore (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
do {
mutt_extract_token (buf, s, 0);
/* don't add "*" to the unignore list */
- if (strcmp (buf->data, "*"))
+ if (m_strcmp (buf->data, "*"))
add_to_list (&UnIgnore, buf->data);
remove_from_list (&Ignore, buf->data);
- }
- while (MoreArgs (s));
+ } while (MoreArgs (s));
return 0;
}
-static int parse_ignore (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+static int parse_ignore (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
do {
mutt_extract_token (buf, s, 0);
remove_from_list (&UnIgnore, buf->data);
add_to_list (&Ignore, buf->data);
- }
- while (MoreArgs (s));
-
+ } while (MoreArgs(s));
return 0;
}
-static int parse_list (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+static int parse_list(BUFFER * buf, BUFFER * s, unsigned long data,
+ BUFFER * err __attribute__ ((unused)))
{
do {
mutt_extract_token (buf, s, 0);
- add_to_list ((LIST **) data, buf->data);
- }
- while (MoreArgs (s));
-
+ add_to_list ((string_list_t **) data, buf->data);
+ } while (MoreArgs(s));
return 0;
}
}
}
-static int parse_alternates (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+static int parse_alternates (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
_alternates_clean ();
do {
return 0;
}
-static int parse_unalternates (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+static int parse_unalternates (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
_alternates_clean ();
do {
mutt_extract_token (buf, s, 0);
remove_from_rx_list (&Alternates, buf->data);
- if (str_cmp (buf->data, "*") &&
+ if (m_strcmp(buf->data, "*") &&
add_to_rx_list (&UnAlternates, buf->data, REG_ICASE, err) != 0)
return -1;
{
BUFFER templ;
- memset (&templ, 0, sizeof (templ));
+ p_clear(&templ, 1);
/* Insist on at least one parameter */
if (!MoreArgs (s)) {
if (data == M_SPAM)
- strfcpy (err->data, _("spam: no matching pattern"), err->dsize);
+ m_strcpy(err->data, err->dsize, _("spam: no matching pattern"));
else
- strfcpy (err->data, _("nospam: no matching pattern"), err->dsize);
+ m_strcpy(err->data, err->dsize, _("nospam: no matching pattern"));
return -1;
}
/* Add to the spam list. */
if (add_to_spam_list (&SpamList, buf->data, templ.data, err) != 0) {
- mem_free (&templ.data);
+ p_delete(&templ.data);
return -1;
}
- mem_free (&templ.data);
+ p_delete(&templ.data);
}
/* If not, try to remove from the nospam list. */
/* nospam only ever has one parameter. */
/* "*" is a special case. */
- if (!str_cmp (buf->data, "*")) {
- mutt_free_spam_list (&SpamList);
- list_del (&NoSpamList, (list_del_t*) rx_free);
+ if (!m_strcmp(buf->data, "*")) {
+ rx_list_wipe(&SpamList);
+ rx_list_wipe(&NoSpamList);
return 0;
}
}
/* This should not happen. */
- strfcpy (err->data, "This is no good at all.", err->dsize);
+ m_strcpy(err->data, err->dsize, "This is no good at all.");
return -1;
}
static int parse_unlist (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+ BUFFER * err __attribute__ ((unused)))
{
do {
mutt_extract_token (buf, s, 0);
/*
* Check for deletion of entire list
*/
- if (str_cmp (buf->data, "*") == 0) {
- mutt_free_list ((LIST **) data);
+ if (m_strcmp(buf->data, "*") == 0) {
+ string_list_wipe((string_list_t **) data);
break;
}
- remove_from_list ((LIST **) data, buf->data);
+ remove_from_list ((string_list_t **) data, buf->data);
}
while (MoreArgs (s));
return 0;
}
-static int parse_lists (BUFFER * buf, BUFFER * s, unsigned long data,
+static int parse_lists (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
BUFFER * err)
{
do {
return 0;
}
-static int parse_unlists (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+/* always wise to do what someone else did before */
+static void _attachments_clean (void) {
+ int i;
+ if (Context && Context->msgcount) {
+ for (i = 0; i < Context->msgcount; i++)
+ Context->hdrs[i]->attach_valid = 0;
+ }
+}
+
+static int parse_attach_list (BUFFER *buf, BUFFER *s, string_list_t **ldata,
+ BUFFER *err __attribute__ ((unused))) {
+ ATTACH_MATCH *a;
+ string_list_t *listp, *lastp;
+ char *p;
+ char *tmpminor;
+ int len;
+
+ /* Find the last item in the list that data points to. */
+ lastp = NULL;
+ for (listp = *ldata; listp; listp = listp->next) {
+ a = (ATTACH_MATCH *)listp->data;
+ lastp = listp;
+ }
+
+ do {
+ mutt_extract_token (buf, s, 0);
+
+ if (!buf->data || *buf->data == '\0')
+ continue;
+
+ a = p_new(ATTACH_MATCH, 1);
+
+ /* some cheap hacks that I expect to remove */
+ if (!m_strcasecmp(buf->data, "any"))
+ a->major = m_strdup("*/.*");
+ else if (!m_strcasecmp(buf->data, "none"))
+ a->major = m_strdup("cheap_hack/this_should_never_match");
+ else
+ a->major = m_strdup(buf->data);
+
+ if ((p = strchr(a->major, '/'))) {
+ *p = '\0';
+ ++p;
+ a->minor = p;
+ } else {
+ a->minor = "unknown";
+ }
+
+ len = m_strlen(a->minor);
+ tmpminor = p_new(char, len + 3);
+ m_strcpy(&tmpminor[1], len + 3, a->minor);
+ tmpminor[0] = '^';
+ tmpminor[len+1] = '$';
+ tmpminor[len+2] = '\0';
+
+ a->major_int = mutt_check_mime_type(a->major);
+ regcomp(&a->minor_rx, tmpminor, REG_ICASE|REG_EXTENDED);
+
+ p_delete(&tmpminor);
+
+ listp = p_new(string_list_t, 1);
+ listp->data = (char *)a;
+ listp->next = NULL;
+ if (lastp) {
+ lastp->next = listp;
+ } else {
+ *ldata = listp;
+ }
+ lastp = listp;
+ }
+ while (MoreArgs (s));
+
+ _attachments_clean();
+ return 0;
+}
+
+static int parse_unattach_list (BUFFER *buf, BUFFER *s, string_list_t **ldata,
+ BUFFER *err __attribute__ ((unused))) {
+ ATTACH_MATCH *a;
+ string_list_t *lp, *lastp, *newlp;
+ char *tmp;
+ int major;
+ char *minor;
+
+ do {
+ mutt_extract_token (buf, s, 0);
+
+ if (!m_strcasecmp(buf->data, "any"))
+ tmp = m_strdup("*/.*");
+ else if (!m_strcasecmp(buf->data, "none"))
+ tmp = m_strdup("cheap_hack/this_should_never_match");
+ else
+ tmp = m_strdup(buf->data);
+
+ if ((minor = strchr(tmp, '/'))) {
+ *minor = '\0';
+ ++minor;
+ } else {
+ minor = m_strdup("unknown");
+ }
+ major = mutt_check_mime_type(tmp);
+
+ /* We must do our own walk here because remove_from_list() will only
+ * remove the string_list_t->data, not anything pointed to by the string_list_t->data. */
+ lastp = NULL;
+ for(lp = *ldata; lp; ) {
+ a = (ATTACH_MATCH *)lp->data;
+ if (a->major_int == major && !m_strcasecmp(minor, a->minor)) {
+ regfree(&a->minor_rx);
+ p_delete(&a->major);
+
+ /* Relink backward */
+ if (lastp)
+ lastp->next = lp->next;
+ else
+ *ldata = lp->next;
+
+ newlp = lp->next;
+ p_delete(&lp->data); /* same as a */
+ p_delete(&lp);
+ lp = newlp;
+ continue;
+ }
+
+ lastp = lp;
+ lp = lp->next;
+ }
+ }
+ while (MoreArgs (s));
+
+ p_delete(&tmp);
+ _attachments_clean();
+ return 0;
+}
+
+static int print_attach_list (string_list_t *lp, char op, const char *name) {
+ while (lp) {
+ printf("attachments %c%s %s/%s\n", op, name,
+ ((ATTACH_MATCH *)lp->data)->major,
+ ((ATTACH_MATCH *)lp->data)->minor);
+ lp = lp->next;
+ }
+
+ return 0;
+}
+
+static int parse_attachments (BUFFER *buf, BUFFER *s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER *err) {
+ char op, *category;
+ string_list_t **listp;
+
+ mutt_extract_token(buf, s, 0);
+ if (!buf->data || *buf->data == '\0') {
+ m_strcpy(err->data, err->dsize, _("attachments: no disposition"));
+ return -1;
+ }
+
+ category = buf->data;
+ op = *category++;
+
+ if (op == '?') {
+ mutt_endwin (NULL);
+ fflush (stdout);
+ printf("\nCurrent attachments settings:\n\n");
+ print_attach_list(AttachAllow, '+', "A");
+ print_attach_list(AttachExclude, '-', "A");
+ print_attach_list(InlineAllow, '+', "I");
+ print_attach_list(InlineExclude, '-', "I");
+ set_option (OPTFORCEREDRAWINDEX);
+ set_option (OPTFORCEREDRAWPAGER);
+ mutt_any_key_to_continue (NULL);
+ return 0;
+ }
+
+ if (op != '+' && op != '-') {
+ op = '+';
+ category--;
+ }
+ if (!m_strncasecmp(category, "attachment", strlen(category))) {
+ if (op == '+')
+ listp = &AttachAllow;
+ else
+ listp = &AttachExclude;
+ }
+ else if (!m_strncasecmp(category, "inline", strlen(category))) {
+ if (op == '+')
+ listp = &InlineAllow;
+ else
+ listp = &InlineExclude;
+ } else {
+ m_strcpy(err->data, err->dsize, _("attachments: invalid disposition"));
+ return -1;
+ }
+
+ return parse_attach_list(buf, s, listp, err);
+}
+
+static int parse_unattachments (BUFFER *buf, BUFFER *s, unsigned long data __attribute__ ((unused)), BUFFER *err) {
+ char op, *p;
+ string_list_t **listp;
+
+ mutt_extract_token(buf, s, 0);
+ if (!buf->data || *buf->data == '\0') {
+ m_strcpy(err->data, err->dsize, _("unattachments: no disposition"));
+ return -1;
+ }
+
+ p = buf->data;
+ op = *p++;
+ if (op != '+' && op != '-') {
+ op = '+';
+ p--;
+ }
+ if (!m_strncasecmp(p, "attachment", strlen(p))) {
+ if (op == '+')
+ listp = &AttachAllow;
+ else
+ listp = &AttachExclude;
+ }
+ else if (!m_strncasecmp(p, "inline", strlen(p))) {
+ if (op == '+')
+ listp = &InlineAllow;
+ else
+ listp = &InlineExclude;
+ }
+ else {
+ m_strcpy(err->data, err->dsize, _("unattachments: invalid disposition"));
+ return -1;
+ }
+
+ return parse_unattach_list(buf, s, listp, err);
+}
+
+static int parse_unlists (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
do {
mutt_extract_token (buf, s, 0);
remove_from_rx_list (&SubscribedLists, buf->data);
remove_from_rx_list (&MailLists, buf->data);
- if (str_cmp (buf->data, "*") &&
+ if (m_strcmp(buf->data, "*") &&
add_to_rx_list (&UnMailLists, buf->data, REG_ICASE, err) != 0)
return -1;
}
return 0;
}
-static int parse_subscribe (BUFFER * buf, BUFFER * s, unsigned long data,
+static int parse_subscribe (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)),
BUFFER * err)
{
do {
return 0;
}
-static int parse_unsubscribe (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+static int parse_unsubscribe (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
do {
mutt_extract_token (buf, s, 0);
remove_from_rx_list (&SubscribedLists, buf->data);
- if (str_cmp (buf->data, "*") &&
+ if (m_strcmp(buf->data, "*") &&
add_to_rx_list (&UnSubscribedLists, buf->data, REG_ICASE, err) != 0)
return -1;
}
return 0;
}
-static int parse_unalias (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+static int parse_unalias (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
- ALIAS *tmp, *last = NULL;
-
- do {
- mutt_extract_token (buf, s, 0);
-
- if (str_cmp ("*", buf->data) == 0) {
- if (CurrentMenu == MENU_ALIAS) {
- for (tmp = Aliases; tmp; tmp = tmp->next)
- tmp->del = 1;
- set_option (OPTFORCEREDRAWINDEX);
- }
- else
- mutt_free_alias (&Aliases);
- break;
- }
- else
- for (tmp = Aliases; tmp; tmp = tmp->next) {
- if (str_casecmp (buf->data, tmp->name) == 0) {
- if (CurrentMenu == MENU_ALIAS) {
- tmp->del = 1;
- set_option (OPTFORCEREDRAWINDEX);
+ alias_t *tmp, **last;
+
+ do {
+ mutt_extract_token (buf, s, 0);
+
+ if (!m_strcmp("*", buf->data) == 0) {
+ if (CurrentMenu == MENU_ALIAS) {
+ for (tmp = Aliases; tmp; tmp = tmp->next)
+ tmp->del = 1;
+ set_option(OPTFORCEREDRAWINDEX);
+ } else {
+ alias_list_wipe(&Aliases);
+ }
break;
- }
+ }
- if (last)
- last->next = tmp->next;
- else
- Aliases = tmp->next;
- tmp->next = NULL;
- mutt_free_alias (&tmp);
- break;
+ last = &Aliases;
+ for (last = &Aliases; *last; last = &(*last)->next) {
+ if (!m_strcasecmp(buf->data, (*last)->name)) {
+ if (CurrentMenu == MENU_ALIAS) {
+ (*last)->del = 1;
+ set_option (OPTFORCEREDRAWINDEX);
+ } else {
+ tmp = alias_list_pop(last);
+ alias_delete(&tmp);
+ }
+ break;
+ }
}
- last = tmp;
- }
- }
- while (MoreArgs (s));
- return 0;
+ } while (MoreArgs(s));
+
+ return 0;
}
-static int parse_alias (BUFFER * buf, BUFFER * s, unsigned long data,
+static int parse_alias (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
BUFFER * err)
{
- ALIAS *tmp = Aliases;
- ALIAS *last = NULL;
- char *estr = NULL;
-
- if (!MoreArgs (s)) {
- strfcpy (err->data, _("alias: no address"), err->dsize);
- return (-1);
- }
-
- mutt_extract_token (buf, s, 0);
+ alias_t **last;
+ char *estr = NULL;
- debug_print (2, ("first token is '%s'.\n", buf->data));
+ if (!MoreArgs (s)) {
+ m_strcpy(err->data, err->dsize, _("alias: no address"));
+ return (-1);
+ }
- /* check to see if an alias with this name already exists */
- for (; tmp; tmp = tmp->next) {
- if (!str_casecmp (tmp->name, buf->data))
- break;
- last = tmp;
- }
+ mutt_extract_token (buf, s, 0);
- if (!tmp) {
- /* create a new alias */
- tmp = (ALIAS *) mem_calloc (1, sizeof (ALIAS));
- tmp->self = tmp;
- tmp->name = str_dup (buf->data);
- /* give the main addressbook code a chance */
- if (CurrentMenu == MENU_ALIAS)
- set_option (OPTMENUCALLER);
- }
- else {
- /* override the previous value */
- rfc822_free_address (&tmp->addr);
- if (CurrentMenu == MENU_ALIAS)
- set_option (OPTFORCEREDRAWINDEX);
- }
+ /* check to see if an alias with this name already exists */
+ for (last = &Aliases; *last; last = &(*last)->next) {
+ if (!m_strcasecmp((*last)->name, buf->data))
+ break;
+ }
- mutt_extract_token (buf, s,
- M_TOKEN_QUOTE | M_TOKEN_SPACE | M_TOKEN_SEMICOLON);
- debug_print (2, ("second token is '%s'.\n", buf->data));
- tmp->addr = mutt_parse_adrlist (tmp->addr, buf->data);
- if (last)
- last->next = tmp;
- else
- Aliases = tmp;
- if (mutt_addrlist_to_idna (tmp->addr, &estr)) {
- snprintf (err->data, err->dsize,
- _("Warning: Bad IDN '%s' in alias '%s'.\n"), estr, tmp->name);
- return -1;
- }
-#ifdef DEBUG
- if (DebugLevel >= 2) {
- ADDRESS *a;
+ if (!*last) {
+ /* create a new alias */
+ *last = alias_new();
+ (*last)->name = m_strdup(buf->data);
+ /* give the main addressbook code a chance */
+ if (CurrentMenu == MENU_ALIAS)
+ set_option (OPTMENUCALLER);
+ } else {
+ /* override the previous value */
+ address_list_wipe(&(*last)->addr);
+ if (CurrentMenu == MENU_ALIAS)
+ set_option (OPTFORCEREDRAWINDEX);
+ }
- for (a = tmp->addr; a; a = a->next) {
- if (!a->group)
- debug_print (2, ("%s\n", a->mailbox));
- else
- debug_print (2, ("group %s\n", a->mailbox));
+ mutt_extract_token(buf, s, M_TOKEN_QUOTE | M_TOKEN_SPACE);
+ (*last)->addr = mutt_parse_adrlist((*last)->addr, buf->data);
+ if (mutt_addrlist_to_idna((*last)->addr, &estr)) {
+ snprintf (err->data, err->dsize,
+ _("Warning: Bad IDN '%s' in alias '%s'.\n"), estr, (*last)->name);
+ p_delete(&estr);
+ return -1;
}
- }
-#endif
- return 0;
+
+ return 0;
}
static int
-parse_unmy_hdr (BUFFER * buf, BUFFER * s, unsigned long data, BUFFER * err)
+parse_unmy_hdr(BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
- LIST *last = NULL;
- LIST *tmp = UserHeader;
- LIST *ptr;
- size_t l;
-
- do {
- mutt_extract_token (buf, s, 0);
- if (str_cmp ("*", buf->data) == 0)
- mutt_free_list (&UserHeader);
- else {
- tmp = UserHeader;
- last = NULL;
-
- l = str_len (buf->data);
- if (buf->data[l - 1] == ':')
- l--;
-
- while (tmp) {
- if (ascii_strncasecmp (buf->data, tmp->data, l) == 0
- && tmp->data[l] == ':') {
- ptr = tmp;
- if (last)
- last->next = tmp->next;
- else
- UserHeader = tmp->next;
- tmp = tmp->next;
- ptr->next = NULL;
- mutt_free_list (&ptr);
- }
- else {
- last = tmp;
- tmp = tmp->next;
+ do {
+ mutt_extract_token (buf, s, 0);
+
+ if (!m_strcmp("*", buf->data)) {
+ string_list_wipe(&UserHeader);
+ } else {
+ string_list_t **last = &UserHeader;
+ ssize_t l = m_strlen(buf->data);
+
+ if (buf->data[l - 1] == ':')
+ l--;
+
+ while (*last) {
+ if (!ascii_strncasecmp(buf->data, (*last)->data, l)
+ && (*last)->data[l] == ':')
+ {
+ string_list_t *tmp = string_list_pop(last);
+ string_item_delete(&tmp);
+ } else {
+ last = &(*last)->next;
+ }
+ }
}
- }
- }
- }
- while (MoreArgs (s));
- return 0;
+ } while (MoreArgs(s));
+
+ return 0;
}
-static int parse_my_hdr (BUFFER * buf, BUFFER * s, unsigned long data,
+static int parse_my_hdr (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)),
BUFFER * err)
{
- LIST *tmp;
- size_t keylen;
+ string_list_t *tmp;
+ ssize_t keylen;
char *p;
mutt_extract_token (buf, s, M_TOKEN_SPACE | M_TOKEN_QUOTE);
if ((p = strpbrk (buf->data, ": \t")) == NULL || *p != ':') {
- strfcpy (err->data, _("invalid header field"), err->dsize);
+ m_strcpy(err->data, err->dsize, _("invalid header field"));
return (-1);
}
keylen = p - buf->data + 1;
/* see if there is already a field by this name */
if (ascii_strncasecmp (buf->data, tmp->data, keylen) == 0) {
/* replace the old value */
- mem_free (&tmp->data);
+ p_delete(&tmp->data);
tmp->data = buf->data;
- memset (buf, 0, sizeof (BUFFER));
+ p_clear(buf, 1);
return 0;
}
if (!tmp->next)
break;
}
- tmp->next = mutt_new_list ();
+ tmp->next = string_item_new();
tmp = tmp->next;
}
else {
- tmp = mutt_new_list ();
+ tmp = string_item_new();
UserHeader = tmp;
}
tmp->data = buf->data;
- memset (buf, 0, sizeof (BUFFER));
+ p_clear(buf, 1);
return 0;
}
static int
parse_sort (struct option_t* dst, const char *s, const struct mapping_t *map,
- char* errbuf, size_t errlen) {
+ char* errbuf, ssize_t errlen) {
int i, flags = 0;
- if (str_ncmp ("reverse-", s, 8) == 0) {
+ if (m_strncmp("reverse-", s, 8) == 0) {
s += 8;
flags = SORT_REVERSE;
}
- if (str_ncmp ("last-", s, 5) == 0) {
+ if (m_strncmp("last-", s, 5) == 0) {
s += 5;
flags |= SORT_LAST;
}
}
/* 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;
+static void mutt_set_default(const char *name __attribute__ ((unused)), void* p, unsigned long more)
+{
+ char buf[LONG_STRING];
+ struct option_t *ptr = p;
- if (DTYPE (ptr->type) == DT_SYN) {
- if (!more)
- return;
- ptr = hash_find (ConfigOptions, (char*) ptr->data);
- }
- 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);
+ if (DTYPE(ptr->type) == DT_SYN) {
+ if (!more)
+ return;
+ ptr = hash_find(ConfigOptions, (const char *)ptr->data);
+ }
+ if (!ptr || *ptr->init || !FuncTable[DTYPE (ptr->type)].opt_fromstr)
+ return;
+
+ mutt_option_value(ptr->option, buf, sizeof(buf));
+ if (m_strlen(ptr->init) == 0 && buf && *buf)
+ ptr->init = m_strdup(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));
+ short type, short dodup) {
+ struct option_t* option = p_new(struct option_t, 1);
- option->option = str_dup (name);
+ option->option = m_strdup(name);
option->type = type;
if (init)
- option->init = dup ? str_dup (init) : (char*) init;
+ option->init = dodup ? m_strdup(init) : (char*) init;
return (option);
}
/* free()'s option_t* */
static void del_option (void* p) {
- struct option_t* ptr = (struct option_t*) 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);
+ p_delete(&ptr->option);
+ p_delete(&s);
+ p_delete(&ptr->init);
+ p_delete(&ptr);
+}
+
+static int init_expand (char** dst, struct option_t* src) {
+ BUFFER token, in;
+ ssize_t len = 0;
+
+ p_delete(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) {
+ p_clear(&token, 1);
+ p_clear(&in, 1);
+ len = m_strlen(src->init) + 2;
+ in.data = p_new(char, 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 = m_strdup(token.data);
+ else
+ *dst = m_strdup("");
+ p_delete(&in.data);
+ p_delete(&token.data);
+ } else
+ *dst = m_strdup("");
+ } else
+ /* for non-string: take value as is */
+ *dst = m_strdup(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 __attribute__ ((unused)),
+ 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 &&
- 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_fromstr) {
+ init_expand (&init, ptr);
+ if (!FuncTable[DTYPE (ptr->type)].opt_fromstr (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);
+ }
+ p_delete(&init);
}
if (ptr->flags & R_INDEX)
}
/* 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) {
+static int check_dsn_return (const char* option __attribute__ ((unused)), unsigned long p,
+ char* errbuf, ssize_t errlen) {
char* val = (char*) p;
- if (val && *val && str_ncmp (val, "hdrs", 4) != 0 &&
- str_ncmp (val, "full", 4) != 0) {
+ if (val && *val && m_strncmp(val, "hdrs", 4) != 0 &&
+ m_strncmp(val, "full", 4) != 0) {
if (errbuf)
snprintf (errbuf, errlen, _("'%s' is invalid for $%s"), val, "dsn_return");
return (0);
}
/* 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);
+static int
+check_dsn_notify (const char* option __attribute__ ((unused)),
+ unsigned long val, char* errbuf, ssize_t errlen)
+{
+ const char *p = (const char*)val;
+
+ while (p && *p) {
+ const char *q = m_strchrnul(p, ',');
+ int len = q - p;
+
+ if (!m_strncmp(p, "never", len) && !m_strncmp(p, "delay", len)
+ && !m_strncmp(p, "failure", len) && !m_strncmp(p, "success", len))
+ {
+ if (errbuf)
+ snprintf(errbuf, errlen, _("'%.*s' is invalid for $%s"),
+ len, p, "dsn_notify");
+ return 0;
+ }
- 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;
+ p = q + 1;
}
- list_del (&list, (list_del_t*) _mem_free);
- return (rc);
+
+ return 1;
}
static int check_num (const char* option, unsigned long p,
- char* errbuf, size_t errlen) {
+ char* errbuf, ssize_t errlen) {
if ((int) p < 0) {
if (errbuf)
snprintf (errbuf, errlen, _("'%d' is invalid for $%s"), (int) p, option);
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) {
+static int check_history (const char* option __attribute__ ((unused)), unsigned long p,
+ char* errbuf, ssize_t errlen) {
if (!check_num ("history", p, errbuf, errlen))
return (0);
mutt_init_history ();
}
static int check_special (const char* name, unsigned long val,
- char* errbuf, size_t errlen) {
+ char* errbuf, ssize_t errlen) {
int i = 0;
for (i = 0; SpecialVars[i].name; i++) {
- if (str_cmp (SpecialVars[i].name, name) == 0) {
+ if (m_strcmp(SpecialVars[i].name, name) == 0) {
return (SpecialVars[i].check (SpecialVars[i].name,
val, errbuf, errlen));
}
map = SortBrowserMethods;
break;
case DT_SORT_KEYS:
- if ((WithCrypto & APPLICATION_PGP))
- map = SortKeyMethods;
+ map = SortKeyMethods;
break;
case DT_SORT_AUX:
map = SortAuxMethods;
return (map);
}
+#define CHECK_PAGER \
+ if ((CurrentMenu == MENU_PAGER) && \
+ (!option || (option->flags & R_RESORT))) \
+ { \
+ snprintf (err->data, err->dsize, \
+ _("Not available in this menu.")); \
+ return (-1); \
+ }
+
static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
BUFFER * err)
{
query = 1;
s->dptr++;
}
- else if (str_ncmp ("no", s->dptr, 2) == 0) {
+ else if (m_strncmp("no", s->dptr, 2) == 0) {
s->dptr += 2;
unset = !unset;
}
- else if (str_ncmp ("inv", s->dptr, 3) == 0) {
+ else if (m_strncmp("inv", s->dptr, 3) == 0) {
s->dptr += 3;
inv = !inv;
}
mutt_extract_token (tmp, s, M_TOKEN_EQUAL);
/* resolve synonyms */
- if ((option = hash_find (ConfigOptions, tmp->data)) != NULL &&
- DTYPE (option->type == DT_SYN)) {
+ 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);
+ syn_t* syn = syn_new();
+ syn->f = m_strdup(CurRCFile);
+ syn->l = CurRCLine;
+ syn->n = newopt;
+ syn->o = option;
+ syn_list_push(&Synonyms, syn);
option = newopt;
}
/* see if we need to add $user_ var */
- if (!option && ascii_strncmp ("user_", tmp->data, 5) == 0) {
+ if (!option && m_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)) {
+ if (!option && !(reset && m_strcmp("all", tmp->data) == 0)) {
snprintf (err->data, err->dsize, _("%s: unknown variable"), tmp->data);
return (-1);
}
- SKIPWS (s->dptr);
+ s->dptr = vskipspaces(s->dptr);
if (reset) {
if (query || unset || inv) {
return (-1);
}
- if (!str_cmp ("all", tmp->data)) {
+ if (!m_strcmp("all", tmp->data)) {
+ if (CurrentMenu == MENU_PAGER) {
+ snprintf (err->data, err->dsize, _("Not available in this menu."));
+ return (-1);
+ }
hash_map (ConfigOptions, mutt_restore_default, 1);
+ set_option (OPTFORCEREDRAWINDEX);
+ set_option (OPTFORCEREDRAWPAGER);
+ set_option (OPTSORTSUBTHREADS);
+ set_option (OPTNEEDRESORT);
+ set_option (OPTRESORTINIT);
+ set_option (OPTREDRAWTREE);
return (0);
}
- else if (!FuncTable[DTYPE (option->type)].opt_from_string) {
+ else if (!FuncTable[DTYPE (option->type)].opt_fromstr) {
snprintf (err->data, err->dsize, _("$%s is read-only"), option->option);
r = -1;
break;
- } else
+ } else {
+ CHECK_PAGER;
mutt_restore_default (NULL, option, 1);
+ }
}
else if (DTYPE (option->type) == DT_BOOL) {
/* XXX this currently ignores the function table
return 0;
}
+ CHECK_PAGER;
if (unset)
unset_option (option->data);
else if (inv)
DTYPE (option->type) == DT_USER ||
DTYPE (option->type) == DT_SYS) {
if (unset) {
- if (!FuncTable[DTYPE (option->type)].opt_from_string) {
+ CHECK_PAGER;
+ if (!FuncTable[DTYPE (option->type)].opt_fromstr) {
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);
+ address_list_wipe((address_t **) option->data);
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);
+ p_delete((void **)(void *)&option->data);
break;
}
}
if (query || *s->dptr != '=') {
- FuncTable[DTYPE (option->type)].opt_to_string
+ FuncTable[DTYPE (option->type)].opt_tostr
(err->data, err->dsize, option);
break;
}
- /* the $muttng_ variables are read-only */
- if (!FuncTable[DTYPE (option->type)].opt_from_string) {
+ /* the $madmutt_ variables are read-only */
+ if (!FuncTable[DTYPE (option->type)].opt_fromstr) {
snprintf (err->data, err->dsize, _("$%s is read-only"),
option->option);
r = -1;
break;
} else {
+ CHECK_PAGER;
s->dptr++;
mutt_extract_token (tmp, s, 0);
- if (!FuncTable[DTYPE (option->type)].opt_from_string
+ if (!FuncTable[DTYPE (option->type)].opt_fromstr
(option, tmp->data, err->data, err->dsize))
r = -1;
}
}
if (*s->dptr == '=') {
+ CHECK_PAGER;
s->dptr++;
mutt_extract_token (tmp, s, 0);
if (ascii_strcasecmp ("yes", tmp->data) == 0)
BUFFER token;
char *linebuf = NULL;
char *currentline = NULL;
- size_t buflen;
+ ssize_t buflen;
pid_t pid;
- debug_print (2, ("reading configuration file '%s'.\n", rcfile));
-
if ((f = mutt_open_read (rcfile, &pid)) == NULL) {
snprintf (err->data, err->dsize, "%s: %s", rcfile, strerror (errno));
return (-1);
}
- memset (&token, 0, sizeof (token));
- while ((linebuf = mutt_read_line (linebuf, &buflen, f, &line)) != NULL) {
+ p_clear(&token, 1);
+ while ((linebuf = mutt_read_line(linebuf, &buflen, f, &line)) != NULL) {
conv = ConfigCharset && (*ConfigCharset) && Charset;
if (conv) {
- currentline = str_dup (linebuf);
+ currentline = m_strdup(linebuf);
if (!currentline)
continue;
mutt_convert_string (¤tline, ConfigCharset, Charset, 0);
mutt_error (_("Error in %s, line %d: %s"), rcfile, line, err->data);
if (--rc < -MAXERRS) {
if (conv)
- mem_free (¤tline);
+ p_delete(¤tline);
break;
}
}
rc = -1;
}
if (conv)
- mem_free (¤tline);
+ p_delete(¤tline);
}
- mem_free (&token.data);
- mem_free (&linebuf);
- fclose (f);
+ p_delete(&token.data);
+ p_delete(&linebuf);
+ m_fclose(&f);
if (pid != -1)
mutt_wait_filter (pid);
if (rc) {
#undef MAXERRS
-static int parse_source (BUFFER * tmp, BUFFER * s, unsigned long data,
+static int parse_source (BUFFER * tmp, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
BUFFER * err)
{
char path[_POSIX_PATH_MAX];
return (-1);
}
- strfcpy (path, tmp->data, sizeof (path));
- mutt_expand_path (path, sizeof (path));
+ m_strcpy(path, sizeof(path), tmp->data);
+ mutt_expand_path (path, sizeof(path));
rc += source_rc (path, err);
}
every call to this function.
err where to write error messages */
-int mutt_parse_rc_line ( /* const */ char *line, BUFFER * token, BUFFER * err)
+int mutt_parse_rc_line (const char *line, BUFFER * token, BUFFER * err)
{
int i, r = -1;
BUFFER expn;
- memset (&expn, 0, sizeof (expn));
+ p_clear(&expn, 1);
expn.data = expn.dptr = line;
- expn.dsize = str_len (line);
+ expn.dsize = m_strlen(line);
*err->data = 0;
- SKIPWS (expn.dptr);
+ expn.dptr = vskipspaces(expn.dptr);
while (*expn.dptr) {
if (*expn.dptr == '#')
break; /* rest of line is a comment */
}
mutt_extract_token (token, &expn, 0);
for (i = 0; Commands[i].name; i++) {
- if (!str_cmp (token->data, Commands[i].name)) {
+ if (!m_strcmp(token->data, Commands[i].name)) {
if (Commands[i].func (token, &expn, Commands[i].data, err) != 0)
goto finish;
break;
r = 0;
finish:
if (expn.destroy)
- mem_free (&expn.data);
+ p_delete(&expn.data);
return (r);
}
-#define NUMVARS (sizeof (MuttVars)/sizeof (MuttVars[0]))
-#define NUMCOMMANDS (sizeof (Commands)/sizeof (Commands[0]))
-/* initial string that starts completion. No telling how much crap
+#define NUMVARS (sizeof(MuttVars)/sizeof(MuttVars[0]))
+#define NUMCOMMANDS (sizeof(Commands)/sizeof(Commands[0]))
+/* initial string that starts completion. No telling how much crap
* the user has typed so far. Allocate LONG_STRING just to be sure! */
char User_typed[LONG_STRING] = { 0 };
int Num_matched = 0; /* Number of matches for completion */
char Completed[STRING] = { 0 }; /* completed string (command or variable) */
-char *Matches[MAX (NUMVARS, NUMCOMMANDS) + 1]; /* all the matches + User_typed */
+const char *Matches[MAX (NUMVARS, NUMCOMMANDS) + 1]; /* all the matches + User_typed */
/* helper function for completion. Changes the dest buffer if
necessary/possible to aid completion.
try == user entered data for completion.
len == length of dest buffer.
*/
-static void candidate (char *dest, char *try, char *src, int len)
+static void candidate (char *dest, char *try, const char *src, int len)
{
int l;
if (strstr (src, try) == src) {
Matches[Num_matched++] = src;
if (dest[0] == 0)
- strfcpy (dest, src, len);
+ m_strcpy(dest, len, src);
else {
for (l = 0; src[l] && src[l] == dest[l]; l++);
dest[l] = 0;
}
}
-int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
+int mutt_command_complete (char *buffer, ssize_t len, int pos, int numtabs)
{
char *pt = buffer;
int num;
int spaces; /* keep track of the number of leading spaces on the line */
- SKIPWS (buffer);
+ buffer = vskipspaces(buffer);
spaces = buffer - pt;
pt = buffer + pos - spaces;
/* first TAB. Collect all the matches */
if (numtabs == 1) {
Num_matched = 0;
- strfcpy (User_typed, pt, sizeof (User_typed));
- memset (Matches, 0, sizeof (Matches));
- memset (Completed, 0, sizeof (Completed));
+ m_strcpy(User_typed, sizeof(User_typed), pt);
+ p_clear(Matches, countof(Matches));
+ p_clear(Completed, countof(Completed));
for (num = 0; Commands[num].name; num++)
candidate (Completed, User_typed, Commands[num].name,
- sizeof (Completed));
+ sizeof(Completed));
Matches[Num_matched++] = User_typed;
/* All matches are stored. Longest non-ambiguous string is ""
/* Num_matched will _always_ be atleast 1 since the initial
* user-typed string is always stored */
if (numtabs == 1 && Num_matched == 2)
- snprintf (Completed, sizeof (Completed), "%s", Matches[0]);
+ snprintf (Completed, sizeof(Completed), "%s", Matches[0]);
else if (numtabs > 1 && Num_matched > 2)
/* cycle thru all the matches */
- snprintf (Completed, sizeof (Completed), "%s",
+ snprintf (Completed, sizeof(Completed), "%s",
Matches[(numtabs - 2) % Num_matched]);
/* return the completed command */
- strncpy (buffer, Completed, len - spaces);
+ m_strcpy(buffer, len - spaces, Completed);
}
- else if (!str_ncmp (buffer, "set", 3)
- || !str_ncmp (buffer, "unset", 5)
- || !str_ncmp (buffer, "reset", 5)
- || !str_ncmp (buffer, "toggle", 6)) { /* complete variables */
- char *prefixes[] = { "no", "inv", "?", "&", 0 };
+ else if (!m_strncmp(buffer, "set", 3)
+ || !m_strncmp(buffer, "unset", 5)
+ || !m_strncmp(buffer, "reset", 5)
+ || !m_strncmp(buffer, "toggle", 6)) { /* complete variables */
+ const char *prefixes[] = { "no", "inv", "?", "&", NULL };
pt++;
/* loop through all the possible prefixes (no, inv, ...) */
- if (!str_ncmp (buffer, "set", 3)) {
+ if (!m_strncmp(buffer, "set", 3)) {
for (num = 0; prefixes[num]; num++) {
- if (!str_ncmp (pt, prefixes[num], str_len (prefixes[num]))) {
- pt += str_len (prefixes[num]);
+ if (!m_strncmp(pt, prefixes[num], m_strlen(prefixes[num]))) {
+ pt += m_strlen(prefixes[num]);
break;
}
}
/* first TAB. Collect all the matches */
if (numtabs == 1) {
Num_matched = 0;
- strfcpy (User_typed, pt, sizeof (User_typed));
- memset (Matches, 0, sizeof (Matches));
- memset (Completed, 0, sizeof (Completed));
+ m_strcpy(User_typed, sizeof(User_typed), pt);
+ p_clear(Matches, countof(Matches));
+ p_clear(Completed, countof(Completed));
for (num = 0; MuttVars[num].option; num++)
- candidate (Completed, User_typed, MuttVars[num].option,
- sizeof (Completed));
+ candidate(Completed, User_typed, MuttVars[num].option,
+ sizeof(Completed));
Matches[Num_matched++] = User_typed;
/* All matches are stored. Longest non-ambiguous string is ""
/* Num_matched will _always_ be atleast 1 since the initial
* user-typed string is always stored */
if (numtabs == 1 && Num_matched == 2)
- snprintf (Completed, sizeof (Completed), "%s", Matches[0]);
+ snprintf (Completed, sizeof(Completed), "%s", Matches[0]);
else if (numtabs > 1 && Num_matched > 2)
/* cycle thru all the matches */
- snprintf (Completed, sizeof (Completed), "%s",
+ snprintf (Completed, sizeof(Completed), "%s",
Matches[(numtabs - 2) % Num_matched]);
- strncpy (pt, Completed, buffer + len - pt - spaces);
+ m_strcpy(pt, buffer + len - pt - spaces, Completed);
}
- else if (!str_ncmp (buffer, "exec", 4)) {
+ else if (!m_strncmp(buffer, "exec", 4)) {
struct binding_t *menu = km_get_table (CurrentMenu);
if (!menu && CurrentMenu != MENU_PAGER)
/* first TAB. Collect all the matches */
if (numtabs == 1) {
Num_matched = 0;
- strfcpy (User_typed, pt, sizeof (User_typed));
- memset (Matches, 0, sizeof (Matches));
- memset (Completed, 0, sizeof (Completed));
+ m_strcpy(User_typed, sizeof(User_typed), pt);
+ p_clear(Matches, countof(Matches));
+ p_clear(Completed, countof(Completed));
for (num = 0; menu[num].name; num++)
- candidate (Completed, User_typed, menu[num].name, sizeof (Completed));
+ candidate (Completed, User_typed, menu[num].name, sizeof(Completed));
/* try the generic menu */
if (Completed[0] == 0 && CurrentMenu != MENU_PAGER) {
menu = OpGeneric;
for (num = 0; menu[num].name; num++)
candidate (Completed, User_typed, menu[num].name,
- sizeof (Completed));
+ sizeof(Completed));
}
Matches[Num_matched++] = User_typed;
/* Num_matched will _always_ be atleast 1 since the initial
* user-typed string is always stored */
if (numtabs == 1 && Num_matched == 2)
- snprintf (Completed, sizeof (Completed), "%s", Matches[0]);
+ snprintf (Completed, sizeof(Completed), "%s", Matches[0]);
else if (numtabs > 1 && Num_matched > 2)
/* cycle thru all the matches */
- snprintf (Completed, sizeof (Completed), "%s",
+ snprintf (Completed, sizeof(Completed), "%s",
Matches[(numtabs - 2) % Num_matched]);
- strncpy (pt, Completed, buffer + len - pt - spaces);
+ m_strcpy(pt, buffer + len - pt - spaces, Completed);
}
else
return 0;
return 1;
}
-int mutt_var_value_complete (char *buffer, size_t len, int pos)
+int mutt_var_value_complete (char *buffer, ssize_t len, int pos)
{
char var[STRING], *pt = buffer;
int spaces;
if (buffer[0] == 0)
return 0;
- SKIPWS (buffer);
+ buffer = vskipspaces(buffer);
spaces = buffer - pt;
pt = buffer + pos - spaces;
if (*pt == '=') /* abort if no var before the '=' */
return 0;
- if (str_ncmp (buffer, "set", 3) == 0) {
- strfcpy (var, pt, sizeof (var));
+ if (m_strncmp(buffer, "set", 3) == 0) {
+ m_strcpy(var, sizeof(var), pt);
/* ignore the trailing '=' when comparing */
- var[str_len (var) - 1] = 0;
+ var[m_strlen(var) - 1] = 0;
if (!(option = hash_find (ConfigOptions, var)))
return 0; /* no such variable. */
else {
char tmp[LONG_STRING], tmp2[LONG_STRING];
char *s, *d;
- size_t dlen = buffer + len - pt - spaces;
- char *vals[] = { "no", "yes", "ask-no", "ask-yes" };
+ ssize_t dlen = buffer + len - pt - spaces;
+ const char *vals[] = { "no", "yes", "ask-no", "ask-yes" };
tmp[0] = '\0';
if ((DTYPE (option->type) == DT_STR) ||
(DTYPE (option->type) == DT_PATH) ||
(DTYPE (option->type) == DT_RX)) {
- strfcpy (tmp, NONULL (*((char **) option->data)), sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), NONULL(*((char **)option->data)));
if (DTYPE (option->type) == DT_PATH)
mutt_pretty_mailbox (tmp);
}
else if (DTYPE (option->type) == DT_ADDR) {
- rfc822_write_address (tmp, sizeof (tmp),
- *((ADDRESS **) option->data), 0);
+ rfc822_addrcat(tmp, sizeof(tmp), *((address_t **) option->data), 0);
}
else if (DTYPE (option->type) == DT_QUAD)
- strfcpy (tmp, vals[quadoption (option->data)], sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), vals[quadoption(option->data)]);
else if (DTYPE (option->type) == DT_NUM)
- snprintf (tmp, sizeof (tmp), "%d", (*((short *) option->data)));
+ snprintf (tmp, sizeof(tmp), "%d", (*((short *) option->data)));
else if (DTYPE (option->type) == DT_SORT) {
const struct mapping_t *map;
- char *p;
+ const char *p;
switch (option->type & DT_SUBTYPE_MASK) {
case DT_SORT_ALIAS:
map = SortBrowserMethods;
break;
case DT_SORT_KEYS:
- if ((WithCrypto & APPLICATION_PGP))
- map = SortKeyMethods;
- else
- map = SortMethods;
+ map = SortKeyMethods;
break;
default:
map = SortMethods;
break;
}
- p =
- mutt_getnamebyvalue (*((short *) option->data) & SORT_MASK,
- map);
- snprintf (tmp, sizeof (tmp), "%s%s%s",
- (*((short *) option->data) & SORT_REVERSE) ?
- "reverse-" : "",
- (*((short *) option->data) & SORT_LAST) ? "last-" :
- "", p);
- }
+ p = mutt_getnamebyvalue(*((short *) option->data) & SORT_MASK, map);
+ snprintf(tmp, sizeof(tmp), "%s%s%s",
+ (*((short *)option->data) & SORT_REVERSE) ? "reverse-" : "",
+ (*((short *)option->data) & SORT_LAST) ? "last-" : "", p);
+ }
else if (DTYPE (option->type) == DT_MAGIC) {
- char *p;
+ const char *p;
switch (DefaultMagic) {
case M_MBOX:
p = "mbox";
default:
p = "unknown";
}
- strfcpy (tmp, p, sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), p);
}
else if (DTYPE (option->type) == DT_BOOL)
- strfcpy (tmp, option (option->data) ? "yes" : "no",
- sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), option(option->data) ? "yes" : "no");
else
return 0;
- for (s = tmp, d = tmp2; *s && (d - tmp2) < sizeof (tmp2) - 2;) {
+ for (s = tmp, d = tmp2; *s && (d - tmp2) < ssizeof(tmp2) - 2;) {
if (*s == '\\' || *s == '"')
*d++ = '\\';
*d++ = *s++;
}
*d = '\0';
- strfcpy (tmp, pt, sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), pt);
snprintf (pt, dlen, "%s\"%s\"", tmp, tmp2);
return 1;
}
/* Implement the -Q command line flag */
-int mutt_query_variables (LIST * queries)
+int mutt_query_variables (string_list_t * queries)
{
- LIST *p;
+ string_list_t *p;
char errbuff[STRING];
char command[STRING];
BUFFER err, token;
- memset (&err, 0, sizeof (err));
- memset (&token, 0, sizeof (token));
+ p_clear(&err, 1);
+ p_clear(&token, 1);
err.data = errbuff;
- err.dsize = sizeof (errbuff);
+ err.dsize = sizeof(errbuff);
for (p = queries; p; p = p->next) {
- snprintf (command, sizeof (command), "set ?%s\n", p->data);
+ snprintf (command, sizeof(command), "set ?%s\n", p->data);
if (mutt_parse_rc_line (command, &token, &err) == -1) {
fprintf (stderr, "%s\n", err.data);
- mem_free (&token.data);
+ p_delete(&token.data);
return 1;
}
printf ("%s\n", err.data);
}
- mem_free (&token.data);
+ p_delete(&token.data);
return 0;
}
-char *mutt_getnamebyvalue (int val, const struct mapping_t *map)
-{
- int i;
-
- for (i = 0; map[i].name; i++)
- if (map[i].value == val)
- return (map[i].name);
- return NULL;
-}
-
-int mutt_getvaluebyname (const char *name, const struct mapping_t *map)
-{
- int i;
-
- for (i = 0; map[i].name; i++)
- if (ascii_strcasecmp (map[i].name, name) == 0)
- return (map[i].value);
- return (-1);
-}
-
-static int mutt_execute_commands (LIST * p)
+static int mutt_execute_commands (string_list_t * p)
{
BUFFER err, token;
- char errstr[SHORT_STRING];
+ char errstr[STRING];
- memset (&err, 0, sizeof (err));
+ p_clear(&err, 1);
err.data = errstr;
- err.dsize = sizeof (errstr);
- memset (&token, 0, sizeof (token));
+ err.dsize = sizeof(errstr);
+ p_clear(&token, 1);
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);
- mem_free (&token.data);
+ p_delete(&token.data);
return (-1);
}
}
- mem_free (&token.data);
+ p_delete(&token.data);
return 0;
}
-void mutt_init (int skip_sys_rc, LIST * commands)
+#include "parse.h"
+#include "rcparser.h"
+
+void mutt_init (int skip_sys_rc, string_list_t * commands)
{
struct passwd *pw;
struct utsname utsname;
- char *p, buffer[STRING], error[STRING];
- int i, default_rc = 0, need_pause = 0;
+ const char *p;
+ char buffer[STRING], error[STRING];
+ int default_rc = 0, need_pause = 0;
+ int i;
BUFFER err;
- memset (&err, 0, sizeof (err));
+ p_clear(&err, 1);
err.data = error;
- err.dsize = sizeof (error);
+ err.dsize = sizeof(error);
- /* use 3*sizeof(muttvars) instead of 2*sizeof()
+ /* use 3*sizeof(muttvars) instead of 2*sizeof()
* to have some room for $user_ vars */
- ConfigOptions = hash_create (sizeof (MuttVars) * 3);
+ ConfigOptions = hash_create (sizeof(MuttVars) * 3);
for (i = 0; MuttVars[i].option; i++) {
if (DTYPE (MuttVars[i].type) != DT_SYS)
hash_insert (ConfigOptions, MuttVars[i].option, &MuttVars[i], 0);
DT_SYS, 0), 0);
}
- /*
+ /*
* XXX - use something even more difficult to predict?
*/
- snprintf (AttachmentMarker, sizeof (AttachmentMarker),
+ snprintf (AttachmentMarker, sizeof(AttachmentMarker),
"\033]9;%ld\a", (long) time (NULL));
/* on one of the systems I use, getcwd() does not return the same prefix
as is listed in the passwd file */
if ((p = getenv ("HOME")))
- Homedir = str_dup (p);
+ Homedir = m_strdup(p);
/* Get some information about the user */
if ((pw = getpwuid (getuid ()))) {
char rnbuf[STRING];
- Username = str_dup (pw->pw_name);
+ Username = m_strdup(pw->pw_name);
if (!Homedir)
- Homedir = str_dup (pw->pw_dir);
+ Homedir = m_strdup(pw->pw_dir);
- Realname = str_dup (mutt_gecos_name (rnbuf, sizeof (rnbuf), pw));
- Shell = str_dup (pw->pw_shell);
+ mutt_gecos_name(rnbuf, sizeof(rnbuf), pw, GecosMask.rx);
+ Realname = m_strdup(rnbuf);
+ Shell = m_strdup(pw->pw_shell);
+ endpwent ();
}
else {
if (!Homedir) {
exit (1);
}
if ((p = getenv ("USER")))
- Username = str_dup (p);
+ Username = m_strdup(p);
else {
mutt_endwin (NULL);
fputs (_("unable to determine username"), stderr);
exit (1);
}
- Shell = str_dup ((p = getenv ("SHELL")) ? p : "/bin/sh");
+ Shell = m_strdup((p = getenv ("SHELL")) ? p : "/bin/sh");
}
- debug_start(Homedir);
-
/* And about the host... */
uname (&utsname);
/* some systems report the FQDN instead of just the hostname */
if ((p = strchr (utsname.nodename, '.'))) {
- Hostname = str_substrdup (utsname.nodename, p);
+ Hostname = p_dupstr(utsname.nodename, p - utsname.nodename);
p++;
- strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */
+ m_strcpy(buffer, sizeof(buffer), p); /* save the domain for below */
}
else
- Hostname = str_dup (utsname.nodename);
+ Hostname = m_strdup(utsname.nodename);
-#ifndef DOMAIN
-#define DOMAIN buffer
- if (!p && getdnsdomainname (buffer, sizeof (buffer)) == -1)
- Fqdn = str_dup ("@");
+ if (!p && getdnsdomainname(buffer, sizeof(buffer)) == -1)
+ Fqdn = m_strdup("@");
else
-#endif /* DOMAIN */
- if (*DOMAIN != '@') {
- Fqdn = mem_malloc (str_len (DOMAIN) + str_len (Hostname) + 2);
- sprintf (Fqdn, "%s.%s", NONULL (Hostname), DOMAIN); /* __SPRINTF_CHECKED__ */
+ if (*buffer != '@') {
+ Fqdn = p_new(char, m_strlen(buffer) + m_strlen(Hostname) + 2);
+ sprintf (Fqdn, "%s.%s", NONULL(Hostname), buffer);
}
else
- Fqdn = str_dup (NONULL (Hostname));
+ Fqdn = m_strdup(NONULL (Hostname));
#ifdef USE_NNTP
{
FILE *f;
- char *i;
+ char *q;
if ((f = safe_fopen (SYSCONFDIR "/nntpserver", "r"))) {
buffer[0] = '\0';
- fgets (buffer, sizeof (buffer), f);
- p = (char*) &buffer;
- SKIPWS (p);
- i = p;
- while (*i && (*i != ' ') && (*i != '\t') && (*i != '\r')
- && (*i != '\n'))
- i++;
- *i = '\0';
- NewsServer = str_dup (p);
- fclose (f);
+ fgets (buffer, sizeof(buffer), f);
+ p = vskipspaces(buffer);
+ q = (char*)p;
+ while (*q && !isspace(*q))
+ q++;
+ *q = '\0';
+ NewsServer = m_strdup(p);
+ m_fclose(&f);
}
}
if ((p = getenv ("NNTPSERVER")))
- NewsServer = str_dup (p);
+ NewsServer = m_strdup(p);
#endif
if ((p = getenv ("MAIL")))
- Spoolfile = str_dup (p);
+ Spoolfile = m_strdup(p);
else if ((p = getenv ("MAILDIR")))
- Spoolfile = str_dup (p);
+ Spoolfile = m_strdup(p);
else {
#ifdef HOMESPOOL
- mutt_concat_path (buffer, NONULL (Homedir), MAILPATH, sizeof (buffer));
+ mutt_concat_path(buffer, sizeof(buffer), NONULL(Homedir), MAILPATH);
#else
- mutt_concat_path (buffer, MAILPATH, NONULL (Username), sizeof (buffer));
+ mutt_concat_path(buffer, sizeof(buffer), MAILPATH, NONULL(Username));
#endif
- Spoolfile = str_dup (buffer);
+ Spoolfile = m_strdup(buffer);
}
if ((p = getenv ("MAILCAPS")))
- MailcapPath = str_dup (p);
+ MailcapPath = m_strdup(p);
else {
/* Default search path from RFC1524 */
MailcapPath =
- str_dup ("~/.mailcap:" PKGDATADIR "/mailcap:" SYSCONFDIR
+ m_strdup("~/.mailcap:" PKGDATADIR "/mailcap:" SYSCONFDIR
"/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap");
}
- Tempdir = str_dup ((p = getenv ("TMPDIR")) ? p : "/tmp");
+ Tempdir = m_strdup((p = getenv ("TMPDIR")) ? p : "/tmp");
p = getenv ("VISUAL");
if (!p) {
if (!p)
p = "vi";
}
- Editor = str_dup (p);
- Visual = str_dup (p);
+ Editor = m_strdup(p);
if ((p = getenv ("REPLYTO")) != NULL) {
BUFFER buf, token;
- snprintf (buffer, sizeof (buffer), "Reply-To: %s", p);
+ snprintf (buffer, sizeof(buffer), "Reply-To: %s", p);
- memset (&buf, 0, sizeof (buf));
+ p_clear(&buf, 1);
buf.data = buf.dptr = buffer;
- buf.dsize = str_len (buffer);
+ buf.dsize = m_strlen(buffer);
- memset (&token, 0, sizeof (token));
+ p_clear(&token, 1);
parse_my_hdr (&token, &buf, 0, &err);
- mem_free (&token.data);
+ p_delete(&token.data);
}
if ((p = getenv ("EMAIL")) != NULL)
From = rfc822_parse_adrlist (NULL, p);
- mutt_set_langinfo_charset ();
- mutt_set_charset (Charset);
-
+ charset_initialize();
/* Set standard defaults */
hash_map (ConfigOptions, mutt_set_default, 0);
CurrentMenu = MENU_MAIN;
-
-#ifndef LOCALES_HACK
- /* Do we have a locale definition? */
- if (((p = getenv ("LC_ALL")) != NULL && p[0]) ||
- ((p = getenv ("LANG")) != NULL && p[0]) ||
- ((p = getenv ("LC_CTYPE")) != NULL && p[0]))
- set_option (OPTLOCALES);
-#endif
-
#ifdef HAVE_GETSID
/* Unset suspend by default if we're the session leader */
if (getsid (0) == getpid ())
mutt_init_history ();
-
-
-
- /*
- *
- * BIG FAT WARNING
- *
- * When changing the code which looks for a configuration file,
- * please also change the corresponding code in muttbug.sh.in.
- *
- *
- */
-
-
-
-
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);
+ snprintf (buffer, sizeof(buffer), "%s/.madmuttrc", NONULL (Homedir));
if (access (buffer, F_OK) == -1)
-#endif
- snprintf (buffer, sizeof (buffer), "%s/.muttng/muttngrc",
+ snprintf (buffer, sizeof(buffer), "%s/.madmutt/madmuttrc",
NONULL (Homedir));
default_rc = 1;
- Muttrc = str_dup (buffer);
+ Muttrc = m_strdup(buffer);
}
else {
- strfcpy (buffer, Muttrc, sizeof (buffer));
- mem_free (&Muttrc);
- mutt_expand_path (buffer, sizeof (buffer));
- Muttrc = str_dup (buffer);
+ m_strcpy(buffer, sizeof(buffer), Muttrc);
+ p_delete(&Muttrc);
+ mutt_expand_path (buffer, sizeof(buffer));
+ Muttrc = m_strdup(buffer);
}
- mem_free (&AliasFile);
- AliasFile = str_dup (NONULL (Muttrc));
+ p_delete(&AliasFile);
+ AliasFile = m_strdup(NONULL (Muttrc));
/* Process the global rc file if it exists and the user hasn't explicity
requested not to via "-n". */
if (!skip_sys_rc) {
- snprintf (buffer, sizeof (buffer), "%s/Muttngrc-%s", SYSCONFDIR,
+ snprintf (buffer, sizeof(buffer), "%s/Madmuttrc-%s", SYSCONFDIR,
MUTT_VERSION);
if (access (buffer, F_OK) == -1)
- snprintf (buffer, sizeof (buffer), "%s/Muttngrc", SYSCONFDIR);
+ snprintf (buffer, sizeof(buffer), "%s/Madmuttrc", SYSCONFDIR);
if (access (buffer, F_OK) == -1)
- snprintf (buffer, sizeof (buffer), "%s/Muttngrc-%s", PKGDATADIR,
+ snprintf (buffer, sizeof(buffer), "%s/Madmuttrc-%s", PKGDATADIR,
MUTT_VERSION);
if (access (buffer, F_OK) == -1)
- snprintf (buffer, sizeof (buffer), "%s/Muttngrc", PKGDATADIR);
+ snprintf (buffer, sizeof(buffer), "%s/Madmuttrc", PKGDATADIR);
if (access (buffer, F_OK) != -1) {
if (source_rc (buffer, &err) != 0) {
fputs (err.data, stderr);
}
}
+#if 0
+ {
+ void *parser = rcparseAlloc(malloc);
+ struct rcstate state;
+ segment s1 = {" ", 1};
+ segment s2 = {"toto", 4 };
+ segment s3 = {"titi", 4 };
+ segment s4 = {"\"", 1 };
+
+ mutt_endwin(NULL);
+
+ p_clear(&state, 1);
+
+ rcparseTrace(stderr, "> ");
+ rcparse(parser, RCTK_ALTERNATIVE_ORDER, s1, &state);
+ rcparse(parser, RCTK_SPACE, s1, &state);
+ rcparse(parser, RCTK_ATOM, s2, &state);
+ rcparse(parser, RCTK_SPACE, s1, &state);
+ rcparse(parser, RCTK_DQUOTE, s4, &state);
+ rcparse(parser, RCTK_ATOM, s3, &state);
+ rcparse(parser, RCTK_SPACE, s1, &state);
+ rcparse(parser, RCTK_ATOM, s3, &state);
+ rcparse(parser, RCTK_DQUOTE, s4, &state);
+ rcparse(parser, RCTK_NL, s1, &state);
+ rcparse(parser, 0, s1, &state);
+
+ exit(0);
+ }
+#endif
+
/* Read the user's initialization file. */
if (access (Muttrc, F_OK) != -1) {
if (!option (OPTNOCURSES))
}
else if (!default_rc) {
/* file specified by -F does not exist */
- snprintf (buffer, sizeof (buffer), "%s: %s", Muttrc, strerror (errno));
+ snprintf (buffer, sizeof(buffer), "%s: %s", Muttrc, strerror (errno));
mutt_endwin (buffer);
exit (1);
}
need_pause = 1;
/* warn about synonym variables */
- if (!list_empty(Synonyms)) {
- int 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;
}
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)
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));
-}
-
-/* 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;
-
- 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, 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 (str_cmp (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) {
- int 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_tostr(buf, sizeof(buf), option);
+ printf ("%s\n", buf);
}
- }
- list_del (&tmp, NULL);
- return 0;
+
+ printf ("\n# vi""m:set ft=muttrc:\n");
+ return 0;
}