X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=61d1f0a803843ea23f9c823579a6444b7e752c14;hp=983a620a7a59bef934e3a06fc50e1f3732b06e8e;hb=56ac9bea51f338d488828ad1114d58b4a9542209;hpb=3984877e812b0ba73b84539d231aeca3c2de6b9b diff --git a/init.c b/init.c index 983a620..61d1f0a 100644 --- a/init.c +++ b/init.c @@ -13,17 +13,18 @@ #include #include +#include #include #include - #include #include +#include +#include #include "mutt.h" #include "keymap.h" #include "charset.h" #include "thread.h" -#include #include "mutt_idna.h" #if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS)) @@ -31,7 +32,6 @@ #endif #include "alias.h" -#include "mx.h" #include "init.h" /* @@ -42,7 +42,7 @@ static int parse_sort (struct option_t* dst, const char *s, const struct mapping_t *map, char* errbuf, ssize_t errlen); -static HASH *ConfigOptions = NULL; +static hash_t *ConfigOptions = NULL; /* for synonym warning reports: synonym found during parsing */ typedef struct syn_t { @@ -112,8 +112,6 @@ 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, @@ -134,13 +132,11 @@ static int magic_from_string (struct option_t* dst, const char* val, char* errbuf, ssize_t errlen); static int addr_from_string (struct option_t* dst, const char* val, char* errbuf, ssize_t errlen); -static int user_from_string (struct option_t* dst, const char* val, - char* errbuf, ssize_t errlen); 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 */ @@ -156,8 +152,6 @@ static struct { * but must define it as DT_ is used for indexing */ { DT_SYN, NULL, NULL }, { DT_ADDR, addr_to_string, addr_from_string }, - { DT_USER, user_to_string, user_from_string }, - { DT_SYS, sys_to_string, NULL }, }; static void bool_to_string (char* dst, ssize_t dstlen, @@ -206,7 +200,7 @@ static int num_from_string (struct option_t* dst, const char* val, 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); @@ -233,55 +227,6 @@ static void str_to_string (char* dst, ssize_t dstlen, NONULL (*((char**) option->data))); } -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, ssize_t dstlen, - struct option_t* option) { - 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 __attribute__ ((unused)), ssize_t errlen __attribute__ ((unused))) { char path[_POSIX_PATH_MAX]; @@ -289,7 +234,7 @@ static int path_from_string (struct option_t* dst, const char* val, if (!dst) return (0); - if (!val || !*val) { + if (m_strisempty(val)) { p_delete((char**) dst->data); return (1); } @@ -313,24 +258,6 @@ static int str_from_string (struct option_t* dst, const char* val, return (1); } -static int user_from_string (struct option_t* dst, const char* val, - 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 (m_strlen((char*) dst->data) == 0) - dst->data = (unsigned long) m_strdup(val); - else { - char* s = (char*) dst->data; - m_strreplace(&s, val); - } - if (m_strlen(dst->init) == 0) - dst->init = m_strdup((char*) dst->data); - return (1); -} - static void quad_to_string (char* dst, ssize_t dstlen, struct option_t* option) { const char *vals[] = { "no", "yes", "ask-no", "ask-yes" }; @@ -423,7 +350,7 @@ static int rx_from_string (struct option_t* dst, const char* val, 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) @@ -476,7 +403,7 @@ static int magic_from_string (struct option_t* dst, const char* val, 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; @@ -499,7 +426,7 @@ 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_t**) option->data), 0); + rfc822_addrcat(s, sizeof(s), *((address_t**) option->data), 0); snprintf (dst, dstlen, "%s=\"%s\"", option->option, NONULL (s)); } @@ -523,7 +450,7 @@ int mutt_option_value (const char* val, char* dst, ssize_t dstlen) { 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 */ @@ -567,6 +494,22 @@ int quadoption (int opt) return (QuadOptions[n] >> b) & 0x3; } +int query_quadoption2(int opt, const char *prompt) +{ + int v = mlua_reggeti(opt); + + switch (v) { + case M_YES: + case M_NO: + return (v); + + default: + v = mutt_yesorno(prompt, (v == M_ASKYES)); + CLEARLINE (LINES - 1); + return (v); + } +} + int query_quadoption (int opt, const char *prompt) { int v = quadoption (opt); @@ -585,43 +528,29 @@ int query_quadoption (int opt, const char *prompt) /* 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(rx_t **list, const char *s, int flags, BUFFER *err) { - rx_t* rx; + rx_t *rx; - if (!s || !*s) + if (m_strisempty(s)) return 0; if (rx_lookup(list, s)) @@ -637,131 +566,67 @@ add_to_rx_list(rx_t **list, const char *s, int flags, BUFFER *err) 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; - 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)) { + string_list_wipe(l); /* ``unCMD *'' means delete all current entries */ + return; + } - 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; - } + while (*l) { + if (!ascii_strcasecmp(str, (*l)->data)) { + string_list_t *it = string_list_pop(l); + string_item_delete(&it); + } else { + l = &(*l)->next; + } } - } } static int remove_from_rx_list(rx_t **l, const char *str) @@ -781,70 +646,6 @@ static int remove_from_rx_list(rx_t **l, const char *str) return -1; } -static int parse_ifdef (BUFFER * tmp, BUFFER * s, unsigned long data, - BUFFER * err) -{ - 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 (!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); - } - p_delete(&token.data); - } - return 0; -} - static int parse_unignore (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)), BUFFER * err __attribute__ ((unused))) @@ -853,12 +654,11 @@ 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; } @@ -871,22 +671,17 @@ static int parse_ignore (BUFFER * buf, BUFFER * s, 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; } @@ -983,7 +778,7 @@ static int parse_spam_list (BUFFER * buf, BUFFER * s, unsigned long data, /* "*" is a special case. */ if (!m_strcmp(buf->data, "*")) { - mutt_free_spam_list (&SpamList); + rx_list_wipe(&SpamList); rx_list_wipe(&NoSpamList); return 0; } @@ -1089,7 +884,7 @@ static int parse_attach_list (BUFFER *buf, BUFFER *s, string_list_t **ldata, 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'; @@ -1330,142 +1125,117 @@ static int parse_unalias (BUFFER * buf, BUFFER * s, 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)), @@ -1543,7 +1313,7 @@ static void mutt_set_default(const char *name __attribute__ ((unused)), void* p, 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)); @@ -1551,32 +1321,6 @@ static void mutt_set_default(const char *name __attribute__ ((unused)), void* p, ptr->init = m_strdup(buf); } -static struct option_t* add_option (const char* name, const char* init, - short type, short dodup) { - struct option_t* option = p_new(struct option_t, 1); - - option->option = m_strdup(name); - option->type = type; - if (init) - option->init = dodup ? m_strdup(init) : (char*) init; - return (option); -} - -/* creates new option_t* of type DT_USER for $user_ var */ -static struct option_t* add_user_option (const char* name) { - return (add_option (name, NULL, DT_USER, 1)); -} - -/* free()'s option_t* */ -static void del_option (void* p) { - struct option_t *ptr = (struct option_t*) p; - char* s = (char*) ptr->data; - 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; @@ -1624,9 +1368,9 @@ static void mutt_restore_default (const char* name __attribute__ ((unused)), } 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); @@ -1792,25 +1536,15 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data, DTYPE (option->type == DT_SYN)) { struct option_t* newopt = hash_find (ConfigOptions, (char*) option->data); - syn_t* tmp = syn_new(); - tmp->f = m_strdup(CurRCFile); - tmp->l = CurRCLine; - tmp->n = newopt; - tmp->o = option; - syn_list_push(&Synonyms, tmp); + 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 && 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 != '=')) { - option = add_user_option (tmp->data); - hash_insert (ConfigOptions, option->option, option, 0); - } - } - if (!option && !(reset && m_strcmp("all", tmp->data) == 0)) { snprintf (err->data, err->dsize, _("%s: unknown variable"), tmp->data); return (-1); @@ -1841,11 +1575,6 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data, set_option (OPTRESORTINIT); set_option (OPTREDRAWTREE); return (0); - } - else if (!FuncTable[DTYPE (option->type)].opt_from_string) { - snprintf (err->data, err->dsize, _("$%s is read-only"), option->option); - r = -1; - break; } else { CHECK_PAGER; mutt_restore_default (NULL, option, 1); @@ -1891,29 +1620,17 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data, DTYPE (option->type) == DT_MAGIC || DTYPE (option->type) == DT_NUM || DTYPE (option->type) == DT_SORT || - DTYPE (option->type) == DT_RX || - DTYPE (option->type) == DT_USER || - DTYPE (option->type) == DT_SYS) { - + DTYPE (option->type) == DT_RX) + { /* XXX maybe we need to get unset into handlers? */ if (DTYPE (option->type) == DT_STR || DTYPE (option->type) == DT_PATH || - DTYPE (option->type) == DT_ADDR || - DTYPE (option->type) == DT_USER || - DTYPE (option->type) == DT_SYS) { + DTYPE (option->type) == DT_ADDR) + { if (unset) { CHECK_PAGER; - if (!FuncTable[DTYPE (option->type)].opt_from_string) { - snprintf (err->data, err->dsize, _("$%s is read-only"), - option->option); - r = -1; - break; - } else if (DTYPE (option->type) == DT_ADDR) + if (DTYPE (option->type) == DT_ADDR) 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 p_delete((void **)(void *)&option->data); break; @@ -1921,25 +1638,17 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data, } 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) { - snprintf (err->data, err->dsize, _("$%s is read-only"), - option->option); + CHECK_PAGER; + s->dptr++; + mutt_extract_token (tmp, s, 0); + if (!FuncTable[DTYPE (option->type)].opt_fromstr + (option, tmp->data, err->data, err->dsize)) r = -1; - break; - } else { - CHECK_PAGER; - s->dptr++; - mutt_extract_token (tmp, s, 0); - if (!FuncTable[DTYPE (option->type)].opt_from_string - (option, tmp->data, err->data, err->dsize)) - r = -1; - } } else if (DTYPE (option->type) == DT_QUAD) { @@ -2050,7 +1759,7 @@ static int source_rc (const char *rcfile, BUFFER * err) } p_delete(&token.data); p_delete(&linebuf); - fclose (f); + m_fclose(&f); if (pid != -1) mutt_wait_filter (pid); if (rc) { @@ -2099,7 +1808,7 @@ static int parse_source (BUFFER * tmp, BUFFER * s, 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; @@ -2357,8 +2066,7 @@ int mutt_var_value_complete (char *buffer, ssize_t len, int pos) 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)]); @@ -2461,7 +2169,7 @@ int mutt_query_variables (string_list_t * queries) 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; @@ -2492,16 +2200,9 @@ void mutt_init (int skip_sys_rc, string_list_t * commands) err.data = error; err.dsize = sizeof(error); - /* use 3*sizeof(muttvars) instead of 2*sizeof() - * to have some room for $user_ vars */ - ConfigOptions = hash_create (sizeof(MuttVars) * 3); + ConfigOptions = hash_new (sizeof(MuttVars) * 2, 0); for (i = 0; MuttVars[i].option; i++) { - if (DTYPE (MuttVars[i].type) != DT_SYS) - hash_insert (ConfigOptions, MuttVars[i].option, &MuttVars[i], 0); - else - hash_insert (ConfigOptions, MuttVars[i].option, - add_option (MuttVars[i].option, MuttVars[i].init, - DT_SYS, 0), 0); + hash_insert (ConfigOptions, MuttVars[i].option, &MuttVars[i]); } /* @@ -2525,7 +2226,6 @@ void mutt_init (int skip_sys_rc, string_list_t * commands) mutt_gecos_name(rnbuf, sizeof(rnbuf), pw, GecosMask.rx); Realname = m_strdup(rnbuf); - Shell = m_strdup(pw->pw_shell); endpwent (); } else { @@ -2541,7 +2241,6 @@ void mutt_init (int skip_sys_rc, string_list_t * commands) fputs (_("unable to determine username"), stderr); exit (1); } - Shell = m_strdup((p = getenv ("SHELL")) ? p : "/bin/sh"); } /* And about the host... */ @@ -2560,7 +2259,7 @@ void mutt_init (int skip_sys_rc, string_list_t * commands) 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)); @@ -2579,7 +2278,7 @@ void mutt_init (int skip_sys_rc, string_list_t * commands) q++; *q = '\0'; NewsServer = m_strdup(p); - fclose (f); + m_fclose(&f); } } if ((p = getenv ("NNTPSERVER"))) @@ -2610,14 +2309,6 @@ void mutt_init (int skip_sys_rc, string_list_t * commands) Tempdir = m_strdup((p = getenv ("TMPDIR")) ? p : "/tmp"); - p = getenv ("VISUAL"); - if (!p) { - p = getenv ("EDITOR"); - if (!p) - p = "vi"; - } - Editor = m_strdup(p); - if ((p = getenv ("REPLYTO")) != NULL) { BUFFER buf, token; @@ -2636,6 +2327,7 @@ void mutt_init (int skip_sys_rc, string_list_t * commands) From = rfc822_parse_adrlist (NULL, p); charset_initialize(); + mlua_initialize(); /* Set standard defaults */ hash_map (ConfigOptions, mutt_set_default, 0); @@ -2652,18 +2344,8 @@ void mutt_init (int skip_sys_rc, string_list_t * commands) 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)); @@ -2717,6 +2399,15 @@ void mutt_init (int skip_sys_rc, string_list_t * commands) exit (1); } + /* LUA {{{ */ + snprintf(buffer, sizeof(buffer), "%s/.madmutt.lua", NONULL(Homedir)); + if (access(buffer, F_OK) < 0) + snprintf(buffer, sizeof(buffer), "%s/.madmutt/cfg.lua", NONULL(Homedir)); + if (!access(buffer, F_OK)) { + need_pause = mlua_wrap(mutt_error, mlua_dofile(buffer)); + } + /* }}} */ + if (mutt_execute_commands (commands) != 0) need_pause = 1; @@ -2773,8 +2464,7 @@ int mutt_dump_variables (int full) { } printf("set "); - FuncTable[DTYPE(option->type)].opt_to_string - (buf, sizeof(buf), option); + FuncTable[DTYPE(option->type)].opt_tostr(buf, sizeof(buf), option); printf ("%s\n", buf); }