X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hook.c;h=37eda9e1c60104d4c31c50297d628d29709c3867;hp=12d455f52fcf279b752030ba11f2ece873ec2dc2;hb=dc726add2e8fe52be1f6859ea7cbe4651498eeb8;hpb=67b2c8d6719bccd621e47b59cb89b9e2cb97d4f5

diff --git a/hook.c b/hook.c
index 12d455f..37eda9e 100644
--- a/hook.c
+++ b/hook.c
@@ -1,278 +1,223 @@
-/* 
+/*
+ * 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.
  */
 
-#include "mutt.h"
-#include "mailbox.h"
-#include "mutt_crypt.h"
-
-#ifdef USE_COMPRESSED
-#include "compress.h"
-#endif
-
-#include <limits.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <unistd.h>
-
-typedef struct hook
-{
-  int type;		/* hook type */
-  REGEXP rx;		/* regular expression */
-  char *command;	/* filename, command or pattern to execute */
-  pattern_t *pattern;	/* used for fcc,save,send-hook */
-  struct hook *next;
-} HOOK;
-
-static HOOK *Hooks = NULL;
+#include <lib-lib/lib-lib.h>
+#include <lib-lua/lib-lua.h>
+#include <lib-ui/lib-ui.h>
+#include <lib-mx/mx.h>
+#include <lib-mx/compress.h>
+
+#include "alias.h"
+#include "crypt.h"
+#include "pattern.h"
+
+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_t *next;
+} hook_t;
+
+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;
+  int rc, neg = 0;
   regex_t *rx = NULL;
   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);
-    not = 1;
+  if (*s->dptr == '!') {
+    s->dptr = vskipspaces(s->dptr + 1);
+    neg = 1;
   }
 
   mutt_extract_token (&pattern, s, 0);
 
-  if (!MoreArgs (s))
-  {
-    strfcpy (err->data, _("too few arguments"), err->dsize);
+  if (!MoreArgs (s)) {
+    m_strcpy(err->data, err->dsize, _("too few arguments"));
     goto error;
   }
 
-  mutt_extract_token (&command, s, (data & (M_FOLDERHOOK | M_SENDHOOK | M_ACCOUNTHOOK | M_REPLYHOOK)) ?  M_TOKEN_SPACE : 0);
+  mutt_extract_token(&command, s, (data & (M_FOLDERHOOK | M_SENDHOOK |
+                                           M_SEND2HOOK | M_REPLYHOOK)) ?
+                     M_TOKEN_SPACE : 0);
 
-  if (!command.data)
-  {
-    strfcpy (err->data, _("too few arguments"), err->dsize);
+  if (!command.data) {
+    m_strcpy(err->data, err->dsize, _("too few arguments"));
     goto error;
   }
 
-  if (MoreArgs (s))
-  {
-    strfcpy (err->data, _("too many arguments"), err->dsize);
+  if (MoreArgs (s)) {
+    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);
-    FREE (&pattern.data);
-    memset (&pattern, 0, sizeof (pattern));
-    pattern.data = safe_strdup (path);
+  if (data & (M_FOLDERHOOK | M_MBOXHOOK)) {
+    _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);
+  else if (data & (M_APPENDHOOK | M_OPENHOOK | M_CLOSEHOOK)) {
+    if (mutt_test_compress_command (command.data)) {
+      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))
-      )
+  else if (DefaultHook && !(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);
-    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));
+  if (data & (M_MBOXHOOK | M_SAVEHOOK | M_FCCHOOK)) {
+    m_strcpy(path, sizeof(path), command.data);
     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))
-    {
-      if (data & (M_FOLDERHOOK | M_SENDHOOK | M_MESSAGEHOOK | M_ACCOUNTHOOK | M_REPLYHOOK))
+  for (ptr = Hooks; ptr; ptr = ptr->next) {
+    if (ptr->type == (int)data &&
+        ptr->rx.neg == neg && !m_strcmp(pattern.data, ptr->rx.pattern)) {
+      if (data & (M_FOLDERHOOK | M_SENDHOOK | M_SEND2HOOK | M_MESSAGEHOOK |
+           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);
-	  return 0;
-	}
-      }
-      else
-      {
-	/* other hooks only allow one command per pattern, so update the
-	 * entry with the new command.  this currently does not change the
-	 * 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);
-	ptr->command = command.data;
-	FREE (&pattern.data);
-	return 0;
+        /* 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 (!m_strcmp(ptr->command, command.data)) {
+          p_delete(&command.data);
+          p_delete(&pattern.data);
+          return 0;
+        }
+      } else {
+        /* other hooks only allow one command per pattern, so update the
+         * entry with the new command.  this currently does not change the
+         * 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. */
+        p_delete(&ptr->command);
+        ptr->command = command.data;
+        p_delete(&pattern.data);
+        return 0;
       }
     }
     if (!ptr->next)
       break;
   }
 
