Changed build_nmh sasl and tls defaults to be configure's.

[nmh] / test / getcwidth.c

diff --git a/test/getcwidth.c b/test/getcwidth.c
index ba51826d57640ddf8e0d04cbfc6474db72f2679b..c1717e17f58334976e3358503f8809fee52a735a 100644 (file)
--- a/test/getcwidth.c
+++ b/test/getcwidth.c
@@ -30,13 +30,18 @@ int
 main(int argc, char *argv[])
 {
 #ifndef MULTIBYTE_SUPPORT
+       (void) argc;
+       (void) argv;
        fprintf(stderr, "Nmh was not configured with multibyte support\n");
        exit(1);
 #else /* MULTIBYTE_SUPPORT */
        wchar_t c;
        int i;
 
-       setlocale(LC_ALL, "");
+       if (! setlocale(LC_ALL, "")) {
+               fprintf(stderr, "setlocale failed, check your LC_ALL, "
+                   "LC_CTYPE, and LANG environment variables\n");
+       }
 
        if (argc < 2)
                usage(argv[0]);
@@ -109,7 +114,7 @@ getwidth(const char *string)
         * at a time.
         */
 
-       mbtowc(NULL, NULL, 0);
+       if (mbtowc(NULL, NULL, 0)) {}
 
        while (charleft > 0) {
                int clen;
@@ -126,7 +131,8 @@ getwidth(const char *string)
                }
 
                if ((clen = wcwidth(c)) < 0) {
-                       fprintf(stderr, "U+%04lX non-printable\n", c);
+                       fprintf(stderr, "U+%04lX non-printable\n",
+                               (unsigned long int) c);
                        return;
                }
 
@@ -144,17 +150,19 @@ dumpwidth(void)
        wchar_t wc, low;
        int width, lastwidth;
 
-       for (wc = low = 1, lastwidth = wcwidth(wc); wc <= 0xffff; wc++) {
-               width = wcwidth(wc);
+       for (wc = 0, low = 1, lastwidth = wcwidth(1); wc < 0xffff; wc++) {
+               width = wcwidth(wc+1);
                if (width != lastwidth) {
-                       printf("%04lX - %04lX = %d\n", low, wc - 1, lastwidth);
-                       low = wc;
+                       printf("%04lX - %04lX = %d\n", (unsigned long int) low,
+                              (unsigned long int) (wc), lastwidth);
+                       low = wc+1;
                }
                lastwidth = width;
        }
 
-       width = wcwidth(wc - 1);
+       width = wcwidth(wc);
        if (width == lastwidth)
-               printf("%04lX - %04lX = %d\n", low, wc - 1, width);
-}
+               printf("%04lX - %04lX = %d\n", (unsigned long int) low,
+                      (unsigned long int) (wc), width);
 #endif /* MULTIBYTE_SUPPORT */
+}