projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mode flags.
[apps/madmutt.git]
/
hook.c
diff --git
a/hook.c
b/hook.c
index
db0b1a9
..
69ca2a0
100644
(file)
--- a/
hook.c
+++ b/
hook.c
@@
-14,25
+14,32
@@
#include <lib-crypt/crypt.h>
#include "alias.h"
#include <lib-crypt/crypt.h>
#include "alias.h"
+#include "pattern.h"
-#define ERROR_STOP 0
-
-typedef struct hook {
+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 */
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)
{
static unsigned long current_hook_type = 0;
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;
BUFFER command, pattern;
int rc, not = 0;
regex_t *rx = NULL;
@@
-104,7
+111,7
@@
int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s,
/* check to make sure that a matching hook doesn't already exist */
for (ptr = Hooks; ptr; ptr = ptr->next) {
/* 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 |
ptr->rx.not == not && !m_strcmp(pattern.data, ptr->rx.pattern)) {
if (data &
(M_FOLDERHOOK | M_SENDHOOK | M_SEND2HOOK | M_MESSAGEHOOK |
@@
-165,11
+172,11
@@
int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s,
}
if (ptr) {
}
if (ptr) {
- ptr->next = p_new(
HOOK
, 1);
+ ptr->next = p_new(
hook_t
, 1);
ptr = ptr->next;
}
else
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;
ptr->type = data;
ptr->command = command.data;
ptr->pattern = pat;
@@
-184,39
+191,19
@@
error:
return (-1);
}
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 (long type)
{
/* Deletes all hooks of type ``type'', or all defined hooks if ``type'' is 0 */
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)),
}
int mutt_parse_unhook (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)),
@@
-230,9
+217,8
@@
int mutt_parse_unhook (BUFFER * buf, BUFFER * s, unsigned long data __attribute_
_("unhook: Can't do unhook * from within a hook."));
return -1;
}
_("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) {
unsigned long type = mutt_get_hook_type (buf->data);
if (!type) {
@@
-254,7
+240,7
@@
int mutt_parse_unhook (BUFFER * buf, BUFFER * s, unsigned long data __attribute_
void mutt_folder_hook (char *path)
{
void mutt_folder_hook (char *path)
{
-
HOOK
*tmp = Hooks;
+
hook_t
*tmp = Hooks;
BUFFER err, token;
char buf[STRING];
BUFFER err, token;
char buf[STRING];
@@
-272,11
+258,6
@@
void mutt_folder_hook (char *path)
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 (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;
- }
}
}
}
}
}
}
@@
-288,7
+269,7
@@
void mutt_folder_hook (char *path)
char *mutt_find_hook (int 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) {
for (; tmp; tmp = tmp->next)
if (tmp->type & type) {
@@
-301,7
+282,7
@@
char *mutt_find_hook (int type, const char *pat)
void mutt_message_hook (CONTEXT * ctx, HEADER * hdr, int type)
{
BUFFER err, token;
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;
char buf[STRING];
current_hook_type = type;
@@
-318,11
+299,6
@@
void mutt_message_hook (CONTEXT * ctx, HEADER * hdr, int type)
if (mutt_parse_rc_line (hook->command, &token, &err) != 0) {
mutt_error ("%s", err.data);
mutt_sleep (1);
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);
}
}
p_delete(&token.data);
@@
-333,7
+309,7
@@
static int
mutt_addr_hook (char *path, ssize_t pathlen, unsigned long type, CONTEXT * ctx,
HEADER * hdr)
{
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) {
/* determine if a matching hook exists */
for (hook = Hooks; hook; hook = hook->next) {
@@
-350,7
+326,7
@@
mutt_addr_hook (char *path, ssize_t pathlen, unsigned long type, CONTEXT * ctx,
return -1;
}
return -1;
}
-void mutt_default_save (char *path, ssize_t pathlen,
const
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) {
{
*path = 0;
if (mutt_addr_hook (path, pathlen, M_SAVEHOOK, Context, hdr) != 0) {
@@
-399,7
+375,7
@@
void mutt_select_fcc (char *path, ssize_t pathlen, HEADER * hdr)
static const 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)
for (; tmp; tmp = tmp->next) {
if ((tmp->type & hook)
@@
-426,7
+402,7
@@
const char *mutt_crypt_hook (address_t * adr)
void mutt_account_hook (const char *url)
{
void mutt_account_hook (const char *url)
{
-
HOOK
*hook;
+
hook_t
*hook;
BUFFER token;
BUFFER err;
char buf[STRING];
BUFFER token;
BUFFER err;
char buf[STRING];
@@
-443,11
+419,6
@@
void mutt_account_hook (const char *url)
if (mutt_parse_rc_line (hook->command, &token, &err) == -1) {
mutt_error ("%s", err.data);
mutt_sleep (1);
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;
- }
}
}
}
}
}
}