X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hook.c;h=b81b9c86c08354d3c21c33d70adb65532d3a85a6;hp=aa0d47857a4db245b31ebe52bd7e6c74f6b54daf;hb=f4a82d92ca0d015424b203887579802f003cfac8;hpb=2293e9bc5a94ef33dc596b064c607d6bed5ad1fd diff --git a/hook.c b/hook.c index aa0d478..b81b9c8 100644 --- a/hook.c +++ b/hook.c @@ -7,47 +7,39 @@ * please see the file GPL in the top level source directory. */ -#if HAVE_CONFIG_H -# include "config.h" -#endif - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include "mutt.h" -#include "alias.h" -#include "mx.h" +#include +#include +#include +#include #include -#include "compress.h" -#define ERROR_STOP 0 +#include "alias.h" +#include "pattern.h" -typedef struct hook { +typedef struct hook_t { int type; /* hook type */ rx_t rx; /* regular expression */ char *command; /* filename, command or pattern to execute */ pattern_t *pattern; /* used for fcc,save,send-hook */ - struct hook *next; -} HOOK; + struct hook_t *next; +} hook_t; -static HOOK *Hooks = NULL; +DO_INIT(hook_t, hook); +static inline void hook_wipe(hook_t *hk) { + p_delete(&hk->command); + pattern_list_wipe(&hk->pattern); +} +DO_NEW(hook_t, hook); +DO_DELETE(hook_t, hook); +DO_SLIST(hook_t, hook, hook_delete); +static hook_t *Hooks = NULL; static unsigned long current_hook_type = 0; int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s, unsigned long data, BUFFER * err) { - HOOK *ptr; + hook_t *ptr; BUFFER command, pattern; int rc, not = 0; regex_t *rx = NULL; @@ -85,8 +77,7 @@ int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s, } if (data & (M_FOLDERHOOK | M_MBOXHOOK)) { - m_strcpy(path, sizeof(path), pattern.data); - _mutt_expand_path (path, sizeof (path), 1); + _mutt_expand_path (path, sizeof (path), pattern.data, 1); p_delete(&pattern.data); p_clear(&pattern, 1); pattern.data = m_strdup(path); @@ -119,7 +110,7 @@ int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s, /* check to make sure that a matching hook doesn't already exist */ for (ptr = Hooks; ptr; ptr = ptr->next) { - if (ptr->type == data && + if (ptr->type == (int)data && ptr->rx.not == not && !m_strcmp(pattern.data, ptr->rx.pattern)) { if (data & (M_FOLDERHOOK | M_SENDHOOK | M_SEND2HOOK | M_MESSAGEHOOK | @@ -180,11 +171,11 @@ int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s, } if (ptr) { - ptr->next = p_new(HOOK, 1); + ptr->next = p_new(hook_t, 1); ptr = ptr->next; } else - Hooks = ptr = p_new(HOOK, 1); + Hooks = ptr = p_new(hook_t, 1); ptr->type = data; ptr->command = command.data; ptr->pattern = pat; @@ -199,39 +190,19 @@ error: return (-1); } -static void delete_hook (HOOK * h) -{ - p_delete(&h->command); - p_delete(&h->rx.pattern); - if (h->rx.rx) { - regfree (h->rx.rx); - } - mutt_pattern_free (&h->pattern); - p_delete(&h); -} - /* Deletes all hooks of type ``type'', or all defined hooks if ``type'' is 0 */ static void delete_hooks (long type) { - HOOK *h; - HOOK *prev; - - while (h = Hooks, h && (type == 0 || type == h->type)) { - Hooks = h->next; - delete_hook (h); - } - - prev = h; /* Unused assignment to avoid compiler warnings */ - - while (h) { - if (type == h->type) { - prev->next = h->next; - delete_hook (h); + hook_t **l = &Hooks; + + while (*l) { + if ((*l)->type == type) { + hook_t *tmp = hook_list_pop(l); + hook_delete(&tmp); + } else { + l = &(*l)->next; + } } - else - prev = h; - h = prev->next; - } } int mutt_parse_unhook (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)), @@ -245,9 +216,8 @@ int mutt_parse_unhook (BUFFER * buf, BUFFER * s, unsigned long data __attribute_ _("unhook: Can't do unhook * from within a hook.")); return -1; } - delete_hooks (0); - } - else { + hook_list_wipe(&Hooks); + } else { unsigned long type = mutt_get_hook_type (buf->data); if (!type) { @@ -269,7 +239,7 @@ int mutt_parse_unhook (BUFFER * buf, BUFFER * s, unsigned long data __attribute_ void mutt_folder_hook (char *path) { - HOOK *tmp = Hooks; + hook_t *tmp = Hooks; BUFFER err, token; char buf[STRING]; @@ -287,11 +257,6 @@ void mutt_folder_hook (char *path) if (mutt_parse_rc_line (tmp->command, &token, &err) == -1) { mutt_error ("%s", err.data); mutt_sleep (1); /* pause a moment to let the user see the error */ - if (ERROR_STOP) { - p_delete(&token.data); - current_hook_type = 0; - return; - } } } } @@ -303,7 +268,7 @@ void mutt_folder_hook (char *path) char *mutt_find_hook (int type, const char *pat) { - HOOK *tmp = Hooks; + hook_t *tmp = Hooks; for (; tmp; tmp = tmp->next) if (tmp->type & type) { @@ -316,7 +281,7 @@ char *mutt_find_hook (int type, const char *pat) void mutt_message_hook (CONTEXT * ctx, HEADER * hdr, int type) { BUFFER err, token; - HOOK *hook; + hook_t *hook; char buf[STRING]; current_hook_type = type; @@ -333,11 +298,6 @@ void mutt_message_hook (CONTEXT * ctx, HEADER * hdr, int type) if (mutt_parse_rc_line (hook->command, &token, &err) != 0) { mutt_error ("%s", err.data); mutt_sleep (1); - if (ERROR_STOP) { - p_delete(&token.data); - current_hook_type = 0; - return; - } } } p_delete(&token.data); @@ -348,7 +308,7 @@ static int mutt_addr_hook (char *path, ssize_t pathlen, unsigned long type, CONTEXT * ctx, HEADER * hdr) { - HOOK *hook; + hook_t *hook; /* determine if a matching hook exists */ for (hook = Hooks; hook; hook = hook->next) { @@ -414,7 +374,7 @@ void mutt_select_fcc (char *path, ssize_t pathlen, HEADER * hdr) static const char *_mutt_string_hook (const char *match, int hook) { - HOOK *tmp = Hooks; + hook_t *tmp = Hooks; for (; tmp; tmp = tmp->next) { if ((tmp->type & hook) @@ -441,7 +401,7 @@ const char *mutt_crypt_hook (address_t * adr) void mutt_account_hook (const char *url) { - HOOK *hook; + hook_t *hook; BUFFER token; BUFFER err; char buf[STRING]; @@ -458,11 +418,6 @@ void mutt_account_hook (const char *url) if (mutt_parse_rc_line (hook->command, &token, &err) == -1) { mutt_error ("%s", err.data); mutt_sleep (1); - if (ERROR_STOP) { - p_delete(&token.data); - current_hook_type = 0; - return; - } } } }