Merge branch 'dev' into dyn

McDutchie · Mar 22, 2024 · 31dd151 · 31dd151
2 parents 4570a92 + abba180
commit 31dd151
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/src/cmd/ksh93/tests/sh_match.sh b/src/cmd/ksh93/tests/sh_match.sh
@@ -78,7 +78,10 @@
 [[ $'\cg' =~ [[:cntrl:]] ]] || err_exit 'pattern [[:cntrl:]] broken'
 [[ \$ =~ [[:graph:]] ]] || err_exit 'pattern [[:graph:]] broken'
 [[ ' ' =~ [[:graph:]] ]] && err_exit 'pattern [[:graph:]] broken'
-[[ \$ =~ [[:punct:]] ]] || err_exit 'pattern [[:punct:]] broken'
+for c in '!' '"' '#' '$' '%' '&' \' '(' ')' '*' '+' ',' '-' '.' '/' ':' ';' \
+		'<' '=' '>' '?' '@' '[' '\\' ']' '^' '_' '`' '{' '|' '}' '~'
+do	[[ $c =~ [[:punct:]] ]] || err_exit "pattern [[:punct:]] broken for $c"
+done
 [[ / =~ [[:punct:]] ]] || err_exit 'pattern [[:punct:]] broken'
 [[ ' ' =~ [[:punct:]] ]] && err_exit 'pattern [[:punct:]] broken'
 [[ x =~ [[:punct:]] ]] && err_exit 'pattern [[:punct:]] broken'

diff --git a/src/lib/libast/features/wchar b/src/lib/libast/features/wchar
@@ -56,6 +56,22 @@ if	hdr - wctype wchar.h
 	endif
 endif
 
+tst	iswpunct_broken note{ is iswpunct(3) broken }end execute{
+	/* on Android 14.0, it is: it does not recognise some of the ASCII characters. ispunct(3) is fine */
+	#include <ctype.h>
+	#include <wctype.h>
+	int main(void)
+	{
+		char c[] = { '!', '"', '#', '$', '%', '&', '\'', '(', ')', '*', '+', ',', '-', '.', '/', ':', ';',
+				'<', '=', '>', '?', '@', '[', '\\', ']', '^', '_', '`', '{', '|', '}', '~', '\0' };
+		int i;
+		for (i = 0; c[i]; i++)
+			if (ispunct(c[i]) && !iswpunct(c[i]))
+				return 0;
+		return 1;
+	}
+}end
+
 run{
 cat <<!
 	#ifndef WEOF

diff --git a/src/lib/libast/regex/regclass.c b/src/lib/libast/regex/regclass.c
@@ -2,7 +2,7 @@
 *                                                                      *
 *               This software is part of the ast package               *
 *          Copyright (c) 1985-2011 AT&T Intellectual Property          *
-*          Copyright (c) 2020-2023 Contributors to ksh 93u+m           *
+*          Copyright (c) 2020-2024 Contributors to ksh 93u+m           *
 *                      and is licensed under the                       *
 *                 Eclipse Public License, Version 2.0                  *
 *                                                                      *
@@ -71,7 +71,14 @@ static int Notdigit(int c) { return !iswdigit(c); }
 static int  Isgraph(int c) { return  iswgraph(c); }
 static int  Islower(int c) { return  iswlower(c); }
 static int  Isprint(int c) { return  iswprint(c); }
-static int  Ispunct(int c) { return  iswpunct(c); }
+static int  Ispunct(int c)
+{
+#if _iswpunct_broken && CC_NATIVE == CC_ASCII
+	if (c < 128)
+		return ispunct(c);
+#endif
+	return iswpunct(c);
+}
 static int  Isspace(int c) { return  iswspace(c); }
 static int Notspace(int c) { return !iswspace(c); }
 static int  Isupper(int c) { return  iswupper(c); }