X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hook.c;h=b81b9c86c08354d3c21c33d70adb65532d3a85a6;hp=ab9898ea09cfeb85a39480b9c6f40ab2e831ac02;hb=c68aaa3d8d4b5b64be9936675fe1194688debab2;hpb=9274cbe8e6410ddb95ddc667faa678a29da85420 diff --git a/hook.c b/hook.c index ab9898e..b81b9c8 100644 --- a/hook.c +++ b/hook.c @@ -7,49 +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 "alias.h" +#include "pattern.h" -#include "mutt.h" -#include "buffer.h" -#include "mx.h" -#include "mutt_crypt.h" - -#ifdef USE_COMPRESSED -#include "compress.h" -#endif - -#include "lib/rx.h" - -#include -#include -#include -#include -#include - -#define ERROR_STOP 0 - -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 int current_hook_type = 0; +static hook_t *Hooks = NULL; +static unsigned long current_hook_type = 0; -int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data, - BUFFER * err) +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; @@ -60,15 +50,14 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data, p_clear(&command, 1); if (*s->dptr == '!') { - s->dptr++; - SKIPWS (s->dptr); + s->dptr = vskipspaces(s->dptr + 1); not = 1; } mutt_extract_token (&pattern, s, 0); if (!MoreArgs (s)) { - strfcpy (err->data, _("too few arguments"), err->dsize); + m_strcpy(err->data, err->dsize, _("too few arguments")); goto error; } @@ -78,36 +67,33 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data, M_ACCOUNTHOOK | M_REPLYHOOK)) ? M_TOKEN_SPACE : 0); if (!command.data) { - strfcpy (err->data, _("too few arguments"), err->dsize); + m_strcpy(err->data, err->dsize, _("too few arguments")); goto error; } if (MoreArgs (s)) { - strfcpy (err->data, _("too many arguments"), err->dsize); + m_strcpy(err->data, err->dsize, _("too many arguments")); goto error; } if (data & (M_FOLDERHOOK | M_MBOXHOOK)) { - strfcpy (path, pattern.data, sizeof (path)); - _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); } -#ifdef USE_COMPRESSED else if (data & (M_APPENDHOOK | M_OPENHOOK | M_CLOSEHOOK)) { if (mutt_test_compress_command (command.data)) { - strfcpy (err->data, _("bad formatted command string"), err->dsize); + m_strcpy(err->data, err->dsize, _("bad formatted command string")); return (-1); } } -#endif else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ACCOUNTHOOK)) - && (!WithCrypto || !(data & M_CRYPTHOOK)) - ) { + && !(data & M_CRYPTHOOK)) + { char tmp[HUGE_STRING]; - strfcpy (tmp, pattern.data, sizeof (tmp)); + m_strcpy(tmp, sizeof(tmp), pattern.data); mutt_check_simple (tmp, sizeof (tmp), DefaultHook); p_delete(&pattern.data); p_clear(&pattern, 1); @@ -115,7 +101,7 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data, } if (data & (M_MBOXHOOK | M_SAVEHOOK | M_FCCHOOK)) { - strfcpy (path, command.data, sizeof (path)); + m_strcpy(path, sizeof(path), command.data); mutt_expand_path (path, sizeof (path)); p_delete(&command.data); p_clear(&command, 1); @@ -124,15 +110,15 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data, /* 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 && !str_cmp (pattern.data, ptr->rx.pattern)) { + 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 | M_ACCOUNTHOOK | 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 */ - if (!str_cmp (ptr->command, command.data)) { + if (!m_strcmp(ptr->command, command.data)) { p_delete(&command.data); p_delete(&pattern.data); return 0; @@ -185,11 +171,11 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data, } 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; @@ -204,56 +190,35 @@ 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 (int type) +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, +int mutt_parse_unhook (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)), BUFFER * err) { while (MoreArgs (s)) { mutt_extract_token (buf, s, 0); - if (str_cmp ("*", buf->data) == 0) { + if (m_strcmp("*", buf->data) == 0) { if (current_hook_type) { snprintf (err->data, err->dsize, _("unhook: Can't do unhook * from within a hook.")); return -1; } - delete_hooks (0); - } - else { - int type = mutt_get_hook_type (buf->data); + hook_list_wipe(&Hooks); + } else { + unsigned long type = mutt_get_hook_type (buf->data); if (!type) { snprintf (err->data, err->dsize, @@ -274,7 +239,7 @@ int mutt_parse_unhook (BUFFER * buf, BUFFER * s, unsigned long data, void mutt_folder_hook (char *path) { - HOOK *tmp = Hooks; + hook_t *tmp = Hooks; BUFFER err, token; char buf[STRING]; @@ -292,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; - } } } } @@ -308,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) { @@ -321,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; @@ -338,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); @@ -350,10 +305,10 @@ void mutt_message_hook (CONTEXT * ctx, HEADER * hdr, int type) } static int -mutt_addr_hook (char *path, size_t pathlen, int type, CONTEXT * ctx, +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) { @@ -370,12 +325,12 @@ mutt_addr_hook (char *path, size_t pathlen, int type, CONTEXT * ctx, return -1; } -void mutt_default_save (char *path, size_t pathlen, HEADER * hdr) +void mutt_default_save (char *path, ssize_t pathlen, HEADER * hdr) { *path = 0; if (mutt_addr_hook (path, pathlen, M_SAVEHOOK, Context, hdr) != 0) { char tmp[_POSIX_PATH_MAX]; - ADDRESS *adr; + address_t *adr; ENVELOPE *env = hdr->env; int fromMe = mutt_addr_is_user (env->from); @@ -396,9 +351,9 @@ void mutt_default_save (char *path, size_t pathlen, HEADER * hdr) } } -void mutt_select_fcc (char *path, size_t pathlen, HEADER * hdr) +void mutt_select_fcc (char *path, ssize_t pathlen, HEADER * hdr) { - ADDRESS *adr; + address_t *adr; char buf[_POSIX_PATH_MAX]; ENVELOPE *env = hdr->env; @@ -407,48 +362,46 @@ void mutt_select_fcc (char *path, size_t pathlen, HEADER * hdr) (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, NONULL (Maildir), buf, pathlen); + mutt_concat_path(path, pathlen, NONULL(Maildir), buf); if (!option (OPTFORCENAME) && mx_access (path, W_OK) != 0) - strfcpy (path, NONULL (Outbox), pathlen); + m_strcpy(path, pathlen, NONULL(Outbox)); } else - strfcpy (path, NONULL (Outbox), pathlen); + m_strcpy(path, pathlen, NONULL(Outbox)); } 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.not)) return (tmp->command); } return (NULL); } -char *mutt_charset_hook (const char *chs) +const char *mutt_charset_hook (const char *chs) { return _mutt_string_hook (chs, M_CHARSETHOOK); } -char *mutt_iconv_hook (const char *chs) +const char *mutt_iconv_hook (const char *chs) { return _mutt_string_hook (chs, M_ICONVHOOK); } -char *mutt_crypt_hook (ADDRESS * adr) +const char *mutt_crypt_hook (address_t * adr) { return _mutt_string_hook (adr->mailbox, M_CRYPTHOOK); } -#ifdef USE_SOCKET void mutt_account_hook (const char *url) { - HOOK *hook; + hook_t *hook; BUFFER token; BUFFER err; char buf[STRING]; @@ -465,15 +418,9 @@ 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; - } } } } p_delete(&token.data); } -#endif