#include <lib-ui/curses.h>
#include <lib-ui/history.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
#include "keymap.h"
#endif
#include "alias.h"
-#include "mx.h"
#include "init.h"
-#include "lib/list.h"
-
/*
* prototypes
*/
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 */
static struct {
unsigned short type;
- void (*opt_to_string) (char* dst, ssize_t dstlen, struct option_t* option);
- int (*opt_from_string) (struct option_t* dst, const char* val,
+ 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 */
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);
int clean = 0;
/* get some $madmutt_ values dynamically */
- if (ascii_strcmp ("madmutt_pwd", option->option) == 0) {
+ 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 (ascii_strcmp ("madmutt_folder_path", option->option) == 0 &&
+ } else if (m_strcmp("madmutt_folder_path", option->option) == 0 &&
CurrentFolder && *CurrentFolder) {
val = CurrentFolder;
- } else if (ascii_strcmp ("madmutt_folder_name", option->option) == 0 &&
+ } else if (m_strcmp("madmutt_folder_name", option->option) == 0 &&
CurrentFolder && *CurrentFolder) {
ssize_t Maildirlength = m_strlen(Maildir);
Maildirlength) == 0 &&
m_strlen(CurrentFolder) > Maildirlength) {
val = CurrentFolder + Maildirlength;
- if (Maildir[strlen(Maildir)-1]!='/')
+ if (Maildir[Maildirlength]!='/')
val += 1;
/* if not $folder, just use everything after last / */
} else if ((t = strrchr (CurrentFolder, '/')) != NULL)
if (!dst)
return (0);
- if (!val || !*val) {
+ if (m_strisempty(val)) {
p_delete((char**) dst->data);
return (1);
}
p = (rx_t*) dst->data;
/* something to do? */
- if (!val || !*val || (p->pattern && m_strcmp(p->pattern, val) == 0))
+ if (m_strisempty(val) || (p->pattern && m_strcmp(p->pattern, val) == 0))
return (1);
if (m_strcmp(dst->option, "mask") != 0)
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;
struct option_t* option) {
char s[HUGE_STRING];
s[0] = '\0';
- rfc822_write_address (s, sizeof(s), *((address_t**) option->data), 0);
+ rfc822_addrcat(s, sizeof(s), *((address_t**) option->data), 0);
snprintf (dst, dstlen, "%s=\"%s\"", option->option, NONULL (s));
}
return (0);
}
tmp = p_new(char, dstlen+1);
- FuncTable[DTYPE (option->type)].opt_to_string (tmp, dstlen, option);
+ 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 */
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 = p_new(syn_t, 1);
- tmp->f = m_strdup(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) {
- p_delete(&(*(syn_t**) p)->f);
- p_delete(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 (string_list_t ** list, const char *str)
+static void add_to_list(string_list_t **list, const char *str)
{
- string_list_t *t, *last = NULL;
-
- /* don't add a NULL or empty string to the list */
- if (!str || *str == '\0')
- return;
+ /* 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 */
- 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;
+ /* 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 = p_new(string_list_t, 1);
- t->data = m_strdup(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_delete(&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;
+ rx_t *rx;
- if (!pat || !*pat || !templ)
- return 0;
-
- 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;
- p_delete(&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 = m_strdup(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 && !m_strcmp(spam->rx->pattern, pat)) {
- *list = spam->next;
- rx_delete(&spam->rx);
- p_delete(&spam->template);
- p_delete(&spam);
- return 1;
- }
-
- prev = spam;
- for (spam = prev->next; spam;) {
- if (!m_strcmp(spam->rx->pattern, pat)) {
- prev->next = spam->next;
- rx_delete(&spam->rx);
- p_delete(&spam->template);
- p_delete(&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 (string_list_t ** l, const char *str)
+static void remove_from_list(string_list_t **l, const char *str)
{
- string_list_t *p, *last = NULL;
-
- if (m_strcmp("*", str) == 0)
- string_list_wipe(l); /* ``unCMD *'' means delete all current entries */
- else {
- p = *l;
- last = NULL;
- while (p) {
- if (ascii_strcasecmp (str, p->data) == 0) {
- p_delete(&p->data);
- if (last)
- last->next = p->next;
- else
- (*l) = p->next;
- p_delete(&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 (m_strcmp("*", str) == 0) {
- list_del (l, (list_del_t*) rx_delete);
- return (0);
- }
- else {
- i = rx_lookup ((*l), str);
- if (i >= 0) {
- rx_t* r = list_pop_idx ((*l), i);
- rx_delete(&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;
- unsigned long res = 0;
- BUFFER token;
- struct option_t* option = NULL;
-
- p_clear(&token, 1);
- mutt_extract_token (tmp, s, 0);
-
- /* is the item defined as a variable or a function? */
- if ((option = hash_find (ConfigOptions, tmp->data)) != NULL)
- 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, m_strlen(tmp->data))
- && (m_strlen(b[j].name) == m_strlen(tmp->data))) {
- res = 1;
- break;
- }
- }
- }
- /* check for feature_* */
- if (!res && ascii_strncasecmp (tmp->data, "feature_", 8) == 0 &&
- (j = m_strlen(tmp->data)) > 8) {
- i = 0;
- while (Features[i]) {
- if (m_strlen(Features[i]) == j-8 &&
- ascii_strncasecmp (Features[i], tmp->data+8, j-8) == 0) {
- 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) {
- if (mutt_parse_rc_line (tmp->data, &token, err) == -1) {
- mutt_error ("Error: %s", err->data);
- p_delete(&token.data);
- return (-1);
+ l = rx_lookup(l, str);
+ if (l) {
+ rx_t *r = rx_list_pop(l);
+ rx_delete(&r);
+ return 0;
}
- p_delete(&token.data);
- }
- return 0;
+
+ return -1;
}
static int parse_unignore (BUFFER * buf, BUFFER * s,
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;
}
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 __attribute__ ((unused)),
- BUFFER * err __attribute__ ((unused)))
+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 ((string_list_t **) data, buf->data);
- }
- while (MoreArgs (s));
-
+ } while (MoreArgs(s));
return 0;
}
/* "*" is a special case. */
if (!m_strcmp(buf->data, "*")) {
- mutt_free_spam_list (&SpamList);
- list_del (&NoSpamList, (list_del_t*) rx_delete);
+ rx_list_wipe(&SpamList);
+ rx_list_wipe(&NoSpamList);
return 0;
}
len = m_strlen(a->minor);
tmpminor = p_new(char, len + 3);
- strcpy(&tmpminor[1], a->minor); /* __STRCPY_CHECKED__ */
+ m_strcpy(&tmpminor[1], len + 3, a->minor);
tmpminor[0] = '^';
tmpminor[len+1] = '$';
tmpminor[len+2] = '\0';
unsigned long data __attribute__ ((unused)),
BUFFER * err __attribute__ ((unused)))
{
- alias_t *tmp, *last = NULL;
-
- 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;
- }
- else
- for (tmp = Aliases; tmp; tmp = tmp->next) {
- if (m_strcasecmp(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;
- alias_list_wipe(&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 __attribute__ ((unused)),
BUFFER * err)
{
- alias_t *tmp = Aliases;
- alias_t *last = NULL;
- char *estr = NULL;
+ alias_t **last;
+ char *estr = NULL;
- if (!MoreArgs (s)) {
- m_strcpy(err->data, err->dsize, _("alias: no address"));
- return (-1);
- }
+ if (!MoreArgs (s)) {
+ m_strcpy(err->data, err->dsize, _("alias: no address"));
+ return (-1);
+ }
- mutt_extract_token (buf, s, 0);
+ mutt_extract_token (buf, s, 0);
- /* check to see if an alias with this name already exists */
- for (; tmp; tmp = tmp->next) {
- if (!m_strcasecmp(tmp->name, buf->data))
- break;
- last = tmp;
- }
+ /* 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;
+ }
- if (!tmp) {
- /* create a new alias */
- tmp = alias_new();
- tmp->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(&tmp->addr);
- if (CurrentMenu == MENU_ALIAS)
- set_option (OPTFORCEREDRAWINDEX);
- }
+ 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);
+ }
- mutt_extract_token (buf, s,
- M_TOKEN_QUOTE | M_TOKEN_SPACE | M_TOKEN_SEMICOLON);
- 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);
- p_delete(&estr);
- return -1;
- }
+ 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;
+ }
- return 0;
+ return 0;
}
static int
-parse_unmy_hdr (BUFFER * buf, BUFFER * s,
- unsigned long data __attribute__ ((unused)),
- BUFFER * err __attribute__ ((unused)))
+parse_unmy_hdr(BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
- string_list_t *last = NULL;
- string_list_t *tmp = UserHeader;
- string_list_t *ptr;
- ssize_t l;
-
- do {
- mutt_extract_token (buf, s, 0);
- if (m_strcmp("*", buf->data) == 0)
- string_list_wipe(&UserHeader);
- else {
- tmp = UserHeader;
- last = NULL;
-
- l = m_strlen(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;
- string_list_wipe(&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 __attribute__ ((unused)),
return;
ptr = hash_find(ConfigOptions, (const char *)ptr->data);
}
- if (!ptr || *ptr->init || !FuncTable[DTYPE (ptr->type)].opt_from_string)
+ if (!ptr || *ptr->init || !FuncTable[DTYPE (ptr->type)].opt_fromstr)
return;
mutt_option_value(ptr->option, buf, sizeof(buf));
}
if (!ptr)
return;
- if (FuncTable[DTYPE (ptr->type)].opt_from_string) {
+ if (FuncTable[DTYPE (ptr->type)].opt_fromstr) {
init_expand (&init, ptr);
- if (!FuncTable[DTYPE (ptr->type)].opt_from_string (ptr, init, errbuf,
+ if (!FuncTable[DTYPE (ptr->type)].opt_fromstr (ptr, init, errbuf,
sizeof(errbuf))) {
if (!option (OPTNOCURSES))
mutt_endwin (NULL);
}
/* check whether value for $dsn_notify would be valid */
-static int check_dsn_notify (const char* option __attribute__ ((unused)), unsigned long p,
- char* errbuf, ssize_t errlen) {
- list2_t* list = NULL;
- ssize_t i = 0;
- int 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 (m_strncmp(list->data[i], "never", 5) != 0 &&
- m_strncmp(list->data[i], "failure", 7) != 0 &&
- m_strncmp(list->data[i], "delay", 5) != 0 &&
- m_strncmp(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*)xmemfree);
- return (rc);
+
+ return 1;
}
static int check_num (const char* option, unsigned long p,
/* resolve synonyms */
if ((option = hash_find (ConfigOptions, tmp->data)) != NULL &&
- DTYPE (option->type == DT_SYN)) {
+ 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 != '=')) {
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;
DTYPE (option->type) == DT_SYS) {
if (unset) {
CHECK_PAGER;
- if (!FuncTable[DTYPE (option->type)].opt_from_string) {
+ if (!FuncTable[DTYPE (option->type)].opt_fromstr) {
snprintf (err->data, err->dsize, _("$%s is read-only"),
option->option);
r = -1;
}
if (query || *s->dptr != '=') {
- FuncTable[DTYPE (option->type)].opt_to_string
+ FuncTable[DTYPE (option->type)].opt_tostr
(err->data, err->dsize, option);
break;
}
/* the $madmutt_ variables are read-only */
- if (!FuncTable[DTYPE (option->type)].opt_from_string) {
+ if (!FuncTable[DTYPE (option->type)].opt_fromstr) {
snprintf (err->data, err->dsize, _("$%s is read-only"),
option->option);
r = -1;
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;
}
}
p_delete(&token.data);
p_delete(&linebuf);
- fclose (f);
+ m_fclose(&f);
if (pid != -1)
mutt_wait_filter (pid);
if (rc) {
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;
mutt_pretty_mailbox (tmp);
}
else if (DTYPE (option->type) == DT_ADDR) {
- rfc822_write_address (tmp, sizeof(tmp),
- *((address_t **) option->data), 0);
+ rfc822_addrcat(tmp, sizeof(tmp), *((address_t **) option->data), 0);
}
else if (DTYPE (option->type) == DT_QUAD)
m_strcpy(tmp, sizeof(tmp), vals[quadoption(option->data)]);
static int mutt_execute_commands (string_list_t * p)
{
BUFFER err, token;
- char errstr[SHORT_STRING];
+ char errstr[STRING];
p_clear(&err, 1);
err.data = errstr;
return 0;
}
+#include "parse.h"
+#include "rcparser.h"
+
void mutt_init (int skip_sys_rc, string_list_t * commands)
{
struct passwd *pw;
else
if (*buffer != '@') {
Fqdn = p_new(char, m_strlen(buffer) + m_strlen(Hostname) + 2);
- sprintf (Fqdn, "%s.%s", NONULL(Hostname), buffer); /* __SPRINTF_CHECKED__ */
+ sprintf (Fqdn, "%s.%s", NONULL(Hostname), buffer);
}
else
Fqdn = m_strdup(NONULL (Hostname));
q++;
*q = '\0';
NewsServer = m_strdup(p);
- fclose (f);
+ m_fclose(&f);
}
}
if ((p = getenv ("NNTPSERVER")))
mutt_init_history ();
if (!Muttrc) {
-#if 0
- snprintf (buffer, sizeof(buffer), "%s/.madmuttrc-%s", NONULL (Homedir),
- MUTT_VERSION);
- if (access (buffer, F_OK) == -1)
-#endif
snprintf (buffer, sizeof(buffer), "%s/.madmuttrc", NONULL (Homedir));
if (access (buffer, F_OK) == -1)
-#if 0
- snprintf (buffer, sizeof(buffer), "%s/.madmutt/madmuttrc-%s",
- NONULL (Homedir), MUTT_VERSION);
- if (access (buffer, F_OK) == -1)
-#endif
snprintf (buffer, sizeof(buffer), "%s/.madmutt/madmuttrc",
NONULL (Homedir));
}
}
+#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))
need_pause = 1;
/* warn about synonym variables */
- if (!list_empty(Synonyms)) {
- 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 (m_strcmp((*(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 __attribute__ ((unused)),
- 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 __attribute__ ((unused)),
- 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 (m_strcmp(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) {
- ssize_t 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;
}