X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hook.c;h=7347070f9e0d3f1fd09f326d1f0c7ebd57e2aa15;hp=0a7ce546b68ee01cc7aa920b83b44db418430961;hb=df5b14084b39821395408679a2fb6f74605182ce;hpb=c565d2f14f1655a6483171e1636e5803533b6ebe

diff --git a/hook.c b/hook.c
index 0a7ce54..7347070 100644
--- a/hook.c
+++ b/hook.c
@@ -11,8 +11,13 @@
 # include "config.h"
 #endif
 
+#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 "buffer.h"
 #include "mx.h"
 #include "mutt_crypt.h"
 
@@ -20,9 +25,6 @@
 #include "compress.h"
 #endif
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/rx.h"
 
 #include <limits.h>
@@ -55,19 +57,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;
   }
 
@@ -77,26 +78,26 @@ 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);
-    mem_free (&pattern.data);
-    memset (&pattern, 0, sizeof (pattern));
-    pattern.data = str_dup (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);
     }
   }
@@ -106,34 +107,34 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
     ) {
     char tmp[HUGE_STRING];
 
-    strfcpy (tmp, pattern.data, sizeof (tmp));
+    m_strcpy(tmp, sizeof(tmp), pattern.data);
     mutt_check_simple (tmp, sizeof (tmp), DefaultHook);
-    mem_free (&pattern.data);
-    memset (&pattern, 0, sizeof (pattern));
-    pattern.data = str_dup (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));
-    mem_free (&command.data);
-    memset (&command, 0, sizeof (command));
-    command.data = str_dup (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 && !str_cmp (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 (!str_cmp (ptr->command, command.data)) {
-          mem_free (&command.data);
-          mem_free (&pattern.data);
+        if (!m_strcmp(ptr->command, command.data)) {
+          p_delete(&command.data);
+          p_delete(&pattern.data);
           return 0;
         }
       }
@@ -143,9 +144,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. */
-        mem_free (&ptr->command);
+        p_delete(&ptr->command);
         ptr->command = command.data;
-        mem_free (&pattern.data);
+        p_delete(&pattern.data);
         return 0;
       }
     }
@@ -163,7 +164,7 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
       goto error;
   }
   else {
-    rx = mem_malloc (sizeof (regex_t));
+    rx = p_new(regex_t, 1);
 #ifdef M_CRYPTHOOK
     if ((rc =
          REGCOMP (rx, NONULL (pattern.data),
@@ -178,17 +179,17 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
     {
       regerror (rc, rx, err->data, err->dsize);
       regfree (rx);
-      mem_free (&rx);
+      p_delete(&rx);
       goto error;
     }
   }
 
   if (ptr) {
-    ptr->next = mem_calloc (1, sizeof (HOOK));
+    ptr->next = p_new(HOOK, 1);
     ptr = ptr->next;
   }
   else
-    Hooks = ptr = mem_calloc (1, sizeof (HOOK));
+    Hooks = ptr = p_new(HOOK, 1);
   ptr->type = data;
   ptr->command = command.data;
   ptr->pattern = pat;
@@ -198,20 +199,20 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
   return 0;
 
 error:
-  mem_free (&pattern.data);
-  mem_free (&command.data);
+  p_delete(&pattern.data);
+  p_delete(&command.data);
   return (-1);
 }
 
 static void delete_hook (HOOK * h)
 {
-  mem_free (&h->command);
-  mem_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);
-  mem_free (&h);
+  p_delete(&h);
 }
 
 /* Deletes all hooks of type ``type'', or all defined hooks if ``type'' is 0 */
@@ -243,7 +244,7 @@ int mutt_parse_unhook (BUFFER * buf, BUFFER * s, unsigned long data,
 {
   while (MoreArgs (s)) {
     mutt_extract_token (buf, s, 0);
-    if (str_cmp ("*", 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."));
@@ -281,7 +282,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;
@@ -292,7 +293,7 @@ void mutt_folder_hook (char *path)
           mutt_error ("%s", err.data);
           mutt_sleep (1);       /* pause a moment to let the user see the error */
           if (ERROR_STOP) {
-            mem_free (&token.data);
+            p_delete(&token.data);
             current_hook_type = 0;
             return;
           }
@@ -300,7 +301,7 @@ void mutt_folder_hook (char *path)
       }
     }
   }
-  mem_free (&token.data);
+  p_delete(&token.data);
 
   current_hook_type = 0;
 }
@@ -327,7 +328,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;
@@ -338,13 +339,13 @@ void mutt_message_hook (CONTEXT * ctx, HEADER * hdr, int type)
           mutt_error ("%s", err.data);
           mutt_sleep (1);
           if (ERROR_STOP) {
-            mem_free (&token.data);
+            p_delete(&token.data);
             current_hook_type = 0;
             return;
           }
         }
   }
-  mem_free (&token.data);
+  p_delete(&token.data);
   current_hook_type = 0;
 }
 
@@ -374,7 +375,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);
 
@@ -397,7 +398,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;
 
@@ -406,12 +407,12 @@ 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);
 }
@@ -439,7 +440,7 @@ 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);
 }
@@ -454,7 +455,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)))
@@ -465,7 +466,7 @@ void mutt_account_hook (const char *url)
         mutt_error ("%s", err.data);
         mutt_sleep (1);
         if (ERROR_STOP) {
-          mem_free (&token.data);
+          p_delete(&token.data);
           current_hook_type = 0;
           return;
         }
@@ -473,6 +474,6 @@ void mutt_account_hook (const char *url)
     }
   }
 
-  mem_free (&token.data);
+  p_delete(&token.data);
 }
 #endif