X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hook.c;h=27f0afa6526f1957132a0c54831f1b51e36ea4b0;hp=1f8fc1ec9edfb1a41fcad36f88b96fa7fbde5c8f;hb=d04295aaf918032c1c2fafc94ddf637cf23341e9;hpb=2ea77d3b2827ba23feb756ce2fb936565ae38998 diff --git a/hook.c b/hook.c index 1f8fc1e..27f0afa 100644 --- a/hook.c +++ b/hook.c @@ -11,26 +11,23 @@ # include "config.h" #endif +#include +#include +#include +#include +#include + #include #include #include #include +#include +#include #include "mutt.h" #include "mx.h" -#include "mutt_crypt.h" - -#ifdef USE_COMPRESSED +#include #include "compress.h" -#endif - -#include "lib/rx.h" - -#include -#include -#include -#include -#include #define ERROR_STOP 0 @@ -44,9 +41,9 @@ typedef struct hook { 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, +int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s, unsigned long data, BUFFER * err) { HOOK *ptr; @@ -60,15 +57,14 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data, 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)) { - strfcpy (err->data, _("too few arguments"), err->dsize); + m_strcpy(err->data, err->dsize, _("too few arguments")); goto error; } @@ -78,36 +74,34 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long 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)) { - 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)) { - 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); } -#ifdef USE_COMPRESSED 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); } } -#endif else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ACCOUNTHOOK)) - && (!WithCrypto || !(data & M_CRYPTHOOK)) - ) { + && !(data & M_CRYPTHOOK)) + { 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); @@ -115,7 +109,7 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data, } 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); @@ -216,7 +210,7 @@ static void delete_hook (HOOK * h) } /* Deletes all hooks of type ``type'', or all defined hooks if ``type'' is 0 */ -static void delete_hooks (int type) +static void delete_hooks (unsigned long type) { HOOK *h; HOOK *prev; @@ -239,7 +233,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)) { @@ -253,7 +247,7 @@ int mutt_parse_unhook (BUFFER * buf, BUFFER * s, unsigned long data, 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, @@ -350,7 +344,7 @@ void mutt_message_hook (CONTEXT * ctx, HEADER * hdr, int type) } static int -mutt_addr_hook (char *path, size_t pathlen, int type, CONTEXT * ctx, +mutt_addr_hook (char *path, size_t pathlen, unsigned long type, CONTEXT * ctx, HEADER * hdr) { HOOK *hook; @@ -375,7 +369,7 @@ void mutt_default_save (char *path, size_t pathlen, HEADER * hdr) *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); @@ -398,7 +392,7 @@ void mutt_default_save (char *path, size_t pathlen, HEADER * hdr) void mutt_select_fcc (char *path, size_t pathlen, HEADER * hdr) { - ADDRESS *adr; + address_t *adr; char buf[_POSIX_PATH_MAX]; ENVELOPE *env = hdr->env; @@ -407,12 +401,12 @@ 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); - 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) - strfcpy (path, NONULL (Outbox), pathlen); + m_strcpy(path, pathlen, NONULL(Outbox)); } else - strfcpy (path, NONULL (Outbox), pathlen); + m_strcpy(path, pathlen, NONULL(Outbox)); } mutt_pretty_mailbox (path); } @@ -440,12 +434,11 @@ char *mutt_iconv_hook (const char *chs) return _mutt_string_hook (chs, M_ICONVHOOK); } -char *mutt_crypt_hook (ADDRESS * adr) +char *mutt_crypt_hook (address_t * adr) { return _mutt_string_hook (adr->mailbox, M_CRYPTHOOK); } -#ifdef USE_SOCKET void mutt_account_hook (const char *url) { HOOK *hook; @@ -476,4 +469,3 @@ void mutt_account_hook (const char *url) p_delete(&token.data); } -#endif