X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=help.c;h=a7b8c9fe794c1e505f77a7b0ea28690049fad756;hp=0545777820bacc22eb5009267b362b3d93d56cc6;hb=c88f8ebd5e7542e4ee2ac2c24dfd5f358dbb4235;hpb=4eaac5c4a87b84ea9ec0668b4e088ac27e2d1106

diff --git a/help.c b/help.c
index 0545777..a7b8c9f 100644
--- a/help.c
+++ b/help.c
@@ -13,15 +13,17 @@
 # include "config.h"
 #endif
 
-#include "lib/intl.h"
-#include "lib/str.h"
+#include <lib-lib/macros.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>
 #include <string.h>
 
@@ -71,7 +73,7 @@ char *mutt_compile_help (char *buf, size_t buflen, int menu,
       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;
   }
@@ -84,11 +86,11 @@ static int print_macro (FILE * f, int maxwidth, const char **macro)
   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)) {
@@ -167,18 +169,18 @@ static void format_line (FILE * f, int ismacro,
   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 = "...";
     }
   }
@@ -198,10 +200,10 @@ static void format_line (FILE * f, int ismacro,
       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)
@@ -212,7 +214,7 @@ static void format_line (FILE * f, int ismacro,
       print_macro (f, n, &t3);
 
       if (*t3) {
-        if (str_cmp (Pager, "builtin")) {
+        if (m_strcmp(Pager, "builtin")) {
           fputc ('\n', f);
           n = 0;
         }