-/*
+/*
+ * Copyright notice from original mutt:
* Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>, 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
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/buffer.h>
+
#include "mutt.h"
-#include "mailbox.h"
+#include "mx.h"
#include "mutt_crypt.h"
#ifdef USE_COMPRESSED
#include "compress.h"
#endif
+#include "lib/rx.h"
+
#include <limits.h>
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
#include <unistd.h>
+#define ERROR_STOP 0
+
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;
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++;
if (data & (M_FOLDERHOOK | M_MBOXHOOK)) {
strfcpy (path, pattern.data, sizeof (path));
_mutt_expand_path (path, sizeof (path), 1);
- FREE (&pattern.data);
- memset (&pattern, 0, sizeof (pattern));
- pattern.data = safe_strdup (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)) {
strfcpy (tmp, pattern.data, sizeof (tmp));
mutt_check_simple (tmp, sizeof (tmp), DefaultHook);
- FREE (&pattern.data);
- memset (&pattern, 0, sizeof (pattern));
- pattern.data = safe_strdup (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));
- FREE (&command.data);
- memset (&command, 0, sizeof (command));
- command.data = safe_strdup (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 */
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)) {
+ p_delete(&command.data);
+ p_delete(&pattern.data);
return 0;
}
}
* 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);
+ p_delete(&ptr->command);
ptr->command = command.data;
- FREE (&pattern.data);
+ p_delete(&pattern.data);
return 0;
}
}
goto error;
}
else {
- rx = safe_malloc (sizeof (regex_t));
+ rx = p_new(regex_t, 1);
#ifdef M_CRYPTHOOK
if ((rc =
REGCOMP (rx, NONULL (pattern.data),
{
regerror (rc, rx, err->data, err->dsize);
regfree (rx);
- FREE (&rx);
+ p_delete(&rx);
goto error;
}
}
if (ptr) {
- ptr->next = safe_calloc (1, sizeof (HOOK));
+ ptr->next = p_new(HOOK, 1);
ptr = ptr->next;
}
else
- Hooks = ptr = safe_calloc (1, sizeof (HOOK));
+ Hooks = ptr = p_new(HOOK, 1);
ptr->type = data;
ptr->command = command.data;
ptr->pattern = pat;
return 0;
error:
- FREE (&pattern.data);
- FREE (&command.data);
+ p_delete(&pattern.data);
+ p_delete(&command.data);
return (-1);
}
static void delete_hook (HOOK * h)
{
- FREE (&h->command);
- 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);
- FREE (&h);
+ p_delete(&h);
}
/* Deletes all hooks of type ``type'', or all defined hooks if ``type'' is 0 */
{
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."));
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;
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);
mutt_sleep (1); /* pause a moment to let the user see the error */
- current_hook_type = 0;
- return;
+ if (ERROR_STOP) {
+ p_delete(&token.data);
+ current_hook_type = 0;
+ return;
+ }
}
}
}
}
- FREE (&token.data);
+ p_delete(&token.data);
current_hook_type = 0;
}
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;
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);
mutt_error ("%s", err.data);
mutt_sleep (1);
- current_hook_type = 0;
- return;
+ if (ERROR_STOP) {
+ p_delete(&token.data);
+ current_hook_type = 0;
+ return;
+ }
}
}
- FREE (&token.data);
+ p_delete(&token.data);
current_hook_type = 0;
}
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)))
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);
mutt_error ("%s", err.data);
mutt_sleep (1);
-
- return;
+ if (ERROR_STOP) {
+ p_delete(&token.data);
+ current_hook_type = 0;
+ return;
+ }
}
}
}
- FREE (&token.data);
+ p_delete(&token.data);
}
#endif
projects / apps / madmutt.git / blobdiff