Cleanup and bugfix:

When looking for uppercase characters, iterate over multibyte
characters with the standard function mbtowc(3) rather than with
the buggy and outdated step_char(), skipping invalid bytes,
and correctly use iswupper(3) instead of the inapplicable isupper(3).
OK stsp@

1 files changed, 8 insertions, 6 deletions

diff --git a/usr.bin/less/search.c b/usr.bin/less/search.c
index 48e5314cbf5..770ff0cf5b1 100644
--- a/usr.bin/less/search.c
+++ b/usr.bin/less/search.c
@@ -75,12 +75,14 @@ static struct pattern_info filter_info;
 static int
 is_ucase(char *str)
 {
-	char *str_end = str + strlen(str);
-	LWCHAR ch;
-
-	while (str < str_end) {
-		ch = step_char(&str, +1, str_end);
-		if (isupper(ch))
+	wchar_t ch;
+	int len;
+
+	for (; *str != '\0'; str += len) {
+		if ((len = mbtowc(&ch, str, MB_CUR_MAX)) == -1) {
+			mbtowc(NULL, NULL, MB_CUR_MAX);
+			len = 1;
+		} else if (iswupper(ch))
 			return (1);
 	}
 	return (0);