#endif
#include <lib-lib/macros.h>
-#include "lib/str.h"
+#include <lib-lib/file.h>
+#include <lib-lib/str.h>
+#include <lib-lib/mapping.h>
#include "mutt.h"
#include "mutt_curses.h"
#include "keymap.h"
#include "pager.h"
-#include "mapping.h"
#include <wchar.h>
#include <ctype.h>
buflen -= 2;
}
mutt_make_help (pbuf, buflen, _(items[i].name), menu, items[i].value);
- len = str_len (pbuf);
+ len = m_strlen(pbuf);
pbuf += len;
buflen -= len;
}
wchar_t wc;
int w;
size_t k;
- size_t len = str_len (*macro);
+ size_t len = m_strlen(*macro);
mbstate_t mbstate1, mbstate2;
- memset (&mbstate1, 0, sizeof (mbstate1));
- memset (&mbstate2, 0, sizeof (mbstate2));
+ p_clear(&mbstate1, 1);
+ p_clear(&mbstate2, 1);
for (; len && (k = mbrtowc (&wc, *macro, len, &mbstate1));
*macro += k, len -= k) {
if (k == (size_t) (-1) || k == (size_t) (-2)) {
else {
col_a = COLS > 83 ? (COLS - 32) >> 2 : 12;
col_b = COLS > 49 ? (COLS - 10) >> 1 : 19;
- col = pad (f, str_len (t1), col_a);
+ col = pad (f, m_strlen(t1), col_a);
}
if (ismacro > 0) {
- if (!str_cmp (Pager, "builtin"))
+ if (!m_strcmp(Pager, "builtin"))
fputs ("_\010", f);
fputs ("M ", f);
col += 2;
if (!split) {
col += print_macro (f, col_b - col - 4, &t2);
- if (str_len (t2) > col_b - col)
+ if (m_strlen(t2) > col_b - col)
t2 = "...";
}
}
n = COLS - col;
if (ismacro >= 0) {
- SKIPWS (t3);
+ t3 = vskipspaces(t3);
/* FIXME: this is completely wrong */
- if ((n = str_len (t3)) > COLS - col) {
+ if ((n = m_strlen(t3)) > COLS - col) {
n = COLS - col;
for (col_a = n; col_a > 0 && t3[col_a] != ' '; col_a--);
if (col_a)
print_macro (f, n, &t3);
if (*t3) {
- if (str_cmp (Pager, "builtin")) {
+ if (m_strcmp(Pager, "builtin")) {
fputc ('\n', f);
n = 0;
}