#endif
#include "mutt.h"
+#include "buffer.h"
+#include "ascii.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
#include "keymap.h"
#include "mapping.h"
#include "mutt_crypt.h"
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
{"<Space>", ' '},
#ifdef KEY_BTAB
{"<BackTab>", KEY_BTAB},
+#endif
+#ifdef KEY_NEXT
+ {"<Next>", KEY_NEXT},
#endif
{NULL, 0}
};
{
struct keymap_t *p;
- p = safe_calloc (1, sizeof (struct keymap_t));
+ p = mem_calloc (1, sizeof (struct keymap_t));
p->len = len;
- p->keys = safe_malloc (len * sizeof (keycode_t));
+ p->keys = mem_malloc (len * sizeof (keycode_t));
memcpy (p->keys, keys, len * sizeof (keycode_t));
return (p);
}
map = allocKeys (len, buf);
map->op = op;
- map->macro = safe_strdup (macro);
- map->descr = safe_strdup (descr);
+ map->macro = str_dup (macro);
+ map->descr = str_dup (descr);
tmp = Keymaps[menu];
do {
len = tmp->eq;
next = tmp->next;
- FREE (&tmp->macro);
- FREE (&tmp->keys);
- FREE (&tmp->descr);
- FREE (&tmp);
+ mem_free (&tmp->macro);
+ mem_free (&tmp->keys);
+ mem_free (&tmp->descr);
+ mem_free (&tmp);
tmp = next;
}
while (tmp && len >= pos);
for (i = 0; bindings[i].name; i++) {
if (!ascii_strncasecmp (start, bindings[i].name, len) &&
- mutt_strlen (bindings[i].name) == len)
+ str_len (bindings[i].name) == len)
return bindings[i].op;
}
static void push_string (char *s)
{
- char *pp, *p = s + mutt_strlen (s) - 1;
+ char *pp, *p = s + str_len (s) - 1;
size_t l;
int i, op = OP_NULL;
}
}
}
- mutt_ungetch (*p--, 0);
+ mutt_ungetch ((unsigned char) *p--, 0);
}
}
FOREVER {
strfcpy (s, km_keyname (map->keys[p]), len);
- len -= (l = mutt_strlen (s));
+ len -= (l = str_len (s));
if (++p >= map->len || !len)
return (1);
strfcpy (err->data, _("too few arguments"), err->dsize);
}
error:
- FREE (&buf.data);
+ mem_free (&buf.data);
return (NULL);
}
int i;
for (i = 0; bindings[i].name; i++)
- if (mutt_strcmp (func, bindings[i].name) == 0) {
+ if (str_cmp (func, bindings[i].name) == 0) {
km_bindkey (key, menu, bindings[i].op);
return (0);
}
}
}
}
- FREE (&key);
+ mem_free (&key);
return (r);
}
}
else {
if (MoreArgs (s)) {
- seq = safe_strdup (buf->data);
+ seq = str_dup (buf->data);
mutt_extract_token (buf, s, M_TOKEN_CONDENSE);
if (MoreArgs (s)) {
}
}
- FREE (&seq);
+ mem_free (&seq);
}
else {
for (i = 0; i < nummenus; ++i) {
}
}
}
- FREE (&key);
+ mem_free (&key);
return (r);
}
&& CurrentMenu != MENU_PAGER)
bindings = OpGeneric;
- ops[nops] = get_op (bindings, function, mutt_strlen (function));
+ ops[nops] = get_op (bindings, function, str_len (function));
if (ops[nops] == OP_NULL && CurrentMenu != MENU_PAGER)
- ops[nops] = get_op (OpGeneric, function, mutt_strlen (function));
+ ops[nops] = get_op (OpGeneric, function, str_len (function));
if (ops[nops] == OP_NULL) {
mutt_flushinp ();