X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hook.c;h=2f9345d9ce659316dbd0ce776d62dea9fe9d7f58;hp=f3853a9d5947ef9e50a299fe057eb716027ce239;hb=08b24cfbdc0c35af65891f5b2478dc0ee33feb7e;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281 diff --git a/hook.c b/hook.c index f3853a9..2f9345d 100644 --- a/hook.c +++ b/hook.c @@ -1,19 +1,10 @@ -/* +/* + * Copyright notice from original mutt: * Copyright (C) 1996-2002 Michael R. Elkins , and others * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * This file is part of mutt-ng, see http://www.muttng.org/. + * It's licensed under the GNU General Public License, + * please see the file GPL in the top level source directory. */ #if HAVE_CONFIG_H @@ -21,13 +12,19 @@ #endif #include "mutt.h" -#include "mailbox.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 @@ -36,7 +33,7 @@ typedef struct hook { int type; /* hook type */ - REGEXP rx; /* regular expression */ + 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; @@ -90,9 +87,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); - FREE (&pattern.data); + mem_free (&pattern.data); memset (&pattern, 0, sizeof (pattern)); - pattern.data = safe_strdup (path); + pattern.data = str_dup (path); } #ifdef USE_COMPRESSED else if (data & (M_APPENDHOOK | M_OPENHOOK | M_CLOSEHOOK)) { @@ -109,32 +106,32 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data, strfcpy (tmp, pattern.data, sizeof (tmp)); mutt_check_simple (tmp, sizeof (tmp), DefaultHook); - FREE (&pattern.data); + mem_free (&pattern.data); memset (&pattern, 0, sizeof (pattern)); - pattern.data = safe_strdup (tmp); + pattern.data = str_dup (tmp); } if (data & (M_MBOXHOOK | M_SAVEHOOK | M_FCCHOOK)) { strfcpy (path, command.data, sizeof (path)); mutt_expand_path (path, sizeof (path)); - FREE (&command.data); + mem_free (&command.data); memset (&command, 0, sizeof (command)); - command.data = safe_strdup (path); + command.data = str_dup (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 && !mutt_strcmp (pattern.data, ptr->rx.pattern)) { + ptr->rx.not == not && !str_cmp (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 (!mutt_strcmp (ptr->command, command.data)) { - FREE (&command.data); - FREE (&pattern.data); + if (!str_cmp (ptr->command, command.data)) { + mem_free (&command.data); + mem_free (&pattern.data); return 0; } } @@ -144,9 +141,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. */ - FREE (&ptr->command); + mem_free (&ptr->command); ptr->command = command.data; - FREE (&pattern.data); + mem_free (&pattern.data); return 0; } } @@ -164,7 +161,7 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data, goto error; } else { - rx = safe_malloc (sizeof (regex_t)); + rx = mem_malloc (sizeof (regex_t)); #ifdef M_CRYPTHOOK if ((rc = REGCOMP (rx, NONULL (pattern.data), @@ -179,17 +176,17 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data, { regerror (rc, rx, err->data, err->dsize); regfree (rx); - FREE (&rx); + mem_free (&rx); goto error; } } if (ptr) { - ptr->next = safe_calloc (1, sizeof (HOOK)); + ptr->next = mem_calloc (1, sizeof (HOOK)); ptr = ptr->next; } else - Hooks = ptr = safe_calloc (1, sizeof (HOOK)); + Hooks = ptr = mem_calloc (1, sizeof (HOOK)); ptr->type = data; ptr->command = command.data; ptr->pattern = pat; @@ -199,20 +196,20 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data, return 0; error: - FREE (&pattern.data); - FREE (&command.data); + mem_free (&pattern.data); + mem_free (&command.data); return (-1); } static void delete_hook (HOOK * h) { - FREE (&h->command); - FREE (&h->rx.pattern); + mem_free (&h->command); + mem_free (&h->rx.pattern); if (h->rx.rx) { regfree (h->rx.rx); } mutt_pattern_free (&h->pattern); - FREE (&h); + mem_free (&h); } /* Deletes all hooks of type ``type'', or all defined hooks if ``type'' is 0 */ @@ -244,7 +241,7 @@ int mutt_parse_unhook (BUFFER * buf, BUFFER * s, unsigned long data, { while (MoreArgs (s)) { mutt_extract_token (buf, s, 0); - if (mutt_strcmp ("*", buf->data) == 0) { + if (str_cmp ("*", buf->data) == 0) { if (current_hook_type) { snprintf (err->data, err->dsize, _("unhook: Can't do unhook * from within a hook.")); @@ -291,7 +288,7 @@ void mutt_folder_hook (char *path) if ((regexec (tmp->rx.rx, path, 0, NULL, 0) == 0) ^ tmp->rx.not) { if (mutt_parse_rc_line (tmp->command, &token, &err) == -1) { mutt_error ("%s", err.data); - FREE (&token.data); + mem_free (&token.data); mutt_sleep (1); /* pause a moment to let the user see the error */ current_hook_type = 0; return; @@ -299,7 +296,7 @@ void mutt_folder_hook (char *path) } } } - FREE (&token.data); + mem_free (&token.data); current_hook_type = 0; } @@ -334,14 +331,14 @@ void mutt_message_hook (CONTEXT * ctx, HEADER * hdr, int type) if (hook->type & type) if ((mutt_pattern_exec (hook->pattern, 0, ctx, hdr) > 0) ^ hook->rx.not) if (mutt_parse_rc_line (hook->command, &token, &err) != 0) { - FREE (&token.data); + mem_free (&token.data); mutt_error ("%s", err.data); mutt_sleep (1); current_hook_type = 0; return; } } - FREE (&token.data); + mem_free (&token.data); current_hook_type = 0; } @@ -459,7 +456,7 @@ void mutt_account_hook (const char *url) if ((regexec (hook->rx.rx, url, 0, NULL, 0) == 0) ^ hook->rx.not) { if (mutt_parse_rc_line (hook->command, &token, &err) == -1) { - FREE (&token.data); + mem_free (&token.data); mutt_error ("%s", err.data); mutt_sleep (1); @@ -468,6 +465,6 @@ void mutt_account_hook (const char *url) } } - FREE (&token.data); + mem_free (&token.data); } #endif