X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hook.c;h=0711ca7097d7ac5311e402088ad9db19b1f60503;hp=f3853a9d5947ef9e50a299fe057eb716027ce239;hb=a8477ebaa09990b3688164cbe5cf661c4189541d;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281

diff --git a/hook.c b/hook.c
index f3853a9..0711ca7 100644
--- a/hook.c
+++ b/hook.c
@@ -1,19 +1,10 @@
-/* 
+/*
+ * 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
@@ -21,13 +12,18 @@
 #endif
 
 #include "mutt.h"
-#include "mailbox.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 <limits.h>
 #include <string.h>
 #include <stdlib.h>
@@ -36,7 +32,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;
@@ -92,7 +88,7 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
     _mutt_expand_path (path, sizeof (path), 1);
     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)) {
@@ -111,7 +107,7 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
     mutt_check_simple (tmp, sizeof (tmp), DefaultHook);
     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)) {
@@ -119,20 +115,20 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
     mutt_expand_path (path, sizeof (path));
     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)) {
+        if (!str_cmp (ptr->command, command.data)) {
           FREE (&command.data);
           FREE (&pattern.data);
           return 0;
@@ -244,7 +240,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."));