projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wibble
[apps/madmutt.git]
/
hook.c
diff --git
a/hook.c
b/hook.c
index
1f8fc1e
..
db0b1a9
100644
(file)
--- a/
hook.c
+++ b/
hook.c
@@
-7,30
+7,13
@@
* 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 <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/buffer.h>
-
-#include "mutt.h"
-#include "mx.h"
-#include "mutt_crypt.h"
-
-#ifdef USE_COMPRESSED
-#include "compress.h"
-#endif
-
-#include "lib/rx.h"
-
-#include <limits.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <unistd.h>
+#include "alias.h"
#define ERROR_STOP 0
#define ERROR_STOP 0
@@
-44,10
+27,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;
@@
-60,15
+43,14
@@
int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
p_clear(&command, 1);
if (*s->dptr == '!') {
p_clear(&command, 1);
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;
}
@@
-78,36
+60,34
@@
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);
p_delete(&pattern.data);
p_clear(&pattern, 1);
pattern.data = m_strdup(path);
}
_mutt_expand_path (path, sizeof (path), 1);
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);
p_delete(&pattern.data);
p_clear(&pattern, 1);
mutt_check_simple (tmp, sizeof (tmp), DefaultHook);
p_delete(&pattern.data);
p_clear(&pattern, 1);
@@
-115,7
+95,7
@@
int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
}
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));
p_delete(&command.data);
p_clear(&command, 1);
mutt_expand_path (path, sizeof (path));
p_delete(&command.data);
p_clear(&command, 1);
@@
-216,7
+196,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
+219,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
+233,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
+330,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
+350,12
@@
mutt_addr_hook (char *path, size_t pathlen, int type, CONTEXT * ctx,
return -1;
}
return -1;
}
-void mutt_default_save (char *path, s
ize_t pathlen,
HEADER * hdr)
+void mutt_default_save (char *path, s
size_t pathlen, const
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
+376,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;
@@
-407,45
+387,43
@@
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;
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
+454,3
@@
void mutt_account_hook (const char *url)
p_delete(&token.data);
}
p_delete(&token.data);
}
-#endif