X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=21bdd4f255773d36d7a38fa66c6f712797a8ac92;hp=983a620a7a59bef934e3a06fc50e1f3732b06e8e;hb=f3cbb9f51357972f6e74244494236a41dc4d84cd;hpb=3984877e812b0ba73b84539d231aeca3c2de6b9b diff --git a/init.c b/init.c index 983a620..21bdd4f 100644 --- a/init.c +++ b/init.c @@ -18,6 +18,7 @@ #include #include +#include #include "mutt.h" #include "keymap.h" @@ -31,7 +32,6 @@ #endif #include "alias.h" -#include "mx.h" #include "init.h" /* @@ -206,7 +206,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); @@ -289,7 +289,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); } @@ -423,7 +423,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 +476,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; @@ -621,7 +621,7 @@ add_to_rx_list(rx_t **list, const char *s, int flags, BUFFER *err) { rx_t* rx; - if (!s || !*s) + if (m_strisempty(s)) return 0; if (rx_lookup(list, s)) @@ -637,101 +637,46 @@ 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 **last, *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 */ + for (last = list; *last; last = &(*last)->next) { + if (!ascii_strcasecmp(rx->pattern, (*last)->pattern) == 0) { + rx_t *tmp = rx_list_pop(last); + rx_delete(&tmp); + last = rx_list_last(last); + break; + } } - else - ++p; - } - t->nmatch++; /* match 0 is always the whole expr */ - return 0; + *last = 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; - } - else - spam = spam->next; + while (*list) { + if (!m_strcmp((*list)->pattern, pat)) { + rx_t *spam = rx_list_pop(list); + rx_delete(&spam); + nremoved++; + } else { + list = &(*list)->next; + } } return nremoved; @@ -853,7 +798,7 @@ 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); @@ -983,7 +928,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 +1034,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'; @@ -1792,12 +1737,12 @@ 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; } @@ -2050,7 +1995,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) { @@ -2560,7 +2505,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 +2524,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"))) @@ -2652,18 +2597,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));