Build system simplifications.

[apps/madmutt.git] / hook.c

diff --git a/hook.c b/hook.c
index 3c3c739..0e6a689 100644 (file)
--- a/hook.c
+++ b/hook.c
@@ -12,9 +12,9 @@
 #include <lib-ui/curses.h>
 #include <lib-mx/mx.h>
 #include <lib-mx/compress.h>
-#include <lib-crypt/crypt.h>
 
 #include "alias.h"
+#include "crypt.h"
 #include "pattern.h"
 
 typedef struct hook_t {
@@ -123,8 +123,7 @@ int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s,
           p_delete(&pattern.data);
           return 0;
         }
-      }
-      else {
+      } else {
         /* other hooks only allow one command per pattern, so update the
          * entry with the new command.  this currently does not change the
          * order of execution of the hooks, which i think is desirable since
@@ -140,18 +139,16 @@ int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s,
       break;
   }
 
-  if (data &
-      (M_SENDHOOK | M_SEND2HOOK | M_SAVEHOOK | M_FCCHOOK | M_MESSAGEHOOK |
-       M_REPLYHOOK)) {
+  if (data & (M_SENDHOOK | M_SEND2HOOK | M_SAVEHOOK | M_FCCHOOK |
+              M_MESSAGEHOOK | M_REPLYHOOK))
+  {
     if ((pat =
          mutt_pattern_comp (pattern.data,
                             (data & (M_SENDHOOK | M_SEND2HOOK | M_FCCHOOK)) ?
                             0 : M_FULL_MSG, err)) == NULL)
       goto error;
-  }
-  else {
+  } else {
     rx = p_new(regex_t, 1);
-#ifdef M_CRYPTHOOK
     if ((rc = REGCOMP(rx, NONULL(pattern.data),
                   ((data & M_CRYPTHOOK) ? REG_ICASE : 0))) != 0)
     {
@@ -160,15 +157,14 @@ int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s,
       p_delete(&rx);
       goto error;
     }
-#endif /* M_CRYPTHOOK */
   }
 
   if (ptr) {
     ptr->next = p_new(hook_t, 1);
     ptr = ptr->next;
-  }
-  else
+  } else {
     Hooks = ptr = p_new(hook_t, 1);
+  }
   ptr->type = data;
   ptr->command = command.data;
   ptr->pattern = pat;
@@ -371,10 +367,10 @@ void mutt_select_fcc (char *path, ssize_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)
-        m_strcpy(path, pathlen, NONULL(Outbox));
+        m_strcpy(path, pathlen, NONULL(MAlias.record));
     }
     else
-      m_strcpy(path, pathlen, NONULL(Outbox));
+      m_strcpy(path, pathlen, NONULL(MAlias.record));
   }
   mutt_pretty_mailbox (path);
 }
@@ -421,5 +417,3 @@ void mutt_account_hook (const char *url)
 
   p_delete(&token.data);
 }
-
-/* vim:set ft=c: */