 @@ -1,14 +1,14 @@
-/*	$NetBSD: str.c,v 1.102 2024/01/05 23:22:06 rillig Exp $	*/
+/*	$NetBSD: str.c,v 1.103 2024/04/14 15:21:20 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -61,27 +61,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "make.h"
 /*	"@(#)str.c	5.8 (Berkeley) 6/1/90"	*/
-MAKE_RCSID("$NetBSD: str.c,v 1.102 2024/01/05 23:22:06 rillig Exp $");
+MAKE_RCSID("$NetBSD: str.c,v 1.103 2024/04/14 15:21:20 rillig Exp $");
 static HashTable interned_strings;
 /* Return the concatenation of s1 and s2, freshly allocated. */
 char *
 str_concat2(const char *s1, const char *s2)
+{
 	size_t len1 = strlen(s1);
 	size_t len2 = strlen(s2);
 	char *result = bmake_malloc(len1 + len2 + 1);
 	memcpy(result, s1, len1);
 @@ -287,46 +287,26 @@ Str_Words(const char *str, bool expand)
 		return words;
+	}
 	words.words = bmake_malloc((swords.len + 1) * sizeof(words.words[0]));
 	words.len = swords.len;
 	words.freeIt = swords.freeIt;
 	for (i = 0; i < swords.len + 1; i++)
 		words.words[i] = UNCONST(swords.words[i].start);
 	free(swords.words);
 	return words;
+}
 /*
  * XXX: In the extreme edge case that one of the characters is from the basic
  * execution character set and the other isn't, the result of the comparison
  * differs depending on whether plain char is signed or unsigned.
  * An example is the character range from \xE4 to 'a', where \xE4 may come
  * from U+00E4 'Latin small letter A with diaeresis'.
  * If char is signed, \xE4 evaluates to -28, the first half of the condition
  * becomes -28 <= '0' && '0' <= 'a', which evaluates to true.
  * If char is unsigned, \xE4 evaluates to 228, the second half of the
  * condition becomes 'a' <= '0' && '0' <= 228, which evaluates to false.
  */
 static bool
 in_range(char e1, char c, char e2)
 	return (e1 <= c && c <= e2) || (e2 <= c && c <= e1);
 /*
  * Test if a string matches a pattern like "*.[ch]". The pattern matching
  * characters are '*', '?' and '[]', as in fnmatch(3).
+ *
  * See varmod-match.mk for examples and edge cases.
  */
 StrMatchResult
 Str_Match(const char *str, const char *pat)
+{
 	StrMatchResult res = { NULL, false };
 	bool asterisk = false;
 	const char *fixed_str = str;
 	const char *fixed_pat = pat;
 @@ -350,27 +330,31 @@ match_fixed_length:
 			if (*pat == ']' || *pat == '\0') {
 				if (neg)
 					goto end_of_char_list;
 				goto no_match;
+			}
 			if (*pat == *str)
 				goto end_of_char_list;
 			if (pat[1] == '-' && pat[2] == '\0') {
 				res.error = "Unfinished character range";
 				res.matched = neg;
 				return res;
+			}
 			if (pat[1] == '-') {
-				if (in_range(pat[0], *str, pat[2]))
+				unsigned char e1 = (unsigned char)pat[0];
 				unsigned char c = (unsigned char)*str;
 				unsigned char e2 = (unsigned char)pat[2];
 				if ((e1 <= c && c <= e2)
 				    || (e2 <= c && c <= e1))
 					goto end_of_char_list;
 				pat += 2;
+			}
 			pat++;
 			goto next_char_in_list;
 		end_of_char_list:
 			if (neg && *pat != ']' && *pat != '\0')
 				goto no_match;
 			while (*pat != ']' && *pat != '\0')
 				pat++;
 			if (*pat == '\0')
 				pat--;