*/
#include <lib-lib/lib-lib.h>
-#include <lib-ui/curses.h>
+#include <lib-lua/lib-lua.h>
+#include <lib-ui/lib-ui.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 {
{
hook_t *ptr;
BUFFER command, pattern;
- int rc, not = 0;
+ int rc, neg = 0;
regex_t *rx = NULL;
pattern_t *pat = NULL;
char path[_POSIX_PATH_MAX];
if (*s->dptr == '!') {
s->dptr = vskipspaces(s->dptr + 1);
- not = 1;
+ neg = 1;
}
mutt_extract_token (&pattern, s, 0);
goto error;
}
- mutt_extract_token (&command, s,
- (data &
- (M_FOLDERHOOK | M_SENDHOOK | M_SEND2HOOK |
- M_ACCOUNTHOOK | M_REPLYHOOK)) ? M_TOKEN_SPACE : 0);
+ mutt_extract_token(&command, s, (data & (M_FOLDERHOOK | M_SENDHOOK |
+ M_SEND2HOOK | M_REPLYHOOK)) ?
+ M_TOKEN_SPACE : 0);
if (!command.data) {
m_strcpy(err->data, err->dsize, _("too few arguments"));
return (-1);
}
}
- else if (DefaultHook && !(data & M_ACCOUNTHOOK) && !(data & M_CRYPTHOOK))
+ else if (DefaultHook && !(data & M_CRYPTHOOK))
{
char tmp[HUGE_STRING];
/* check to make sure that a matching hook doesn't already exist */
for (ptr = Hooks; ptr; ptr = ptr->next) {
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 |
- M_ACCOUNTHOOK | M_REPLYHOOK)) {
+ ptr->rx.neg == neg && !m_strcmp(pattern.data, ptr->rx.pattern)) {
+ if (data & (M_FOLDERHOOK | M_SENDHOOK | M_SEND2HOOK | M_MESSAGEHOOK |
+ 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 */
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
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)
{
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;
ptr->rx.pattern = pattern.data;
ptr->rx.rx = rx;
- ptr->rx.not = not;
+ ptr->rx.neg = neg;
return 0;
error:
continue;
if (tmp->type & M_FOLDERHOOK) {
- if ((regexec (tmp->rx.rx, path, 0, NULL, 0) == 0) ^ tmp->rx.not) {
+ if ((regexec (tmp->rx.rx, path, 0, NULL, 0) == 0) ^ tmp->rx.neg) {
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 */
p_delete(&token.data);
current_hook_type = 0;
+
+ {
+ lua_State *L = luaM_getruntime();
+ lua_getfield(L, LUA_GLOBALSINDEX, "mod_core");
+ lua_getfield(L, -1, "folder_hook");
+ lua_remove(L, -2);
+ if (lua_isfunction(L, -1)) {
+ lua_pushstring(L, LastFolder);
+ lua_pushstring(L, CurrentFolder);
+ lua_pcall(L, 2, 0, 0);
+ } else {
+ lua_pop(L, 1);
+ }
+ }
}
char *mutt_find_hook (int type, const char *pat)
continue;
if (hook->type & type)
- if ((mutt_pattern_exec (hook->pattern, 0, ctx, hdr) > 0) ^ hook->rx.not)
+ if ((mutt_pattern_exec (hook->pattern, 0, ctx, hdr) > 0) ^ hook->rx.neg)
if (mutt_parse_rc_line (hook->command, &token, &err) != 0) {
mutt_error ("%s", err.data);
mutt_sleep (1);
continue;
if (hook->type & type)
- if ((mutt_pattern_exec (hook->pattern, 0, ctx, hdr) > 0) ^ hook->rx.not) {
+ if ((mutt_pattern_exec (hook->pattern, 0, ctx, hdr) > 0) ^ hook->rx.neg) {
mutt_make_string (path, pathlen, hook->command, ctx, hdr);
return 0;
}
void mutt_select_fcc (char *path, ssize_t pathlen, HEADER * hdr)
{
- address_t *adr;
- char buf[_POSIX_PATH_MAX];
- ENVELOPE *env = hdr->env;
-
- if (mutt_addr_hook (path, pathlen, M_FCCHOOK, NULL, hdr) != 0) {
- if ((option (OPTSAVENAME) || option (OPTFORCENAME)) &&
- (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, pathlen, NONULL(Maildir), buf);
- if (!option (OPTFORCENAME) && mx_access (path, W_OK) != 0)
- m_strcpy(path, pathlen, NONULL(Outbox));
+ if (mutt_addr_hook (path, pathlen, M_FCCHOOK, NULL, hdr) != 0) {
+ m_strcpy(path, pathlen, NONULL(MAlias.record));
}
- else
- m_strcpy(path, pathlen, NONULL(Outbox));
- }
- mutt_pretty_mailbox (path);
+ mutt_pretty_mailbox (path);
}
static const char *_mutt_string_hook (const char *match, int hook)
for (; tmp; tmp = tmp->next) {
if ((tmp->type & hook)
- && ((match && regexec(tmp->rx.rx, match, 0, NULL, 0) == 0) ^ tmp->rx.not))
+ && ((match && regexec(tmp->rx.rx, match, 0, NULL, 0) == 0) ^ tmp->rx.neg))
return (tmp->command);
}
return (NULL);
{
return _mutt_string_hook (adr->mailbox, M_CRYPTHOOK);
}
-
-void mutt_account_hook (const char *url)
-{
- hook_t *hook;
- BUFFER token;
- BUFFER err;
- char buf[STRING];
-
- err.data = buf;
- err.dsize = sizeof (buf);
- p_clear(&token, 1);
-
- for (hook = Hooks; hook; hook = hook->next) {
- if (!(hook->command && (hook->type & M_ACCOUNTHOOK)))
- continue;
-
- if ((regexec (hook->rx.rx, url, 0, NULL, 0) == 0) ^ hook->rx.not) {
- if (mutt_parse_rc_line (hook->command, &token, &err) == -1) {
- mutt_error ("%s", err.data);
- mutt_sleep (1);
- }
- }
- }
-
- p_delete(&token.data);
-}
projects / apps / madmutt.git / blobdiff