X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Ffmt_scan.c;h=0f5aeb033f80e3fd0e2614da8f0c4b22c69c2d06;hb=bd4fca3a8a15b35a04bdc333503c901d677c12eb;hp=29b87d02713d18cf26b2f0c0250150429210adee;hpb=5f531c1fc79b88bb0d1dd5ec15f03342b0a3ffd5;p=mmh

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 29b87d0..0f5aeb0 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -20,10 +20,8 @@
 # include <sys/time.h>
 #endif
 #include <time.h>
-#ifdef MULTIBYTE_SUPPORT
-#  include <wctype.h>
-#  include <wchar.h>
-#endif
+#include <wctype.h>
+#include <wchar.h>
 
 #ifdef LBL
 struct msgs *fmt_current_folder; /* current folder (set by main program) */
@@ -122,11 +120,9 @@ cptrimmed(char **dest, char *str, unsigned int wid, char fill, size_t n) {
     int remaining;     /* remaining output width available */
     int c, ljust;
     int end;           /* number of input bytes remaining in str */
-#ifdef MULTIBYTE_SUPPORT
     int char_len;      /* bytes in current character */
     int w;
     wchar_t wide_char;
-#endif
     char *sp;          /* current position in source string */
     char *cp = *dest;  /* current position in destination string */
     char *ep = cp + n; /* end of destination buffer */
@@ -142,7 +138,6 @@ cptrimmed(char **dest, char *str, unsigned int wid, char fill, size_t n) {
 	mbtowc(NULL, NULL, 0); /* reset shift state */
 	end = strlen(str);
 	while (*sp && remaining > 0 && end > 0) {
-#ifdef MULTIBYTE_SUPPORT
 	    char_len = mbtowc(&wide_char, sp, end);
 	    if (char_len <= 0 || (cp + char_len > ep))
 		break;
@@ -151,14 +146,6 @@ cptrimmed(char **dest, char *str, unsigned int wid, char fill, size_t n) {
 
 	    if (iswcntrl(wide_char) || iswspace(wide_char)) {
 		sp += char_len;
-#else
-	    end--;
-            /* isnctrl(), etc., take an int argument.  Cygwin's ctype.h
-               intentionally warns if they are passed a char. */
-            int c = *sp;
-	    if (iscntrl(c) || isspace(c)) {
-		sp++;
-#endif
 		if (!prevCtrl) {
 		    *cp++ = ' ';
 		    remaining--;
@@ -169,7 +156,6 @@ cptrimmed(char **dest, char *str, unsigned int wid, char fill, size_t n) {
 	    }
 	    prevCtrl = 0;
 
-#ifdef MULTIBYTE_SUPPORT
 	    w = wcwidth(wide_char);
 	    if (w >= 0 && remaining >= w) {
 		strncpy(cp, sp, char_len);
@@ -177,10 +163,6 @@ cptrimmed(char **dest, char *str, unsigned int wid, char fill, size_t n) {
 		remaining -= w;
 	    }
 	    sp += char_len;
-#else
-	    *cp++ = *sp++;
-	    remaining--;
-#endif
 	}
     }