From 1819ad327b7a1f19540a819813b70a0e8a7f798f Mon Sep 17 00:00:00 2001 From: Diomidis Spinellis Date: Fri, 26 Aug 2022 11:58:15 +0300 Subject: grep: fix multibyte regex handling under macOS The commit 29de20504e (Makefile: fix default regex settings on Darwin, 2013-05-11) fixed t0070-fundamental.sh under Darwin (macOS) by adopting Git's regex library. However, this library is compiled with NO_MBSUPPORT, which causes git-grep to work incorrectly on multibyte (e.g. UTF-8) files. Current macOS versions pass t0070-fundamental.sh with the native macOS regex library, which also supports multibyte characters. Adjust the Makefile to use the native regex library, and call setlocale(3) to set CTYPE according to the user's preference. The setlocale call is required on all platforms, but in platforms supporting gettext(3), setlocale was called as a side-effect of initializing gettext. Therefore, move the CTYPE setlocale call from gettext.c to common-main.c and the corresponding locale.h include into git-compat-util.h. Thanks to the global initialization of CTYPE setlocale, the test-tool regex command now works correctly with supported multibyte regexes, and is used to set the MB_REGEX test prerequisite by assessing a platform's support for them. Signed-off-by: Diomidis Spinellis Signed-off-by: Junio C Hamano --- git-compat-util.h | 1 + 1 file changed, 1 insertion(+) (limited to 'git-compat-util.h') diff --git a/git-compat-util.h b/git-compat-util.h index 36a25ae252..76d29e3e10 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -215,6 +215,7 @@ struct strbuf; #endif #include #include +#include #ifdef NEEDS_SYS_PARAM_H #include #endif -- cgit v1.2.3