X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hook.c;h=4222f522466b75afc4b08b8d4f66346c3712bad2;hp=0a7ce546b68ee01cc7aa920b83b44db418430961;hb=3e611c4b53a33408955152e1c9336f8643ea096e;hpb=c565d2f14f1655a6483171e1636e5803533b6ebe diff --git a/hook.c b/hook.c index 0a7ce54..4222f52 100644 --- a/hook.c +++ b/hook.c @@ -11,8 +11,12 @@ # include "config.h" #endif +#include +#include +#include +#include + #include "mutt.h" -#include "buffer.h" #include "mx.h" #include "mutt_crypt.h" @@ -20,9 +24,6 @@ #include "compress.h" #endif -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/str.h" #include "lib/rx.h" #include @@ -55,8 +56,8 @@ 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++; @@ -89,9 +90,9 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data, if (data & (M_FOLDERHOOK | M_MBOXHOOK)) { strfcpy (path, pattern.data, sizeof (path)); _mutt_expand_path (path, sizeof (path), 1); - mem_free (&pattern.data); - memset (&pattern, 0, sizeof (pattern)); - pattern.data = str_dup (path); + 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)) { @@ -108,17 +109,17 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data, strfcpy (tmp, pattern.data, sizeof (tmp)); mutt_check_simple (tmp, sizeof (tmp), DefaultHook); - mem_free (&pattern.data); - memset (&pattern, 0, sizeof (pattern)); - pattern.data = str_dup (tmp); + p_delete(&pattern.data); + p_clear(&pattern, 1); + pattern.data = m_strdup(tmp); } if (data & (M_MBOXHOOK | M_SAVEHOOK | M_FCCHOOK)) { strfcpy (path, command.data, sizeof (path)); mutt_expand_path (path, sizeof (path)); - mem_free (&command.data); - memset (&command, 0, sizeof (command)); - command.data = str_dup (path); + p_delete(&command.data); + p_clear(&command, 1); + command.data = m_strdup(path); } /* check to make sure that a matching hook doesn't already exist */ @@ -132,8 +133,8 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data, * 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)) { - mem_free (&command.data); - mem_free (&pattern.data); + p_delete(&command.data); + p_delete(&pattern.data); return 0; } } @@ -143,9 +144,9 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data, * order of execution of the hooks, which i think is desirable since * a common action to perform is to change the default (.) entry * based upon some other information. */ - mem_free (&ptr->command); + p_delete(&ptr->command); ptr->command = command.data; - mem_free (&pattern.data); + p_delete(&pattern.data); return 0; } } @@ -163,7 +164,7 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data, goto error; } else { - rx = mem_malloc (sizeof (regex_t)); + rx = p_new(regex_t, 1); #ifdef M_CRYPTHOOK if ((rc = REGCOMP (rx, NONULL (pattern.data), @@ -178,17 +179,17 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data, { regerror (rc, rx, err->data, err->dsize); regfree (rx); - mem_free (&rx); + p_delete(&rx); goto error; } } 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; @@ -198,20 +199,20 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data, return 0; error: - mem_free (&pattern.data); - mem_free (&command.data); + p_delete(&pattern.data); + p_delete(&command.data); return (-1); } static void delete_hook (HOOK * h) { - mem_free (&h->command); - mem_free (&h->rx.pattern); + p_delete(&h->command); + p_delete(&h->rx.pattern); if (h->rx.rx) { regfree (h->rx.rx); } mutt_pattern_free (&h->pattern); - mem_free (&h); + p_delete(&h); } /* Deletes all hooks of type ``type'', or all defined hooks if ``type'' is 0 */ @@ -281,7 +282,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; @@ -292,7 +293,7 @@ void mutt_folder_hook (char *path) mutt_error ("%s", err.data); mutt_sleep (1); /* pause a moment to let the user see the error */ if (ERROR_STOP) { - mem_free (&token.data); + p_delete(&token.data); current_hook_type = 0; return; } @@ -300,7 +301,7 @@ void mutt_folder_hook (char *path) } } } - mem_free (&token.data); + p_delete(&token.data); current_hook_type = 0; } @@ -327,7 +328,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; @@ -338,13 +339,13 @@ void mutt_message_hook (CONTEXT * ctx, HEADER * hdr, int type) mutt_error ("%s", err.data); mutt_sleep (1); if (ERROR_STOP) { - mem_free (&token.data); + p_delete(&token.data); current_hook_type = 0; return; } } } - mem_free (&token.data); + p_delete(&token.data); current_hook_type = 0; } @@ -454,7 +455,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))) @@ -465,7 +466,7 @@ void mutt_account_hook (const char *url) mutt_error ("%s", err.data); mutt_sleep (1); if (ERROR_STOP) { - mem_free (&token.data); + p_delete(&token.data); current_hook_type = 0; return; } @@ -473,6 +474,6 @@ void mutt_account_hook (const char *url) } } - mem_free (&token.data); + p_delete(&token.data); } #endif