Module Name: src
Committed By: rillig
Date: Sun Apr 14 15:21:20 UTC 2024
Modified Files:
src/usr.bin/make: str.c
Log Message:
make: make string matching platform-independent
Previously, whether the character range '[a-รค]' matched, depended on the
signedness of the plain 'char' type. Since make operates on byte
strings and does not support UTF-8 or other multi-byte character
encodings, this edge case is not expected to occur in practice.
No change in the unit tests as this edge case is not covered by tests.
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/usr.bin/make/str.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/str.c
diff -u src/usr.bin/make/str.c:1.102 src/usr.bin/make/str.c:1.103
--- src/usr.bin/make/str.c:1.102 Fri Jan 5 23:22:06 2024
+++ src/usr.bin/make/str.c Sun Apr 14 15:21:20 2024
@@ -1,4 +1,4 @@
-/* $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
@@ -71,7 +71,7 @@
#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;
@@ -297,26 +297,6 @@ Str_Words(const char *str, bool expand)
}
/*
- * 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).
*
@@ -360,7 +340,11 @@ match_fixed_length:
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;
}
