projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make rx_t be chaine-able so that we can get rid of list2_t (stage 1).
[apps/madmutt.git]
/
hook.c
diff --git
a/hook.c
b/hook.c
index
4eb6e01
..
9bb2386
100644
(file)
--- a/
hook.c
+++ b/
hook.c
@@
-7,33
+7,19
@@
* 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/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/lib-lib.h>
+#include <lib-ui/curses.h>
#include "mutt.h"
#include "mutt.h"
+#include "alias.h"
#include "mx.h"
#include "mx.h"
-#include
"mutt_crypt.h"
+#include
<lib-crypt/crypt.h>
#include "compress.h"
#include "compress.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 {
#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 */
rx_t rx; /* regular expression */
char *command; /* filename, command or pattern to execute */
pattern_t *pattern; /* used for fcc,save,send-hook */
@@
-44,8
+30,8
@@
static HOOK *Hooks = NULL;
static unsigned long current_hook_type = 0;
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;
BUFFER command, pattern;
{
HOOK *ptr;
BUFFER command, pattern;
@@
-211,7
+197,7
@@
static void delete_hook (HOOK * 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 (
unsigned
long type)
+static void delete_hooks (long type)
{
HOOK *h;
HOOK *prev;
{
HOOK *h;
HOOK *prev;
@@
-301,7
+287,7
@@
void mutt_folder_hook (char *path)
current_hook_type = 0;
}
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 *tmp = Hooks;
@@
-313,7
+299,7
@@
char *mutt_find_hook (unsigned long type, const char *pat)
return (NULL);
}
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;
{
BUFFER err, token;
HOOK *hook;
@@
-345,7
+331,7
@@
void mutt_message_hook (CONTEXT * ctx, HEADER * hdr, unsigned long type)
}
static int
}
static int
-mutt_addr_hook (char *path, size_t pathlen, unsigned long type, CONTEXT * ctx,
+mutt_addr_hook (char *path, s
s
ize_t pathlen, unsigned long type, CONTEXT * ctx,
HEADER * hdr)
{
HOOK *hook;
HEADER * hdr)
{
HOOK *hook;
@@
-365,7
+351,7
@@
mutt_addr_hook (char *path, size_t pathlen, unsigned long 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) {
{
*path = 0;
if (mutt_addr_hook (path, pathlen, M_SAVEHOOK, Context, hdr) != 0) {
@@
-391,7
+377,7
@@
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_t *adr;
char buf[_POSIX_PATH_MAX];
{
address_t *adr;
char buf[_POSIX_PATH_MAX];
@@
-412,30
+398,29
@@
void mutt_select_fcc (char *path, size_t pathlen, HEADER * hdr)
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;
for (; tmp; tmp = tmp->next) {
{
HOOK *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);
}
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);
}
-char *mutt_crypt_hook (address_t * adr)
+c
onst c
har *mutt_crypt_hook (address_t * adr)
{
return _mutt_string_hook (adr->mailbox, M_CRYPTHOOK);
}
{
return _mutt_string_hook (adr->mailbox, M_CRYPTHOOK);
}