===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sort/bwstring.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- src/usr.bin/sort/bwstring.c	2019/05/15 09:07:46	1.8
+++ src/usr.bin/sort/bwstring.c	2019/05/15 09:33:34	1.9
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bwstring.c,v 1.8 2019/05/15 09:07:46 schwarze Exp $	*/
+/*	$OpenBSD: bwstring.c,v 1.9 2019/05/15 09:33:34 schwarze Exp $	*/
 
 /*-
  * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
@@ -684,91 +684,91 @@
 	if (len1 <= offset)
 		return (len2 <= offset) ? 0 : -1;
 
-		if (len2 <= offset)
-			return 1;
+	if (len2 <= offset)
+		return 1;
 
-			len1 -= offset;
-			len2 -= offset;
+	len1 -= offset;
+	len2 -= offset;
 
-			if (sort_mb_cur_max == 1) {
-				const unsigned char *s1, *s2;
-				int res;
+	if (sort_mb_cur_max == 1) {
+		const unsigned char *s1, *s2;
+		int res;
 
-				s1 = bws1->data.cstr + offset;
-				s2 = bws2->data.cstr + offset;
+		s1 = bws1->data.cstr + offset;
+		s2 = bws2->data.cstr + offset;
 
-					if (len1 > len2) {
-						res = memcmp(s1, s2, len2);
-						if (!res)
-							res = +1;
-					} else if (len1 < len2) {
-						res = memcmp(s1, s2, len1);
-						if (!res)
-							res = -1;
-					} else
-						res = memcmp(s1, s2, len1);
+		if (len1 > len2) {
+			res = memcmp(s1, s2, len2);
+			if (!res)
+				res = +1;
+		} else if (len1 < len2) {
+			res = memcmp(s1, s2, len1);
+			if (!res)
+				res = -1;
+		} else
+			res = memcmp(s1, s2, len1);
 
-					return res;
-			} else {
-				const wchar_t *s1, *s2;
-				size_t i, maxlen;
-				int res = 0;
+		return res;
+	} else {
+		const wchar_t *s1, *s2;
+		size_t i, maxlen;
+		int res = 0;
 
-				s1 = bws1->data.wstr + offset;
-				s2 = bws2->data.wstr + offset;
+		s1 = bws1->data.wstr + offset;
+		s2 = bws2->data.wstr + offset;
 
-				i = 0;
-				maxlen = len1;
+		i = 0;
+		maxlen = len1;
 
-				if (maxlen > len2)
-					maxlen = len2;
+		if (maxlen > len2)
+			maxlen = len2;
 
-				while (i < maxlen) {
+		while (i < maxlen) {
 
-					/* goto next non-zero part: */
-					while ((i < maxlen) &&
-					    !s1[i] && !s2[i])
-						++i;
+			/* goto next non-zero part: */
+			while (i < maxlen &&
+			    s1[i] == L'\0' && s2[i] == L'\0')
+				++i;
 
-					if (i >= maxlen)
-						break;
+			if (i >= maxlen)
+				break;
 
-					if (s1[i] == 0) {
-						if (s2[i] == 0)
-							/* NOTREACHED */
-							err(2, "bwscoll error 1");
-						else
-							return -1;
-					} else if (s2[i] == 0)
-						return 1;
+			if (s1[i] == L'\0') {
+				if (s2[i] == L'\0')
+					/* NOTREACHED */
+					err(2, "bwscoll error 1");
+				else
+					return -1;
+			} else if (s2[i] == L'\0')
+				return 1;
 
-					res = wide_str_coll(s1 + i, s2 + i);
-					if (res)
-						return res;
+			res = wide_str_coll(s1 + i, s2 + i);
+			if (res)
+				return res;
 
-					while ((i < maxlen) && s1[i] && s2[i])
-						++i;
+			while (i < maxlen && s1[i] != L'\0' && s2[i] != L'\0')
+				++i;
 
-					if (i >= maxlen)
-						break;
+			if (i >= maxlen)
+				break;
 
-					if (s1[i] == 0) {
-						if (s2[i] == 0) {
-							++i;
-							continue;
-						} else
-							return -1;
-					} else if (s2[i] == 0)
-						return 1;
-					else
-						/* NOTREACHED */
-						err(2, "bwscoll error 2");
-				}
+			if (s1[i] == L'\0') {
+				if (s2[i] == L'\0') {
+					++i;
+					continue;
+				} else
+					return -1;
+			} else if (s2[i] == L'\0')
+				return 1;
+			else
+				/* NOTREACHED */
+				err(2, "bwscoll error 2");
+		}
 
-				if (len1 == len2)
-					return 0;
-				return len1 < len2 ? -1 : 1;
-			}
+		if (len1 == len2)
+			return 0;
+		return len1 < len2 ? -1 : 1;
+	}
 }
 
 /*