X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hook.c;h=aa0d47857a4db245b31ebe52bd7e6c74f6b54daf;hp=64327871034d8151e79f400a0d449242d4ee2fcc;hb=2a2f2f9a5bad73c883b7f9c9b4166d932b6aaf37;hpb=ae0ce4dfcafa0c3820f107c5bfa8bd06e5272b57

diff --git a/hook.c b/hook.c
index 6432787..aa0d478 100644
--- a/hook.c
+++ b/hook.c
@@ -11,27 +11,24 @@
 # 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 "alias.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,10 +42,10 @@ 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,
-                     BUFFER * err)
+int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s,
+                     unsigned long data, BUFFER * err)
 {
   HOOK *ptr;
   BUFFER command, pattern;
@@ -61,15 +58,14 @@ 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;
   }
 
   mutt_extract_token (&pattern, s, 0);
 
   if (!MoreArgs (s)) {
-    strfcpy (err->data, _("too few arguments"), err->dsize);
+    m_strcpy(err->data, err->dsize, _("too few arguments"));
     goto error;
   }
 
@@ -79,36 +75,34 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
                         M_ACCOUNTHOOK | M_REPLYHOOK)) ? M_TOKEN_SPACE : 0);
 
   if (!command.data) {
-    strfcpy (err->data, _("too few arguments"), err->dsize);
+    m_strcpy(err->data, err->dsize, _("too few arguments"));
     goto error;
   }
 
   if (MoreArgs (s)) {
-    strfcpy (err->data, _("too many arguments"), err->dsize);
+    m_strcpy(err->data, err->dsize, _("too many arguments"));
     goto error;
   }
 
   if (data & (M_FOLDERHOOK | M_MBOXHOOK)) {
-    strfcpy (path, pattern.data, sizeof (path));
+    m_strcpy(path, sizeof(path), pattern.data);
     _mutt_expand_path (path, sizeof (path), 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);
+      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];
 
-    strfcpy (tmp, pattern.data, sizeof (tmp));
+    m_strcpy(tmp, sizeof(tmp), pattern.data);
     mutt_check_simple (tmp, sizeof (tmp), DefaultHook);
     p_delete(&pattern.data);
     p_clear(&pattern, 1);
@@ -116,7 +110,7 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
   }
 
   if (data & (M_MBOXHOOK | M_SAVEHOOK | M_FCCHOOK)) {
-    strfcpy (path, command.data, sizeof (path));
+    m_strcpy(path, sizeof(path), command.data);
     mutt_expand_path (path, sizeof (path));
     p_delete(&command.data);
     p_clear(&command, 1);
@@ -217,7 +211,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 (long type)
 {
   HOOK *h;
   HOOK *prev;
@@ -240,7 +234,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 +248,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 +345,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, ssize_t pathlen, unsigned long type, CONTEXT * ctx,
                 HEADER * hdr)
 {
   HOOK *hook;
@@ -371,12 +365,12 @@ mutt_addr_hook (char *path, size_t pathlen, int 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, 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);
 
@@ -397,9 +391,9 @@ 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 *adr;
+  address_t *adr;
   char buf[_POSIX_PATH_MAX];
   ENVELOPE *env = hdr->env;
 
@@ -410,43 +404,41 @@ void mutt_select_fcc (char *path, size_t pathlen, HEADER * hdr)
       mutt_safe_path (buf, sizeof (buf), adr);
       mutt_concat_path(path, pathlen, NONULL(Maildir), buf);
       if (!option (OPTFORCENAME) && mx_access (path, W_OK) != 0)
-        strfcpy (path, NONULL (Outbox), pathlen);
+        m_strcpy(path, pathlen, NONULL(Outbox));
     }
     else
-      strfcpy (path, NONULL (Outbox), pathlen);
+      m_strcpy(path, pathlen, NONULL(Outbox));
   }
   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 * 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;
@@ -477,4 +469,3 @@ void mutt_account_hook (const char *url)
 
   p_delete(&token.data);
 }
-#endif