#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/buffer.h>
+#include <lib-lib/file.h>
#include "mutt.h"
#include "mx.h"
-#include "mutt_crypt.h"
-
-#ifdef USE_COMPRESSED
+#include <lib-crypt/crypt.h>
#include "compress.h"
-#endif
#include "lib/rx.h"
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;
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;
}
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);
}
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);
/* 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)) {
+ 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 (!str_cmp (ptr->command, command.data)) {
+ if (!m_strcmp(ptr->command, command.data)) {
p_delete(&command.data);
p_delete(&pattern.data);
return 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 (unsigned long type)
{
HOOK *h;
HOOK *prev;
}
}
-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);
- 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."));
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,
}
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;
*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);
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;
(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);
}
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;
p_delete(&token.data);
}
-#endif