X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hook.c;h=6a728687b433c2f419576b2a13348bafcc884fa7;hp=afa528d5ba7d8ada433dad9cecc3f22e96cc28ea;hb=7d29626ce4e1fa932c6349c7253e6f774df069fc;hpb=10b7d54ecaa5c54622bf1239b57fa2e3359db0e1

diff --git a/hook.c b/hook.c
index afa528d..6a72868 100644
--- a/hook.c
+++ b/hook.c
@@ -7,36 +7,19 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
+#include <lib-ui/curses.h>
+#include <lib-mx/mx.h>
+#include <lib-mx/compress.h>
+#include <lib-crypt/crypt.h>
 
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/buffer.h>
-#include <lib-lib/file.h>
-
-#include "mutt.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>
+#include "alias.h"
+#include "pattern.h"
 
 #define ERROR_STOP      0
 
 typedef struct hook {
-  unsigned long type;           /* hook type */
+  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 */
@@ -47,8 +30,8 @@ static HOOK *Hooks = NULL;
 
 static unsigned long current_hook_type = 0;
 
-int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s, unsigned long data,
-                     BUFFER * err)
+int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s,
+                     unsigned long data, BUFFER * err)
 {
   HOOK *ptr;
   BUFFER command, pattern;
@@ -94,14 +77,12 @@ int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s, unsigned
     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)) {
       m_strcpy(err->data, err->dsize, _("bad formatted command string"));
       return (-1);
     }
   }
-#endif
   else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ACCOUNTHOOK))
            && !(data & M_CRYPTHOOK))
   {
@@ -211,12 +192,12 @@ static void delete_hook (HOOK * h)
   if (h->rx.rx) {
     regfree (h->rx.rx);
   }
-  mutt_pattern_free (&h->pattern);
+  pattern_list_wipe(&h->pattern);
   p_delete(&h);
 }
 
 /* Deletes all hooks of type ``type'', or all defined hooks if ``type'' is 0 */
-static void delete_hooks (unsigned long type)
+static void delete_hooks (long type)
 {
   HOOK *h;
   HOOK *prev;
@@ -306,7 +287,7 @@ void mutt_folder_hook (char *path)
   current_hook_type = 0;
 }
 
-char *mutt_find_hook (unsigned long type, const char *pat)
+char *mutt_find_hook (int type, const char *pat)
 {
   HOOK *tmp = Hooks;
 
@@ -318,7 +299,7 @@ char *mutt_find_hook (unsigned long type, const char *pat)
   return (NULL);
 }
 
-void mutt_message_hook (CONTEXT * ctx, HEADER * hdr, unsigned long type)
+void mutt_message_hook (CONTEXT * ctx, HEADER * hdr, int type)
 {
   BUFFER err, token;
   HOOK *hook;
@@ -350,7 +331,7 @@ void mutt_message_hook (CONTEXT * ctx, HEADER * hdr, unsigned long type)
 }
 
 static int
-mutt_addr_hook (char *path, size_t pathlen, unsigned long type, CONTEXT * ctx,
+mutt_addr_hook (char *path, ssize_t pathlen, unsigned long type, CONTEXT * ctx,
                 HEADER * hdr)
 {
   HOOK *hook;
@@ -370,7 +351,7 @@ mutt_addr_hook (char *path, size_t pathlen, unsigned long type, CONTEXT * ctx,
   return -1;
 }
 
-void mutt_default_save (char *path, size_t pathlen, HEADER * hdr)
+void mutt_default_save (char *path, ssize_t pathlen, const HEADER * hdr)
 {
   *path = 0;
   if (mutt_addr_hook (path, pathlen, M_SAVEHOOK, Context, hdr) != 0) {
@@ -396,7 +377,7 @@ void mutt_default_save (char *path, size_t pathlen, HEADER * hdr)
   }
 }
 
-void mutt_select_fcc (char *path, size_t pathlen, HEADER * hdr)
+void mutt_select_fcc (char *path, ssize_t pathlen, HEADER * hdr)
 {
   address_t *adr;
   char buf[_POSIX_PATH_MAX];
@@ -417,35 +398,33 @@ void mutt_select_fcc (char *path, size_t pathlen, HEADER * hdr)
   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;
 
   for (; tmp; tmp = tmp->next) {
-    if ((tmp->type & hook) && ((match &&
-                                regexec (tmp->rx.rx, match, 0, NULL,
-                                         0) == 0) ^ tmp->rx.not))
+    if ((tmp->type & hook)
+    && ((match && regexec(tmp->rx.rx, match, 0, NULL, 0) == 0) ^ tmp->rx.not))
       return (tmp->command);
   }
   return (NULL);
 }
 
-char *mutt_charset_hook (const char *chs)
+const char *mutt_charset_hook (const char *chs)
 {
   return _mutt_string_hook (chs, M_CHARSETHOOK);
 }
 
-char *mutt_iconv_hook (const char *chs)
+const char *mutt_iconv_hook (const char *chs)
 {
   return _mutt_string_hook (chs, M_ICONVHOOK);
 }
 
-char *mutt_crypt_hook (address_t * 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;
@@ -476,4 +455,3 @@ void mutt_account_hook (const char *url)
 
   p_delete(&token.data);
 }
-#endif