X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=help.c;h=0fa80c180f39b69d2e71082a68edfaf5ba46365a;hp=72d0610e3584e1b72984f0461eff77129f383b52;hb=e176d53ddc6abf804824cad054a424f45c0a945e;hpb=2ea77d3b2827ba23feb756ce2fb936565ae38998

diff --git a/help.c b/help.c
index 72d0610..0fa80c1 100644
--- a/help.c
+++ b/help.c
@@ -9,22 +9,14 @@
 
 #define HELP_C
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <lib-lib/macros.h>
-#include <lib-lib/str.h>
+#include <lib-ui/curses.h>
 
 #include "mutt.h"
-#include "mutt_curses.h"
+#include "charset.h"
 #include "keymap.h"
 #include "pager.h"
-#include "mapping.h"
-
-#include <wchar.h>
-#include <ctype.h>
-#include <string.h>
 
 static struct binding_t *help_lookupFunction (int op, int menu)
 {
@@ -47,7 +39,7 @@ static struct binding_t *help_lookupFunction (int op, int menu)
   return (NULL);
 }
 
-void mutt_make_help (char *d, size_t dlen, char *txt, int menu, int op)
+void mutt_make_help (char *d, ssize_t dlen, char *txt, int menu, int op)
 {
   char buf[SHORT_STRING];
 
@@ -58,11 +50,11 @@ void mutt_make_help (char *d, size_t dlen, char *txt, int menu, int op)
     d[0] = 0;
 }
 
-char *mutt_compile_help (char *buf, size_t buflen, int menu,
+char *mutt_compile_help (char *buf, ssize_t buflen, int menu,
                          struct mapping_t *items)
 {
   int i;
-  size_t len;
+  ssize_t len;
   char *pbuf = buf;
 
   for (i = 0; items[i].name && buflen > 2; i++) {
@@ -84,29 +76,29 @@ static int print_macro (FILE * f, int maxwidth, const char **macro)
   int n = maxwidth;
   wchar_t wc;
   int w;
-  size_t k;
-  size_t len = m_strlen(*macro);
+  ssize_t k;
+  ssize_t len = m_strlen(*macro);
   mbstate_t mbstate1, 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)) {
-      k = (k == (size_t) (-1)) ? 1 : len;
-      wc = replacement_char ();
+    if (k == -1 || k == -2) {
+      k = (k == -1) ? 1 : len;
+      wc = CharsetReplacement;
     }
     /* glibc-2.1.3's wcwidth() returns 1 for unprintable chars! */
-    if (IsWPrint (wc) && (w = wcwidth (wc)) >= 0) {
+    if (iswprint(wc) && (w = wcwidth (wc)) >= 0) {
       if (w > n)
         break;
       n -= w;
       {
         char buf[MB_LEN_MAX * 2];
-        size_t n1, n2;
+        ssize_t n1, n2;
 
-        if ((n1 = wcrtomb (buf, wc, &mbstate2)) != (size_t) (-1) &&
-            (n2 = wcrtomb (buf + n1, 0, &mbstate2)) != (size_t) (-1))
+        if ((n1 = wcrtomb(buf, wc, &mbstate2)) != -1 &&
+            (n2 = wcrtomb(buf + n1, 0, &mbstate2)) != -1)
           fputs (buf, f);
       }
     }
@@ -199,7 +191,7 @@ 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 = m_strlen(t3)) > COLS - col) {