X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hook.c;h=37eda9e1c60104d4c31c50297d628d29709c3867;hp=bb8e30f9c16bd49f53b53c7ba29f61a7d68f6927;hb=3438f31945bb94bc4f4b9603ac47fcde03d5c073;hpb=ac813896ca32d850febc2d95065ac4fa040f11f9 diff --git a/hook.c b/hook.c index bb8e30f..37eda9e 100644 --- a/hook.c +++ b/hook.c @@ -7,48 +7,42 @@ * 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 "mx.h" -#include -#include "compress.h" - -#define ERROR_STOP 0 - -typedef struct hook { +#include +#include +#include +#include +#include + +#include "alias.h" +#include "crypt.h" +#include "pattern.h" + +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; + int rc, neg = 0; regex_t *rx = NULL; pattern_t *pat = NULL; char path[_POSIX_PATH_MAX]; @@ -58,7 +52,7 @@ int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s, if (*s->dptr == '!') { s->dptr = vskipspaces(s->dptr + 1); - not = 1; + neg = 1; } mutt_extract_token (&pattern, s, 0); @@ -68,10 +62,9 @@ int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s, goto error; } - mutt_extract_token (&command, s, - (data & - (M_FOLDERHOOK | M_SENDHOOK | M_SEND2HOOK | - M_ACCOUNTHOOK | M_REPLYHOOK)) ? M_TOKEN_SPACE : 0); + mutt_extract_token(&command, s, (data & (M_FOLDERHOOK | M_SENDHOOK | + M_SEND2HOOK | M_REPLYHOOK)) ? + M_TOKEN_SPACE : 0); if (!command.data) { m_strcpy(err->data, err->dsize, _("too few arguments")); @@ -84,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); @@ -96,8 +88,7 @@ int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s, return (-1); } } - else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ACCOUNTHOOK)) - && !(data & M_CRYPTHOOK)) + else if (DefaultHook && !(data & M_CRYPTHOOK)) { char tmp[HUGE_STRING]; @@ -118,11 +109,11 @@ 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 && - ptr->rx.not == not && !m_strcmp(pattern.data, ptr->rx.pattern)) { - if (data & - (M_FOLDERHOOK | M_SENDHOOK | M_SEND2HOOK | M_MESSAGEHOOK | - M_ACCOUNTHOOK | M_REPLYHOOK)) { + if (ptr->type == (int)data && + ptr->rx.neg == neg && !m_strcmp(pattern.data, ptr->rx.pattern)) { + if (data & (M_FOLDERHOOK | M_SENDHOOK | M_SEND2HOOK | M_MESSAGEHOOK | + M_REPLYHOOK)) + { /* these hooks allow multiple commands with the same * pattern, so if we've already seen this pattern/command pair, just * ignore it instead of creating a duplicate */ @@ -131,8 +122,7 @@ int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s, p_delete(&pattern.data); return 0; } - } - else { + } else { /* other hooks only allow one command per pattern, so update the * entry with the new command. this currently does not change the * order of execution of the hooks, which i think is desirable since @@ -148,28 +138,18 @@ int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s, break; } - if (data & - (M_SENDHOOK | M_SEND2HOOK | M_SAVEHOOK | M_FCCHOOK | M_MESSAGEHOOK | - M_REPLYHOOK)) { + if (data & (M_SENDHOOK | M_SEND2HOOK | M_SAVEHOOK | M_FCCHOOK | + M_MESSAGEHOOK | M_REPLYHOOK)) + { if ((pat = mutt_pattern_comp (pattern.data, (data & (M_SENDHOOK | M_SEND2HOOK | M_FCCHOOK)) ? 0 : M_FULL_MSG, err)) == NULL) goto error; - } - else { + } else { rx = p_new(regex_t, 1); -#ifdef M_CRYPTHOOK - if ((rc = - REGCOMP (rx, NONULL (pattern.data), - ((data & (M_CRYPTHOOK | M_CHARSETHOOK)) ? REG_ICASE : 0))) - != 0) -#else - if ((rc = - REGCOMP (rx, NONULL (pattern.data), - (data & (M_CHARSETHOOK | M_ICONVHOOK)) ? REG_ICASE : 0)) != - 0) -#endif /* M_CRYPTHOOK */ + if ((rc = REGCOMP(rx, NONULL(pattern.data), + ((data & M_CRYPTHOOK) ? REG_ICASE : 0))) != 0) { regerror (rc, rx, err->data, err->dsize); regfree (rx); @@ -179,17 +159,17 @@ 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_t, 1); } - else - Hooks = ptr = p_new(HOOK, 1); ptr->type = data; ptr->command = command.data; ptr->pattern = pat; ptr->rx.pattern = pattern.data; ptr->rx.rx = rx; - ptr->rx.not = not; + ptr->rx.neg = neg; return 0; error: @@ -198,39 +178,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)), @@ -244,9 +204,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) { @@ -268,7 +227,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]; @@ -282,15 +241,10 @@ void mutt_folder_hook (char *path) continue; if (tmp->type & M_FOLDERHOOK) { - if ((regexec (tmp->rx.rx, path, 0, NULL, 0) == 0) ^ tmp->rx.not) { + if ((regexec (tmp->rx.rx, path, 0, NULL, 0) == 0) ^ tmp->rx.neg) { 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; - } } } } @@ -298,11 +252,25 @@ void mutt_folder_hook (char *path) p_delete(&token.data); current_hook_type = 0; + + { + lua_State *L = luaM_getruntime(); + lua_getfield(L, LUA_GLOBALSINDEX, "mod_core"); + lua_getfield(L, -1, "folder_hook"); + lua_remove(L, -2); + if (lua_isfunction(L, -1)) { + lua_pushstring(L, LastFolder); + lua_pushstring(L, CurrentFolder); + lua_pcall(L, 2, 0, 0); + } else { + lua_pop(L, 1); + } + } } 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) { @@ -315,7 +283,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; @@ -328,15 +296,10 @@ void mutt_message_hook (CONTEXT * ctx, HEADER * hdr, int type) continue; if (hook->type & type) - if ((mutt_pattern_exec (hook->pattern, 0, ctx, hdr) > 0) ^ hook->rx.not) + if ((mutt_pattern_exec (hook->pattern, 0, ctx, hdr) > 0) ^ hook->rx.neg) 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); @@ -347,7 +310,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) { @@ -355,7 +318,7 @@ mutt_addr_hook (char *path, ssize_t pathlen, unsigned long type, CONTEXT * ctx, continue; if (hook->type & type) - if ((mutt_pattern_exec (hook->pattern, 0, ctx, hdr) > 0) ^ hook->rx.not) { + if ((mutt_pattern_exec (hook->pattern, 0, ctx, hdr) > 0) ^ hook->rx.neg) { mutt_make_string (path, pathlen, hook->command, ctx, hdr); return 0; } @@ -392,80 +355,25 @@ void mutt_default_save (char *path, ssize_t pathlen, HEADER * hdr) void mutt_select_fcc (char *path, ssize_t pathlen, HEADER * hdr) { - address_t *adr; - char buf[_POSIX_PATH_MAX]; - ENVELOPE *env = hdr->env; - - if (mutt_addr_hook (path, pathlen, M_FCCHOOK, NULL, hdr) != 0) { - if ((option (OPTSAVENAME) || option (OPTFORCENAME)) && - (env->to || env->cc || env->bcc)) { - adr = env->to ? env->to : (env->cc ? env->cc : env->bcc); - mutt_safe_path (buf, sizeof (buf), adr); - mutt_concat_path(path, pathlen, NONULL(Maildir), buf); - if (!option (OPTFORCENAME) && mx_access (path, W_OK) != 0) - m_strcpy(path, pathlen, NONULL(Outbox)); + if (mutt_addr_hook (path, pathlen, M_FCCHOOK, NULL, hdr) != 0) { + m_strcpy(path, pathlen, NONULL(MAlias.record)); } - else - m_strcpy(path, pathlen, NONULL(Outbox)); - } - mutt_pretty_mailbox (path); + mutt_pretty_mailbox (path); } -static char *_mutt_string_hook (const char *match, int hook) +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) && ((match && - regexec (tmp->rx.rx, match, 0, NULL, - 0) == 0) ^ tmp->rx.not)) + if ((tmp->type & hook) + && ((match && regexec(tmp->rx.rx, match, 0, NULL, 0) == 0) ^ tmp->rx.neg)) return (tmp->command); } return (NULL); } -char *mutt_charset_hook (const char *chs) -{ - return _mutt_string_hook (chs, M_CHARSETHOOK); -} - -char *mutt_iconv_hook (const char *chs) -{ - return _mutt_string_hook (chs, M_ICONVHOOK); -} - -char *mutt_crypt_hook (address_t * adr) +const char *mutt_crypt_hook (address_t * adr) { return _mutt_string_hook (adr->mailbox, M_CRYPTHOOK); } - -void mutt_account_hook (const char *url) -{ - HOOK *hook; - BUFFER token; - BUFFER err; - char buf[STRING]; - - err.data = buf; - err.dsize = sizeof (buf); - p_clear(&token, 1); - - for (hook = Hooks; hook; hook = hook->next) { - if (!(hook->command && (hook->type & M_ACCOUNTHOOK))) - continue; - - if ((regexec (hook->rx.rx, url, 0, NULL, 0) == 0) ^ hook->rx.not) { - 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; - } - } - } - } - - p_delete(&token.data); -}