X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Ffmt_scan.c;h=74cfd927f2aaf1f0e4106a304b5027fda3338cec;hb=015e83362f21a061bf268b878693d72309c21e55;hp=0f5aeb033f80e3fd0e2614da8f0c4b22c69c2d06;hpb=bd4fca3a8a15b35a04bdc333503c901d677c12eb;p=mmh

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 0f5aeb0..74cfd92 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -20,8 +20,10 @@
 # include <sys/time.h>
 #endif
 #include <time.h>
-#include <wctype.h>
-#include <wchar.h>
+#ifdef MULTIBYTE_SUPPORT
+#  include <wctype.h>
+#  include <wchar.h>
+#endif
 
 #ifdef LBL
 struct msgs *fmt_current_folder; /* current folder (set by main program) */
@@ -120,9 +122,11 @@ 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 */
@@ -138,6 +142,7 @@ 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;
@@ -146,6 +151,15 @@ cptrimmed(char **dest, char *str, unsigned int wid, char fill, size_t n) {
 
 	    if (iswcntrl(wide_char) || iswspace(wide_char)) {
 		sp += char_len;
+#else
+            int c;
+	    end--;
+            /* isnctrl(), etc., take an int argument.  Cygwin's ctype.h
+               intentionally warns if they are passed a char. */
+            c = *sp;
+	    if (iscntrl(c) || isspace(c)) {
+		sp++;
+#endif
 		if (!prevCtrl) {
 		    *cp++ = ' ';
 		    remaining--;
@@ -156,6 +170,7 @@ 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);
@@ -163,6 +178,10 @@ cptrimmed(char **dest, char *str, unsigned int wid, char fill, size_t n) {
 		remaining -= w;
 	    }
 	    sp += char_len;
+#else
+	    *cp++ = *sp++;
+	    remaining--;
+#endif
 	}
     }
 
@@ -189,37 +208,64 @@ cptrimmed(char **dest, char *str, unsigned int wid, char fill, size_t n) {
 }
 
 static void
-cpstripped (char **start, char *end, char *str)
+cpstripped (char **dest, char *end, char *str)
 {
-    int c;
-    char *s = str;
+    int prevCtrl = 1;	/* This is 1 so we strip out leading spaces */
+    int len;
+#ifdef MULTIBYTE_SUPPORT
+    int char_len;
+    wchar_t wide_char;
+#endif /* MULTIBYTE_SUPPORT */
 
-    if (!s)
+    if (!str)
 	return;
 
-    /* skip any initial control characters or spaces */
-    while ((c = (unsigned char) *s) &&
-#ifdef LOCALE
-	    (iscntrl(c) || isspace(c)))
-#else
-	    (c <= 32))
-#endif
-	s++;
-
-    /* compact repeated control characters and spaces into a single space */
-    while((c = (unsigned char) *s++) && *start < end)
-	if (!iscntrl(c) && !isspace(c))
-	    *(*start)++ = c;
-	else {
-	    while ((c = (unsigned char) *s) &&
-#ifdef LOCALE
-		    (iscntrl(c) || isspace(c)))
-#else
-		    (c <= 32))
-#endif
-		s++;
-	    *(*start)++ = ' ';
+    len = strlen(str);
+
+#ifdef MULTIBYTE_SUPPORT
+    mbtowc(NULL, NULL, 0);  /* Reset shift state */
+#endif /* MULTIBYTE_SUPPORT */
+
+    /*
+     * Process each character at a time; if we have multibyte support
+     * then deal with that here.
+     */
+
+    while (*str != '\0' && len > 0 && *dest < end) {
+#ifdef MULTIBYTE_SUPPORT
+    	char_len = mbtowc(&wide_char, str, len);
+
+	if (char_len <= 0 || *dest + char_len > end)
+	    break;
+
+	len -= char_len;
+
+	if (iswcntrl(wide_char) || iswspace(wide_char)) {
+	    str += char_len;
+#else /* MULTIBYTE_SUPPORT */
+	int c = *str;
+	len--;
+	if (iscntrl(c) || isspace(c)) {
+	    str++;
+#endif /* MULTIBYTE_SUPPORT */
+	    if (! prevCtrl) {
+	    	*(*dest)++ = ' ';
+	    }
+
+	    prevCtrl = 1;
+	    continue;
 	}
+
+	prevCtrl = 0;
+
+#ifdef MULTIBYTE_SUPPORT
+	memcpy(*dest, str, char_len);
+	str += char_len;
+	*dest += char_len;
+#else /* MULTIBYE_SUPPORT */
+	*(*dest)++ = *str++
+#endif /* MULTIBYTE_SUPPORT */
+    }
 }
 
 static char *lmonth[] = { "January",  "February","March",   "April",
@@ -295,6 +341,27 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 	case FT_PARSEDATE:
 	    fmt->f_comp->c_flags &= ~CF_PARSED;
 	    break;
+	case FT_COMP:
+	case FT_COMPF:
+	case FT_LS_COMP:
+	case FT_LS_DECODECOMP:
+	    /*
+	     * Trim these components of any newlines.
+	     *
+	     * But don't trim the "body" and "text" components.
+	     */
+
+	    comp = fmt->f_comp;
+
+	    if (! (comp->c_flags & CF_TRIMMED) && comp->c_text) {
+	    	i = strlen(comp->c_text);
+		if (comp->c_text[i - 1] == '\n' &&
+			strcmp(comp->c_name, "body") != 0 &&
+			strcmp(comp->c_name, "text") != 0)
+		    comp->c_text[i - 1] = '\0';
+		comp->c_flags |= CF_TRIMMED;
+	    }
+	    break;
 	}
 
     fmt = format;