-  if (data & (M_SENDHOOK | M_SAVEHOOK | M_FCCHOOK | M_MESSAGEHOOK | M_REPLYHOOK))
+  if (data & (M_SENDHOOK | M_SEND2HOOK | M_SAVEHOOK | M_FCCHOOK |
+              M_MESSAGEHOOK | M_REPLYHOOK))
   {
-    if ((pat = mutt_pattern_comp (pattern.data,
-	   (data & (M_SENDHOOK | M_FCCHOOK)) ? 0 : M_FULL_MSG,
-				  err)) == NULL)
+    if ((pat =
+         mutt_pattern_comp (pattern.data,
+                            (data & (M_SENDHOOK | M_SEND2HOOK | M_FCCHOOK)) ?
+                            0 : M_FULL_MSG, err)) == NULL)
       goto error;
-  }
-  else
-  {
-    rx = safe_malloc (sizeof (regex_t));
-#ifdef M_CRYPTHOOK
-    if ((rc = REGCOMP (rx, NONULL(pattern.data), ((data & (M_CRYPTHOOK|M_CHARSETHOOK)) ? REG_ICASE : 0))) != 0)
-#else
-    if ((rc = REGCOMP (rx, NONULL(pattern.data), (data & (M_CHARSETHOOK|M_ICONVHOOK)) ? REG_ICASE : 0)) != 0)
-#endif /* M_CRYPTHOOK */
+  } else {
+    rx = p_new(regex_t, 1);
+    if ((rc = REGCOMP(rx, NONULL(pattern.data),
+                  ((data & M_CRYPTHOOK) ? REG_ICASE : 0))) != 0)
     {
       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));
+  if (ptr) {
+    ptr->next = p_new(hook_t, 1);
     ptr = ptr->next;
+  } else {
+    Hooks = ptr = p_new(hook_t, 1);
   }
-  else
-    Hooks = ptr = safe_calloc (1, sizeof (HOOK));
   ptr->type = data;
   ptr->command = command.data;
   ptr->pattern = pat;
   ptr->rx.pattern = pattern.data;
   ptr->rx.rx = rx;
-  ptr->rx.not = not;
+  ptr->rx.neg = neg;
   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);
