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

diff --git a/hook.c b/hook.c
index e88633e..6a72868 100644
--- a/hook.c
+++ b/hook.c
@@ -7,27 +7,20 @@
  * 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 "mutt.h"
-#include "mailbox.h"
-#include "mutt_crypt.h"
+#include "alias.h"
+#include "pattern.h"
 
-#ifdef USE_COMPRESSED
-#include "compress.h"
-#endif
-
-#include <limits.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <unistd.h>
+#define ERROR_STOP      0
 
 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;
@@ -35,10 +28,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;
@@ -47,19 +40,18 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
   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);
+    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;
   }
 
@@ -69,63 +61,61 @@ 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);
-    FREE (&pattern.data);
-    memset (&pattern, 0, sizeof (pattern));
-    pattern.data = safe_strdup (path);
+    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);
-    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));
+    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)) {
+        ptr->rx.not == not && !m_strcmp(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)) {
-          FREE (&command.data);
-          FREE (&pattern.data);
+        if (!m_strcmp(ptr->command, command.data)) {
+          p_delete(&command.data);
+          p_delete(&pattern.data);
           return 0;
         }
       }
@@ -135,9 +125,9 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
          * 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);
+        p_delete(&ptr->command);
         ptr->command = command.data;
-        FREE (&pattern.data);
+        p_delete(&pattern.data);
         return 0;
       }
     }
@@ -155,7 +145,7 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
       goto error;
   }
   else {
-    rx = safe_malloc (sizeof (regex_t));
+    rx = p_new(regex_t, 1);
 #ifdef M_CRYPTHOOK
     if ((rc =
          REGCOMP (rx, NONULL (pattern.data),
@@ -170,17 +160,17 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
     {
       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));
+    ptr->next = p_new(HOOK, 1);
     ptr = ptr->next;
   }
   else
-    Hooks = ptr = safe_calloc (1, sizeof (HOOK));
+    Hooks = ptr = p_new(HOOK, 1);
   ptr->type = data;
   ptr->command = command.data;
   ptr->pattern = pat;
@@ -190,24 +180,24 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
   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);
+  p_delete(&h->command);
+  p_delete(&h->rx.pattern);
   if (h->rx.rx) {
     regfree (h->rx.rx);
   }
-  mutt_pattern_free (&h->pattern);
-  FREE (&h);
+  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 (int type)
+static void delete_hooks (long type)
 {
   HOOK *h;
   HOOK *prev;
@@ -230,12 +220,12 @@ 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)) {
     mutt_extract_token (buf, s, 0);
-    if (mutt_strcmp ("*", buf->data) == 0) {
+    if (m_strcmp("*", buf->data) == 0) {
       if (current_hook_type) {
         snprintf (err->data, err->dsize,
                   _("unhook: Can't do unhook * from within a hook."));
@@ -244,7 +234,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,
@@ -273,7 +263,7 @@ void mutt_folder_hook (char *path)
 
   err.data = buf;
   err.dsize = sizeof (buf);
-  memset (&token, 0, sizeof (token));
+  p_clear(&token, 1);
   for (; tmp; tmp = tmp->next) {
     if (!tmp->command)
       continue;
@@ -282,15 +272,17 @@ void mutt_folder_hook (char *path)
       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 (ERROR_STOP) {
+            p_delete(&token.data);
+            current_hook_type = 0;
+            return;
+          }
         }
       }
     }
   }
-  FREE (&token.data);
+  p_delete(&token.data);
 
   current_hook_type = 0;
 }
@@ -317,7 +309,7 @@ void mutt_message_hook (CONTEXT * ctx, HEADER * hdr, int type)
 
   err.data = buf;
   err.dsize = sizeof (buf);
-  memset (&token, 0, sizeof (token));
+  p_clear(&token, 1);
   for (hook = Hooks; hook; hook = hook->next) {
     if (!hook->command)
       continue;
@@ -325,19 +317,21 @@ void mutt_message_hook (CONTEXT * ctx, HEADER * hdr, int type)
     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 (ERROR_STOP) {
+            p_delete(&token.data);
+            current_hook_type = 0;
+            return;
+          }
         }
   }
-  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,
+mutt_addr_hook (char *path, ssize_t pathlen, unsigned long type, CONTEXT * ctx,
                 HEADER * hdr)
 {
   HOOK *hook;
@@ -357,12 +351,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, const 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);
 
@@ -383,9 +377,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;
 
@@ -394,45 +388,43 @@ void mutt_select_fcc (char *path, size_t pathlen, HEADER * hdr)
         (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);
+      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;
@@ -442,7 +434,7 @@ void mutt_account_hook (const char *url)
 
   err.data = buf;
   err.dsize = sizeof (buf);
-  memset (&token, 0, sizeof (token));
+  p_clear(&token, 1);
 
   for (hook = Hooks; hook; hook = hook->next) {
     if (!(hook->command && (hook->type & M_ACCOUNTHOOK)))
@@ -450,15 +442,16 @@ void mutt_account_hook (const char *url)
 
     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;
+        if (ERROR_STOP) {
+          p_delete(&token.data);
+          current_hook_type = 0;
+          return;
+        }
       }
     }
   }
 
-  FREE (&token.data);
+  p_delete(&token.data);
 }
-#endif