X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/ba8b265a8211b2052b424dc9bd7ea391a8ded87a..cf57870921b26703aad420c6741c524b33736ff1:/sbr/fmt_scan.c

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index b0beeb23..4416b54c 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -49,24 +49,14 @@ match (char *str, char *sub)
     char *s1, *s2;
 
     while ((c1 = *sub)) {
-	c1 = (isascii((unsigned char) c1) && isalpha((unsigned char) c1) &&
-	      isupper((unsigned char) c1)) ? tolower((unsigned char) c1) : c1;
-	while ((c2 = *str++) && c1 != ((isascii((unsigned char) c2) &&
-					isalpha((unsigned char) c2) &&
-					isupper((unsigned char) c2)) ?
-					    tolower((unsigned char) c2) : c2))
+	c1 = tolower((unsigned char)c1);
+	while ((c2 = *str++) && c1 != tolower((unsigned char)c2))
 	    ;
 	if (! c2)
 	    return 0;
 	s1 = sub + 1; s2 = str;
-	while ((c1 = *s1++) && ((isascii((unsigned char) c1) &&
-				 isalpha((unsigned char) c1) &&
-				 isupper((unsigned char) c1)) ?
-				 	tolower(c1) : c1) ==
-			((isascii((unsigned char) (c2 =*s2++)) &&
-			  isalpha((unsigned char) c2) &&
-			  isupper((unsigned char) c2)) ?
-			  	tolower((unsigned char) c2) : c2))
+	while ((c1 = *s1++) &&
+            tolower((unsigned char)c1) == tolower((unsigned char)(c2 = *s2++)))
 	    ;
 	if (! c1)
 	    return 1;
@@ -309,10 +299,20 @@ cpstripped (charstring_t dest, size_t max, char *str)
 	prevCtrl = 0;
 
 #ifdef MULTIBYTE_SUPPORT
-	charstring_push_back_chars (dest, altstr ? altstr : str, char_len, w);
-        max -= w;
-	str += char_len;
-	altstr = NULL;
+	assert(w >= 0);
+	if (max >= (size_t) w) {
+	    charstring_push_back_chars (dest, altstr ? altstr : str, char_len, w);
+	    max -= w;
+	    str += char_len;
+	    altstr = NULL;
+	} else {
+	    /* Not enough width available for the last character.  Output
+	       space(s) to fill. */
+	    while (max-- > 0) {
+		charstring_push_back (dest, ' ');
+	    }
+	    break;
+	}
 #else /* MULTIBYE_SUPPORT */
 	charstring_push_back (dest, *str++);
         --max;
@@ -374,7 +374,7 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
 {
     char *sp;
     char *savestr, *str;
-    char buffer[BUFSIZ], buffer2[BUFSIZ];
+    char buffer[NMH_BUFSIZ], buffer2[NMH_BUFSIZ];
     int i, c, rjust;
     int value;
     time_t t;
@@ -1185,5 +1185,5 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
 	}
     }
 
-    return ((struct format *)0);
+    return (NULL);
 }