# include "config.h"
#endif
+#include <limits.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <unistd.h>
+
#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 <lib-lib/rx.h>
#include "mutt.h"
#include "mx.h"
-#include "mutt_crypt.h"
-
-#ifdef USE_COMPRESSED
+#include <lib-crypt/crypt.h>
#include "compress.h"
-#endif
-
-#include "lib/rx.h"
-
-#include <limits.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <unistd.h>
#define ERROR_STOP 0
typedef struct hook {
- unsigned long type; /* hook type */
+ int type; /* hook type */
rx_t rx; /* regular expression */
char *command; /* filename, command or pattern to execute */
pattern_t *pattern; /* used for fcc,save,send-hook */
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)) {
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];
m_strcpy(tmp, sizeof(tmp), pattern.data);
current_hook_type = 0;
}
-char *mutt_find_hook (unsigned long type, const char *pat)
+char *mutt_find_hook (int type, const char *pat)
{
HOOK *tmp = Hooks;
return (NULL);
}
-void mutt_message_hook (CONTEXT * ctx, HEADER * hdr, unsigned long type)
+void mutt_message_hook (CONTEXT * ctx, HEADER * hdr, int type)
{
BUFFER err, token;
HOOK *hook;
return _mutt_string_hook (adr->mailbox, M_CRYPTHOOK);
}
-#ifdef USE_SOCKET
void mutt_account_hook (const char *url)
{
HOOK *hook;
p_delete(&token.data);
}
-#endif