X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hook.c;h=27f0afa6526f1957132a0c54831f1b51e36ea4b0;hp=fcb6a22b0f1c92144af33c68bef9729fe96d58f5;hb=03fe827a7d4a7ad79ac235654414aa339a9a2c9a;hpb=238b70e39b78f585c586bd51aef41988b3cc73d1

diff --git a/hook.c b/hook.c
index fcb6a22..27f0afa 100644
--- a/hook.c
+++ b/hook.c
@@ -11,27 +11,23 @@
 # include "config.h"
 #endif
 
+#include <limits.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <unistd.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 <lib-lib/rx.h>
 
 #include "mutt.h"
 #include "mx.h"
-#include "mutt_crypt.h"
-
-#ifdef USE_COMPRESSED
+#include <lib-crypt/crypt.h>
 #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
 
@@ -45,9 +41,9 @@ typedef struct hook {
 
 static HOOK *Hooks = NULL;
 
-static int current_hook_type = 0;
+static unsigned long current_hook_type = 0;
 
-int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
+int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s, unsigned long data,
                      BUFFER * err)
 {
   HOOK *ptr;
@@ -61,8 +57,7 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
   p_clear(&command, 1);
 
   if (*s->dptr == '!') {
-    s->dptr++;
-    SKIPWS (s->dptr);
+    s->dptr = vskipspaces(s->dptr + 1);
     not = 1;
   }
 
@@ -95,17 +90,15 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long 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)) {
       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))
-    ) {
+           && !(data & M_CRYPTHOOK))
+  {
     char tmp[HUGE_STRING];
 
     m_strcpy(tmp, sizeof(tmp), pattern.data);
@@ -217,7 +210,7 @@ static void delete_hook (HOOK * 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 (unsigned long type)
 {
   HOOK *h;
   HOOK *prev;
@@ -240,7 +233,7 @@ static void delete_hooks (int type)
   }
 }
 
-int mutt_parse_unhook (BUFFER * buf, BUFFER * s, unsigned long data,
+int mutt_parse_unhook (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)),
                        BUFFER * err)
 {
   while (MoreArgs (s)) {
@@ -254,7 +247,7 @@ int mutt_parse_unhook (BUFFER * buf, BUFFER * s, unsigned long data,
       delete_hooks (0);
     }
     else {
-      int type = mutt_get_hook_type (buf->data);
+      unsigned long type = mutt_get_hook_type (buf->data);
 
       if (!type) {
         snprintf (err->data, err->dsize,
@@ -351,7 +344,7 @@ void mutt_message_hook (CONTEXT * ctx, HEADER * hdr, int type)
 }
 
 static int
-mutt_addr_hook (char *path, size_t pathlen, int type, CONTEXT * ctx,
+mutt_addr_hook (char *path, size_t pathlen, unsigned long type, CONTEXT * ctx,
                 HEADER * hdr)
 {
   HOOK *hook;
@@ -376,7 +369,7 @@ void mutt_default_save (char *path, size_t pathlen, HEADER * hdr)
   *path = 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);
 
@@ -399,7 +392,7 @@ void mutt_default_save (char *path, size_t pathlen, HEADER * hdr)
 
 void mutt_select_fcc (char *path, size_t pathlen, HEADER * hdr)
 {
-  ADDRESS *adr;
+  address_t *adr;
   char buf[_POSIX_PATH_MAX];
   ENVELOPE *env = hdr->env;
 
@@ -441,12 +434,11 @@ char *mutt_iconv_hook (const char *chs)
   return _mutt_string_hook (chs, M_ICONVHOOK);
 }
 
-char *mutt_crypt_hook (ADDRESS * adr)
+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;
@@ -477,4 +469,3 @@ void mutt_account_hook (const char *url)
 
   p_delete(&token.data);
 }
-#endif