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
c6686ae
..
9bb2386
100644
(file)
--- a/
hook.c
+++ b/
hook.c
@@
-7,31
+7,14
@@
* 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"
-
-#ifdef USE_COMPRESSED
+#include <lib-crypt/crypt.h>
#include "compress.h"
#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
#define ERROR_STOP 0
@@
-45,10
+28,10
@@
typedef struct hook {
static HOOK *Hooks = NULL;
static HOOK *Hooks = NULL;
-static
int
current_hook_type = 0;
+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;
BUFFER command, pattern;
{
HOOK *ptr;
BUFFER command, pattern;
@@
-94,17
+77,15
@@
int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
p_clear(&pattern, 1);
pattern.data = m_strdup(path);
}
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);
}
}
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))
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);
char tmp[HUGE_STRING];
m_strcpy(tmp, sizeof(tmp), pattern.data);
@@
-216,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 (
int
type)
+static void delete_hooks (
long
type)
{
HOOK *h;
HOOK *prev;
{
HOOK *h;
HOOK *prev;
@@
-239,7
+220,7
@@
static void delete_hooks (int type)
}
}
}
}
-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)) {
BUFFER * err)
{
while (MoreArgs (s)) {
@@
-253,7
+234,7
@@
int mutt_parse_unhook (BUFFER * buf, BUFFER * s, unsigned long data,
delete_hooks (0);
}
else {
delete_hooks (0);
}
else {
-
int
type = mutt_get_hook_type (buf->data);
+
unsigned long
type = mutt_get_hook_type (buf->data);
if (!type) {
snprintf (err->data, err->dsize,
if (!type) {
snprintf (err->data, err->dsize,
@@
-350,7
+331,7
@@
void mutt_message_hook (CONTEXT * ctx, HEADER * hdr, int type)
}
static int
}
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)
{
HOOK *hook;
HEADER * hdr)
{
HOOK *hook;
@@
-370,12
+351,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);
@@
-396,9
+377,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;
@@
-417,35
+398,33
@@
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);
}
-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)
{
HOOK *hook;
void mutt_account_hook (const char *url)
{
HOOK *hook;
@@
-476,4
+455,3
@@
void mutt_account_hook (const char *url)
p_delete(&token.data);
}
p_delete(&token.data);
}
-#endif