X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hook.c;h=64327871034d8151e79f400a0d449242d4ee2fcc;hp=ab9898ea09cfeb85a39480b9c6f40ab2e831ac02;hb=9f66d0f5a23ad4fe8359006fa82abdc20737ddf1;hpb=9274cbe8e6410ddb95ddc667faa678a29da85420

diff --git a/hook.c b/hook.c
index ab9898e..6432787 100644
--- a/hook.c
+++ b/hook.c
@@ -14,9 +14,10 @@
 #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"
 
@@ -125,14 +126,14 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
   /* 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 +245,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."));
@@ -407,7 +408,7 @@ 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);
     }