-  if (h->rx.rx)
-  {
-    regfree (h->rx.rx);
-  }
-  mutt_pattern_free (&h->pattern);
-  FREE (&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, BUFFER *err)
+int mutt_parse_unhook (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)),
+                       BUFFER * err)
 {
-  while (MoreArgs (s))
-  {
+  while (MoreArgs (s)) {
     mutt_extract_token (buf, s, 0);
-    if (mutt_strcmp ("*", buf->data) == 0)
-    {
-      if (current_hook_type)
-      {
-	snprintf (err->data, err->dsize,
-		  _("unhook: Can't do unhook * from within a hook."));
-	return -1;
+    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);
-
-      if (!type)
-      {
-	snprintf (err->data, err->dsize,
-		 _("unhook: unknown hook type: %s"), buf->data);
-	return (-1);
+      hook_list_wipe(&Hooks);
+    } else {
+      unsigned long type = mutt_get_hook_type (buf->data);
+
+      if (!type) {
+        snprintf (err->data, err->dsize,
+                  _("unhook: unknown hook type: %s"), buf->data);
+        return (-1);
       }
-      if (current_hook_type == type)
-      {
-	snprintf (err->data, err->dsize, _("unhook: Can't delete a %s from within a %s."),
-		  buf->data, buf->data);
-	return -1;
+      if (current_hook_type == type) {
+        snprintf (err->data, err->dsize,
+                  _("unhook: Can't delete a %s from within a %s."), buf->data,
+                  buf->data);
+        return -1;
       }
       delete_hooks (type);
     }
@@ -282,113 +227,112 @@ int mutt_parse_unhook (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
 
 void mutt_folder_hook (char *path)
 {
-  HOOK *tmp = Hooks;
+  hook_t *tmp = Hooks;
   BUFFER err, token;
   char buf[STRING];
 
   current_hook_type = M_FOLDERHOOK;
-  
+
   err.data = buf;
   err.dsize = sizeof (buf);
-  memset (&token, 0, sizeof (token));
-  for (; tmp; tmp = tmp->next)
-  {
-    if(!tmp->command)
+  p_clear(&token, 1);
+  for (; tmp; tmp = tmp->next) {
+    if (!tmp->command)
       continue;
 
-    if (tmp->type & M_FOLDERHOOK)
-    {
-      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 (tmp->type & M_FOLDERHOOK) {
+      if ((regexec (tmp->rx.rx, path, 0, NULL, 0) == 0) ^ tmp->rx.neg) {
+        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 */
+        }
       }
     }
   }
-  FREE (&token.data);
-  
+  p_delete(&token.data);
+
   current_hook_type = 0;
+
+    {
+        lua_State *L = luaM_getruntime();
+        lua_getfield(L, LUA_GLOBALSINDEX, "mod_core");
+        lua_getfield(L, -1, "folder_hook");
+        lua_remove(L, -2);
+        if (lua_isfunction(L, -1)) {
+            lua_pushstring(L, LastFolder);
+            lua_pushstring(L, CurrentFolder);
+            lua_pcall(L, 2, 0, 0);
+        } else {
+            lua_pop(L, 1);
+        }
+    }
 }
 
 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)
-    {
+    if (tmp->type & type) {
       if (regexec (tmp->rx.rx, pat, 0, NULL, 0) == 0)
-	return (tmp->command);
+        return (tmp->command);
     }
   return (NULL);
 }
 
-void mutt_message_hook (CONTEXT *ctx, HEADER *hdr, int type)
+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;
-  
+
   err.data = buf;
   err.dsize = sizeof (buf);
-  memset (&token, 0, sizeof (token));
-  for (hook = Hooks; hook; hook = hook->next)
-  {
-    if(!hook->command)
+  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 ((mutt_pattern_exec (hook->pattern, 0, ctx, hdr) > 0) ^ hook->rx.neg)
+        if (mutt_parse_rc_line (hook->command, &token, &err) != 0) {
+          mutt_error ("%s", err.data);
+          mutt_sleep (1);
+        }
   }
-  FREE (&token.data);
+  p_delete(&token.data);
   current_hook_type = 0;
 }
 
 static int
-mutt_addr_hook (char *path, size_t pathlen, int type, CONTEXT *ctx, HEADER *hdr)
+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)
-  {
-    if(!hook->command)
+  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)
-      {
-	mutt_make_string (path, pathlen, hook->command, ctx, hdr);
-	return 0;
+      if ((mutt_pattern_exec (hook->pattern, 0, ctx, hdr) > 0) ^ hook->rx.neg) {
+        mutt_make_string (path, pathlen, hook->command, ctx, hdr);
+        return 0;
       }
   }
 
   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)
-  {
+  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);
 
@@ -402,95 +346,34 @@ void mutt_default_save (char *path, size_t pathlen, HEADER *hdr)
       adr = env->cc;
     else
       adr = NULL;
-    if (adr)
-    {
+    if (adr) {
       mutt_safe_path (tmp, sizeof (tmp), adr);
       snprintf (path, pathlen, "=%s", tmp);
     }
   }
 }
 
-void mutt_select_fcc (char *path, size_t pathlen, HEADER *hdr)
+void mutt_select_fcc (char *path, ssize_t pathlen, HEADER * hdr)
 {
-  ADDRESS *adr;
-  char buf[_POSIX_PATH_MAX];
-  ENVELOPE *env = hdr->env;
-
-  if (mutt_addr_hook (path, pathlen, M_FCCHOOK, NULL, hdr) != 0)
-  {
-    if ((option (OPTSAVENAME) || option (OPTFORCENAME)) &&
-	(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);
-      if (!option (OPTFORCENAME) && mx_access (path, W_OK) != 0)
-	strfcpy (path, NONULL (Outbox), pathlen);
+    if (mutt_addr_hook (path, pathlen, M_FCCHOOK, NULL, hdr) != 0) {
+        m_strcpy(path, pathlen, NONULL(MAlias.record));
     }
-    else
-      strfcpy (path, NONULL (Outbox), pathlen);
-  }
-  mutt_pretty_mailbox (path);
+    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))
+  for (; tmp; tmp = tmp->next) {
+    if ((tmp->type & hook)
+    && ((match && regexec(tmp->rx.rx, match, 0, NULL, 0) == 0) ^ tmp->rx.neg))
       return (tmp->command);
   }
   return (NULL);
 }
 
-char *mutt_charset_hook (const char *chs)
-{
-  return _mutt_string_hook (chs, M_CHARSETHOOK);
-}
-
-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;
-  BUFFER token;
-  BUFFER err;
-  char buf[STRING];
-
-  err.data = buf;
-  err.dsize = sizeof (buf);
-  memset (&token, 0, sizeof (token));
-
-  for (hook = Hooks; hook; hook = hook->next)
-  {
-    if (! (hook->command && (hook->type & M_ACCOUNTHOOK)))
-      continue;
-
-    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;
-      }
-    }
-  }
-
-  FREE (&token.data);
-}
-#endif