X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hook.c;h=db0b1a98e23e75d186e7aa2b232ee2451f118f52;hp=d665cb38e9fedac95a54db37b2d56ef669ab74fa;hb=6ebff74ad242d4c56fb7762965b19cee14fd2daa;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a diff --git a/hook.c b/hook.c index d665cb3..db0b1a9 100644 --- a/hook.c +++ b/hook.c @@ -7,31 +7,13 @@ * 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 "mutt.h" -#include "buffer.h" -#include "mx.h" -#include "mutt_crypt.h" - -#ifdef USE_COMPRESSED -#include "compress.h" -#endif - -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/str.h" -#include "lib/rx.h" - -#include -#include -#include -#include -#include +#include "alias.h" #define ERROR_STOP 0 @@ -45,10 +27,10 @@ typedef struct hook { static HOOK *Hooks = NULL; -static int current_hook_type = 0; +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; BUFFER command, pattern; @@ -57,19 +39,18 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data, pattern_t *pat = NULL; char path[_POSIX_PATH_MAX]; - memset (&pattern, 0, sizeof (pattern)); - memset (&command, 0, sizeof (command)); + p_clear(&pattern, 1); + 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; } @@ -79,61 +60,59 @@ 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)); + m_strcpy(path, sizeof(path), pattern.data); _mutt_expand_path (path, sizeof (path), 1); p_delete(&pattern.data); - memset (&pattern, 0, sizeof (pattern)); - pattern.data = str_dup (path); + 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); - memset (&pattern, 0, sizeof (pattern)); - pattern.data = str_dup (tmp); + p_clear(&pattern, 1); + pattern.data = m_strdup(tmp); } 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); - memset (&command, 0, sizeof (command)); - command.data = str_dup (path); + p_clear(&command, 1); + command.data = m_strdup(path); } /* 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)) { + 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; @@ -186,11 +165,11 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data, } if (ptr) { - ptr->next = mem_calloc (1, sizeof (HOOK)); + ptr->next = p_new(HOOK, 1); ptr = ptr->next; } else - Hooks = ptr = mem_calloc (1, sizeof (HOOK)); + Hooks = ptr = p_new(HOOK, 1); ptr->type = data; ptr->command = command.data; ptr->pattern = pat; @@ -217,7 +196,7 @@ static void delete_hook (HOOK * 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; @@ -240,12 +219,12 @@ static void delete_hooks (int type) } } -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.")); @@ -254,7 +233,7 @@ int mutt_parse_unhook (BUFFER * buf, BUFFER * s, unsigned long data, delete_hooks (0); } else { - int type = mutt_get_hook_type (buf->data); + unsigned long type = mutt_get_hook_type (buf->data); if (!type) { snprintf (err->data, err->dsize, @@ -283,7 +262,7 @@ void mutt_folder_hook (char *path) err.data = buf; err.dsize = sizeof (buf); - memset (&token, 0, sizeof (token)); + p_clear(&token, 1); for (; tmp; tmp = tmp->next) { if (!tmp->command) continue; @@ -329,7 +308,7 @@ void mutt_message_hook (CONTEXT * ctx, HEADER * hdr, int type) err.data = buf; err.dsize = sizeof (buf); - memset (&token, 0, sizeof (token)); + p_clear(&token, 1); for (hook = Hooks; hook; hook = hook->next) { if (!hook->command) continue; @@ -351,7 +330,7 @@ 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; @@ -371,12 +350,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, const 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); @@ -397,9 +376,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; @@ -408,45 +387,43 @@ 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; 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; @@ -456,7 +433,7 @@ void mutt_account_hook (const char *url) err.data = buf; err.dsize = sizeof (buf); - memset (&token, 0, sizeof (token)); + p_clear(&token, 1); for (hook = Hooks; hook; hook = hook->next) { if (!(hook->command && (hook->type & M_ACCOUNTHOOK))) @@ -477,4 +454,3 @@ void mutt_account_hook (const char *url) p_delete(&token.data); } -#endif