X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hook.c;h=c6686ae0612aa92b9c5a3935f33d83ebfba7ffae;hp=3eb5cd1b4e1935abe18c5e0d021b6e1e08a2becb;hb=91d0c04349c9345f0ee29a61cc18dfc144b60edc;hpb=9a1efcc01ddeca4106847f8eb28a704aca2dcf0b

diff --git a/hook.c b/hook.c
index 3eb5cd1..c6686ae 100644
--- a/hook.c
+++ b/hook.c
@@ -12,10 +12,12 @@
 #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"
 
@@ -23,7 +25,6 @@
 #include "compress.h"
 #endif
 
-#include "lib/str.h"
 #include "lib/rx.h"
 
 #include <limits.h>
@@ -56,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;
   }
 
@@ -78,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);
     p_delete(&pattern.data);
-    memset (&pattern, 0, sizeof (pattern));
-    pattern.data = str_dup (path);
+    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);
     }
   }
@@ -107,32 +107,32 @@ 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);
     p_delete(&pattern.data);
-    memset (&pattern, 0, sizeof (pattern));
-    pattern.data = str_dup (tmp);
+    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));
     p_delete(&command.data);
-    memset (&command, 0, sizeof (command));
-    command.data = str_dup (path);
+    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)) {
+        if (!m_strcmp(ptr->command, command.data)) {
           p_delete(&command.data);
           p_delete(&pattern.data);
           return 0;
@@ -244,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."));
@@ -282,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;
@@ -328,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;
@@ -407,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);
 }
@@ -455,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)))