* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
+#include <lib-ui/curses.h>
+#include <lib-mx/mx.h>
+#include <lib-mx/compress.h>
+#include <lib-crypt/crypt.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 "alias.h"
+#include "pattern.h"
-#include "mutt.h"
-#include "mx.h"
-#include "mutt_crypt.h"
-
-#ifdef USE_COMPRESSED
-#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 */
+typedef struct hook_t {
+ 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 */
- struct hook *next;
-} HOOK;
+ struct hook_t *next;
+} hook_t;
-static HOOK *Hooks = NULL;
+DO_INIT(hook_t, hook);
+static inline void hook_wipe(hook_t *hk) {
+ p_delete(&hk->command);
+ pattern_list_wipe(&hk->pattern);
+}
+DO_NEW(hook_t, hook);
+DO_DELETE(hook_t, hook);
+DO_SLIST(hook_t, hook, hook_delete);
+static hook_t *Hooks = NULL;
static unsigned long current_hook_type = 0;
-int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s, unsigned long data,
- BUFFER * err)
+int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s,
+ unsigned long data, BUFFER * err)
{
- HOOK *ptr;
+ hook_t *ptr;
BUFFER command, pattern;
int rc, not = 0;
regex_t *rx = NULL;
}
if (data & (M_FOLDERHOOK | M_MBOXHOOK)) {
- m_strcpy(path, sizeof(path), pattern.data);
- _mutt_expand_path (path, sizeof (path), 1);
+ _mutt_expand_path (path, sizeof (path), pattern.data, 1);
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)) {
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);
/* check to make sure that a matching hook doesn't already exist */
for (ptr = Hooks; ptr; ptr = ptr->next) {
- if (ptr->type == data &&
+ if (ptr->type == (int)data &&
ptr->rx.not == not && !m_strcmp(pattern.data, ptr->rx.pattern)) {
if (data &
(M_FOLDERHOOK | M_SENDHOOK | M_SEND2HOOK | M_MESSAGEHOOK |
}
if (ptr) {
- ptr->next = p_new(HOOK, 1);
+ ptr->next = p_new(hook_t, 1);
ptr = ptr->next;
}
else
- Hooks = ptr = p_new(HOOK, 1);
+ Hooks = ptr = p_new(hook_t, 1);
ptr->type = data;
ptr->command = command.data;
ptr->pattern = pat;
return (-1);
}
-static void delete_hook (HOOK * h)
-{
- p_delete(&h->command);
- p_delete(&h->rx.pattern);
- if (h->rx.rx) {
- regfree (h->rx.rx);
- }
- mutt_pattern_free (&h->pattern);
- p_delete(&h);
-}
-
/* Deletes all hooks of type ``type'', or all defined hooks if ``type'' is 0 */
-static void delete_hooks (unsigned long type)
+static void delete_hooks (long type)
{
- HOOK *h;
- HOOK *prev;
-
- while (h = Hooks, h && (type == 0 || type == h->type)) {
- Hooks = h->next;
- delete_hook (h);
- }
-
- prev = h; /* Unused assignment to avoid compiler warnings */
-
- while (h) {
- if (type == h->type) {
- prev->next = h->next;
- delete_hook (h);
+ hook_t **l = &Hooks;
+
+ while (*l) {
+ if ((*l)->type == type) {
+ hook_t *tmp = hook_list_pop(l);
+ hook_delete(&tmp);
+ } else {
+ l = &(*l)->next;
+ }
}
- else
- prev = h;
- h = prev->next;
- }
}
int mutt_parse_unhook (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)),
_("unhook: Can't do unhook * from within a hook."));
return -1;
}
- delete_hooks (0);
- }
- else {
+ hook_list_wipe(&Hooks);
+ } else {
unsigned long type = mutt_get_hook_type (buf->data);
if (!type) {
void mutt_folder_hook (char *path)
{
- HOOK *tmp = Hooks;
+ hook_t *tmp = Hooks;
BUFFER err, token;
char buf[STRING];
if (mutt_parse_rc_line (tmp->command, &token, &err) == -1) {
mutt_error ("%s", err.data);
mutt_sleep (1); /* pause a moment to let the user see the error */
- if (ERROR_STOP) {
- p_delete(&token.data);
- current_hook_type = 0;
- return;
- }
}
}
}
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;
+ hook_t *tmp = Hooks;
for (; tmp; tmp = tmp->next)
if (tmp->type & type) {
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;
+ hook_t *hook;
char buf[STRING];
current_hook_type = type;
if (mutt_parse_rc_line (hook->command, &token, &err) != 0) {
mutt_error ("%s", err.data);
mutt_sleep (1);
- if (ERROR_STOP) {
- p_delete(&token.data);
- current_hook_type = 0;
- return;
- }
}
}
p_delete(&token.data);
}
static int
-mutt_addr_hook (char *path, size_t pathlen, unsigned long type, CONTEXT * ctx,
+mutt_addr_hook (char *path, ssize_t pathlen, unsigned long type, CONTEXT * ctx,
HEADER * hdr)
{
- HOOK *hook;
+ hook_t *hook;
/* determine if a matching hook exists */
for (hook = Hooks; hook; hook = hook->next) {
return -1;
}
-void mutt_default_save (char *path, size_t pathlen, HEADER * hdr)
+void mutt_default_save (char *path, ssize_t pathlen, HEADER * hdr)
{
*path = 0;
if (mutt_addr_hook (path, pathlen, M_SAVEHOOK, Context, hdr) != 0) {
}
}
-void mutt_select_fcc (char *path, size_t pathlen, HEADER * hdr)
+void mutt_select_fcc (char *path, ssize_t pathlen, HEADER * hdr)
{
address_t *adr;
char buf[_POSIX_PATH_MAX];
mutt_pretty_mailbox (path);
}
-static char *_mutt_string_hook (const char *match, int hook)
+static const char *_mutt_string_hook (const char *match, int hook)
{
- HOOK *tmp = Hooks;
+ hook_t *tmp = Hooks;
for (; tmp; tmp = tmp->next) {
- if ((tmp->type & hook) && ((match &&
- regexec (tmp->rx.rx, match, 0, NULL,
- 0) == 0) ^ tmp->rx.not))
+ if ((tmp->type & hook)
+ && ((match && regexec(tmp->rx.rx, match, 0, NULL, 0) == 0) ^ tmp->rx.not))
return (tmp->command);
}
return (NULL);
}
-char *mutt_charset_hook (const char *chs)
+const char *mutt_charset_hook (const char *chs)
{
return _mutt_string_hook (chs, M_CHARSETHOOK);
}
-char *mutt_iconv_hook (const char *chs)
+const char *mutt_iconv_hook (const char *chs)
{
return _mutt_string_hook (chs, M_ICONVHOOK);
}
-char *mutt_crypt_hook (address_t * adr)
+const char *mutt_crypt_hook (address_t * adr)
{
return _mutt_string_hook (adr->mailbox, M_CRYPTHOOK);
}
-#ifdef USE_SOCKET
void mutt_account_hook (const char *url)
{
- HOOK *hook;
+ hook_t *hook;
BUFFER token;
BUFFER err;
char buf[STRING];
if (mutt_parse_rc_line (hook->command, &token, &err) == -1) {
mutt_error ("%s", err.data);
mutt_sleep (1);
- if (ERROR_STOP) {
- p_delete(&token.data);
- current_hook_type = 0;
- return;
- }
}
}
}
p_delete(&token.data);
}
-#endif
projects / apps / madmutt.git / blobdiff