projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
now this is slightly better.
[apps/madmutt.git]
/
hook.c
diff --git
a/hook.c
b/hook.c
index
0a7ce54
..
69ca2a0
100644
(file)
--- a/
hook.c
+++ b/
hook.c
@@
-7,67
+7,57
@@
* please see the file GPL in the top level source directory.
*/
* 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 "mutt.h"
-#include "buffer.h"
-#include "mx.h"
-#include "mutt_crypt.h"
+#include "alias.h"
+#include "pattern.h"
-#ifdef USE_COMPRESSED
-#include "compress.h"
-#endif
-
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
-#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 {
+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 int current_hook_type = 0;
+static hook_t *Hooks = NULL;
+static unsigned long current_hook_type = 0;
-int mutt_parse_hook (BUFFER * buf
, 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;
pattern_t *pat = NULL;
char path[_POSIX_PATH_MAX];
BUFFER command, pattern;
int rc, not = 0;
regex_t *rx = NULL;
pattern_t *pat = NULL;
char path[_POSIX_PATH_MAX];
-
memset (&pattern, 0, sizeof (pattern)
);
-
memset (&command, 0, sizeof (command)
);
+
p_clear(&pattern, 1
);
+
p_clear(&command, 1
);
if (*s->dptr == '!') {
if (*s->dptr == '!') {
- s->dptr++;
- SKIPWS (s->dptr);
+ s->dptr = vskipspaces(s->dptr + 1);
not = 1;
}
mutt_extract_token (&pattern, s, 0);
if (!MoreArgs (s)) {
not = 1;
}
mutt_extract_token (&pattern, s, 0);
if (!MoreArgs (s)) {
-
strfcpy (err->data, _("too few arguments"), err->dsize
);
+
m_strcpy(err->data, err->dsize, _("too few arguments")
);
goto error;
}
goto error;
}
@@
-77,63
+67,61
@@
int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
M_ACCOUNTHOOK | M_REPLYHOOK)) ? M_TOKEN_SPACE : 0);
if (!command.data) {
M_ACCOUNTHOOK | M_REPLYHOOK)) ? M_TOKEN_SPACE : 0);
if (!command.data) {
-
strfcpy (err->data, _("too few arguments"), err->dsize
);
+
m_strcpy(err->data, err->dsize, _("too few arguments")
);
goto error;
}
if (MoreArgs (s)) {
goto error;
}
if (MoreArgs (s)) {
-
strfcpy (err->data, _("too many arguments"), err->dsize
);
+
m_strcpy(err->data, err->dsize, _("too many arguments")
);
goto error;
}
if (data & (M_FOLDERHOOK | M_MBOXHOOK)) {
goto error;
}
if (data & (M_FOLDERHOOK | M_MBOXHOOK)) {
-
strfcpy (path, pattern.data, sizeof (path)
);
+
m_strcpy(path, sizeof(path), pattern.data
);
_mutt_expand_path (path, sizeof (path), 1);
_mutt_expand_path (path, sizeof (path), 1);
-
mem_free
(&pattern.data);
-
memset (&pattern, 0, sizeof (pattern)
);
- pattern.data =
str_dup
(path);
+
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)) {
else if (data & (M_APPENDHOOK | M_OPENHOOK | M_CLOSEHOOK)) {
if (mutt_test_compress_command (command.data)) {
-
strfcpy (err->data, _("bad formatted command string"), err->dsize
);
+
m_strcpy(err->data, err->dsize, _("bad formatted command string")
);
return (-1);
}
}
return (-1);
}
}
-#endif
else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ACCOUNTHOOK))
else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ACCOUNTHOOK))
- &&
(!WithCrypto ||
!(data & M_CRYPTHOOK))
-
)
{
+ && !(data & M_CRYPTHOOK))
+ {
char tmp[HUGE_STRING];
char tmp[HUGE_STRING];
-
strfcpy (tmp, pattern.data, sizeof (tmp)
);
+
m_strcpy(tmp, sizeof(tmp), pattern.data
);
mutt_check_simple (tmp, sizeof (tmp), DefaultHook);
mutt_check_simple (tmp, sizeof (tmp), DefaultHook);
-
mem_free
(&pattern.data);
-
memset (&pattern, 0, sizeof (pattern)
);
- pattern.data =
str_dup
(tmp);
+
p_delete
(&pattern.data);
+
p_clear(&pattern, 1
);
+ pattern.data =
m_strdup
(tmp);
}
if (data & (M_MBOXHOOK | M_SAVEHOOK | M_FCCHOOK)) {
}
if (data & (M_MBOXHOOK | M_SAVEHOOK | M_FCCHOOK)) {
-
strfcpy (path, command.data, sizeof (path)
);
+
m_strcpy(path, sizeof(path), command.data
);
mutt_expand_path (path, sizeof (path));
mutt_expand_path (path, sizeof (path));
-
mem_free
(&command.data);
-
memset (&command, 0, sizeof (command)
);
- command.data =
str_dup
(path);
+
p_delete
(&command.data);
+
p_clear(&command, 1
);
+ command.data =
m_strdup
(path);
}
/* 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 &&
- ptr->rx.not == not && !
str_cmp
(pattern.data, ptr->rx.pattern)) {
+ 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)) {
/* 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 */
if (data &
(M_FOLDERHOOK | M_SENDHOOK | M_SEND2HOOK | M_MESSAGEHOOK |
M_ACCOUNTHOOK | 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 */
- if (!
str_cmp
(ptr->command, command.data)) {
-
mem_free
(&command.data);
-
mem_free
(&pattern.data);
+ if (!
m_strcmp
(ptr->command, command.data)) {
+
p_delete
(&command.data);
+
p_delete
(&pattern.data);
return 0;
}
}
return 0;
}
}
@@
-143,9
+131,9
@@
int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
* order of execution of the hooks, which i think is desirable since
* a common action to perform is to change the default (.) entry
* based upon some other information. */
* order of execution of the hooks, which i think is desirable since
* a common action to perform is to change the default (.) entry
* based upon some other information. */
-
mem_free
(&ptr->command);
+
p_delete
(&ptr->command);
ptr->command = command.data;
ptr->command = command.data;
-
mem_free
(&pattern.data);
+
p_delete
(&pattern.data);
return 0;
}
}
return 0;
}
}
@@
-163,7
+151,7
@@
int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
goto error;
}
else {
goto error;
}
else {
- rx =
mem_malloc (sizeof (regex_t)
);
+ rx =
p_new(regex_t, 1
);
#ifdef M_CRYPTHOOK
if ((rc =
REGCOMP (rx, NONULL (pattern.data),
#ifdef M_CRYPTHOOK
if ((rc =
REGCOMP (rx, NONULL (pattern.data),
@@
-178,17
+166,17
@@
int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
{
regerror (rc, rx, err->data, err->dsize);
regfree (rx);
{
regerror (rc, rx, err->data, err->dsize);
regfree (rx);
-
mem_free
(&rx);
+
p_delete
(&rx);
goto error;
}
}
if (ptr) {
goto error;
}
}
if (ptr) {
- ptr->next =
mem_calloc (1, sizeof (HOOK)
);
+ ptr->next =
p_new(hook_t, 1
);
ptr = ptr->next;
}
else
ptr = ptr->next;
}
else
- Hooks = ptr =
mem_calloc (1, sizeof (HOOK)
);
+ 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;
@@
-198,61
+186,40
@@
int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
return 0;
error:
return 0;
error:
-
mem_free
(&pattern.data);
-
mem_free
(&command.data);
+
p_delete
(&pattern.data);
+
p_delete
(&command.data);
return (-1);
}
return (-1);
}
-static void delete_hook (HOOK * h)
-{
- mem_free (&h->command);
- mem_free (&h->rx.pattern);
- if (h->rx.rx) {
- regfree (h->rx.rx);
- }
- mutt_pattern_free (&h->pattern);
- mem_free (&h);
-}
-
/* Deletes all hooks of type ``type'', or all defined hooks if ``type'' is 0 */
/* Deletes all hooks of type ``type'', or all defined hooks if ``type'' is 0 */
-static void delete_hooks (
int
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,
+int mutt_parse_unhook (BUFFER * buf, BUFFER * s, unsigned long data
__attribute__ ((unused))
,
BUFFER * err)
{
while (MoreArgs (s)) {
mutt_extract_token (buf, s, 0);
BUFFER * err)
{
while (MoreArgs (s)) {
mutt_extract_token (buf, s, 0);
- if (
str_cmp
("*", buf->data) == 0) {
+ if (
m_strcmp
("*", buf->data) == 0) {
if (current_hook_type) {
snprintf (err->data, err->dsize,
_("unhook: Can't do unhook * from within a hook."));
return -1;
}
if (current_hook_type) {
snprintf (err->data, err->dsize,
_("unhook: Can't do unhook * from within a hook."));
return -1;
}
- delete_hooks (0);
- }
- else {
- int type = mutt_get_hook_type (buf->data);
+ hook_list_wipe(&Hooks);
+ } else {
+ unsigned long type = mutt_get_hook_type (buf->data);
if (!type) {
snprintf (err->data, err->dsize,
if (!type) {
snprintf (err->data, err->dsize,
@@
-273,7
+240,7
@@
int mutt_parse_unhook (BUFFER * buf, BUFFER * s, unsigned long data,
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];
@@
-281,7
+248,7
@@
void mutt_folder_hook (char *path)
err.data = buf;
err.dsize = sizeof (buf);
err.data = buf;
err.dsize = sizeof (buf);
-
memset (&token, 0, sizeof (token)
);
+
p_clear(&token, 1
);
for (; tmp; tmp = tmp->next) {
if (!tmp->command)
continue;
for (; tmp; tmp = tmp->next) {
if (!tmp->command)
continue;
@@
-291,23
+258,18
@@
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) {
- mem_free (&token.data);
- current_hook_type = 0;
- return;
- }
}
}
}
}
}
}
}
}
-
mem_free
(&token.data);
+
p_delete
(&token.data);
current_hook_type = 0;
}
char *mutt_find_hook (int type, const char *pat)
{
current_hook_type = 0;
}
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) {
@@
-320,14
+282,14
@@
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;
err.data = buf;
err.dsize = sizeof (buf);
char buf[STRING];
current_hook_type = type;
err.data = buf;
err.dsize = sizeof (buf);
-
memset (&token, 0, sizeof (token)
);
+
p_clear(&token, 1
);
for (hook = Hooks; hook; hook = hook->next) {
if (!hook->command)
continue;
for (hook = Hooks; hook; hook = hook->next) {
if (!hook->command)
continue;
@@
-337,22
+299,17
@@
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) {
- mem_free (&token.data);
- current_hook_type = 0;
- return;
- }
}
}
}
}
-
mem_free
(&token.data);
+
p_delete
(&token.data);
current_hook_type = 0;
}
static int
current_hook_type = 0;
}
static int
-mutt_addr_hook (char *path, s
ize_t pathlen, int
type, CONTEXT * ctx,
+mutt_addr_hook (char *path, s
size_t pathlen, unsigned long
type, CONTEXT * ctx,
HEADER * hdr)
{
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) {
@@
-369,12
+326,12
@@
mutt_addr_hook (char *path, size_t pathlen, int type, CONTEXT * ctx,
return -1;
}
return -1;
}
-void mutt_default_save (char *path, size_t pathlen, HEADER * hdr)
+void mutt_default_save (char *path, s
s
ize_t pathlen, HEADER * hdr)
{
*path = 0;
if (mutt_addr_hook (path, pathlen, M_SAVEHOOK, Context, hdr) != 0) {
char tmp[_POSIX_PATH_MAX];
{
*path = 0;
if (mutt_addr_hook (path, pathlen, M_SAVEHOOK, Context, hdr) != 0) {
char tmp[_POSIX_PATH_MAX];
-
ADDRESS
*adr;
+
address_t
*adr;
ENVELOPE *env = hdr->env;
int fromMe = mutt_addr_is_user (env->from);
ENVELOPE *env = hdr->env;
int fromMe = mutt_addr_is_user (env->from);
@@
-395,9
+352,9
@@
void mutt_default_save (char *path, size_t pathlen, HEADER * hdr)
}
}
}
}
-void mutt_select_fcc (char *path, size_t pathlen, HEADER * hdr)
+void mutt_select_fcc (char *path, s
s
ize_t pathlen, HEADER * hdr)
{
{
-
ADDRESS
*adr;
+
address_t
*adr;
char buf[_POSIX_PATH_MAX];
ENVELOPE *env = hdr->env;
char buf[_POSIX_PATH_MAX];
ENVELOPE *env = hdr->env;
@@
-406,55
+363,53
@@
void mutt_select_fcc (char *path, size_t pathlen, HEADER * hdr)
(env->to || env->cc || env->bcc)) {
adr = env->to ? env->to : (env->cc ? env->cc : env->bcc);
mutt_safe_path (buf, sizeof (buf), adr);
(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, NONULL (Maildir), buf, pathlen
);
+ mutt_concat_path
(path, pathlen, NONULL(Maildir), buf
);
if (!option (OPTFORCENAME) && mx_access (path, W_OK) != 0)
if (!option (OPTFORCENAME) && mx_access (path, W_OK) != 0)
-
strfcpy (path, NONULL (Outbox), pathlen
);
+
m_strcpy(path, pathlen, NONULL(Outbox)
);
}
else
}
else
-
strfcpy (path, NONULL (Outbox), pathlen
);
+
m_strcpy(path, pathlen, NONULL(Outbox)
);
}
mutt_pretty_mailbox (path);
}
}
mutt_pretty_mailbox (path);
}
-static char *_mutt_string_hook (const char *match, int hook)
+static c
onst c
har *_mutt_string_hook (const char *match, int hook)
{
{
-
HOOK
*tmp = Hooks;
+
hook_t
*tmp = Hooks;
for (; tmp; tmp = tmp->next) {
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);
}
return (tmp->command);
}
return (NULL);
}
-char *mutt_charset_hook (const char *chs)
+c
onst c
har *mutt_charset_hook (const char *chs)
{
return _mutt_string_hook (chs, M_CHARSETHOOK);
}
{
return _mutt_string_hook (chs, M_CHARSETHOOK);
}
-char *mutt_iconv_hook (const char *chs)
+c
onst c
har *mutt_iconv_hook (const char *chs)
{
return _mutt_string_hook (chs, M_ICONVHOOK);
}
{
return _mutt_string_hook (chs, M_ICONVHOOK);
}
-c
har *mutt_crypt_hook (ADDRESS
* adr)
+c
onst char *mutt_crypt_hook (address_t
* adr)
{
return _mutt_string_hook (adr->mailbox, M_CRYPTHOOK);
}
{
return _mutt_string_hook (adr->mailbox, M_CRYPTHOOK);
}
-#ifdef USE_SOCKET
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];
err.data = buf;
err.dsize = sizeof (buf);
BUFFER token;
BUFFER err;
char buf[STRING];
err.data = buf;
err.dsize = sizeof (buf);
-
memset (&token, 0, sizeof (token)
);
+
p_clear(&token, 1
);
for (hook = Hooks; hook; hook = hook->next) {
if (!(hook->command && (hook->type & M_ACCOUNTHOOK)))
for (hook = Hooks; hook; hook = hook->next) {
if (!(hook->command && (hook->type & M_ACCOUNTHOOK)))
@@
-464,15
+419,9
@@
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) {
- mem_free (&token.data);
- current_hook_type = 0;
- return;
- }
}
}
}
}
}
}
-
mem_free
(&token.data);
+
p_delete
(&token.data);
}
}
-#endif