Commit 361179786d9c27381bac185337db9526593e2b47
2016-10-06T18:30:30
Fix the existence check for `regcomp_l`. `xlocale.h` only defines `regcomp_l` if `regex.h` was included as well. Also change the test cases to actually test `p_regcomp` works with a multibyte locale.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed106e4..f26f468 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -508,7 +508,7 @@ ELSE ()
ENDIF ()
ENDIF()
-CHECK_SYMBOL_EXISTS(regcomp_l "xlocale.h" HAVE_REGCOMP_L)
+CHECK_SYMBOL_EXISTS(regcomp_l "regex.h;xlocale.h" HAVE_REGCOMP_L)
IF (HAVE_REGCOMP_L)
ADD_DEFINITIONS(-DHAVE_REGCOMP_L)
ENDIF ()
diff --git a/tests/core/posix.c b/tests/core/posix.c
index 4e177b1..26ae360 100644
--- a/tests/core/posix.c
+++ b/tests/core/posix.c
@@ -9,6 +9,8 @@
# endif
#endif
+#include <locale.h>
+
#include "clar_libgit2.h"
#include "posix.h"
#include "userdiff.h"
@@ -148,26 +150,46 @@ void test_core_posix__utimes(void)
p_unlink("foo");
}
-void test_core_posix__p_regcomp_compile_single_byte_regexps(void)
+void test_core_posix__p_regcomp_ignores_global_locale_ctype(void)
{
regex_t preg;
+ int error = 0;
+
+ const char* oldlocale = setlocale(LC_CTYPE, NULL);
- cl_must_pass(p_regcomp(&preg, "[\xc0-\xff][\x80-\xbf]", REG_EXTENDED));
+ if (!setlocale(LC_CTYPE, "UTF-8") &&
+ !setlocale(LC_CTYPE, "c.utf8") &&
+ !setlocale(LC_CTYPE, "en_US.UTF-8"))
+ cl_skip();
+ if (MB_CUR_MAX == 1) {
+ setlocale(LC_CTYPE, oldlocale);
+ cl_fail("Expected locale to be switched to multibyte");
+ }
+
+ p_regcomp(&preg, "[\xc0-\xff][\x80-\xbf]", REG_EXTENDED);
regfree(&preg);
+
+ setlocale(LC_CTYPE, oldlocale);
+
+ cl_must_pass(error);
}
void test_core_posix__p_regcomp_compile_userdiff_regexps(void)
{
- regex_t preg;
size_t idx;
for (idx = 0; idx < ARRAY_SIZE(builtin_defs); ++idx) {
git_diff_driver_definition ddef = builtin_defs[idx];
+ int error = 0;
+ regex_t preg;
- cl_must_pass(p_regcomp(&preg, ddef.fns, REG_EXTENDED | ddef.flags));
- cl_must_pass(p_regcomp(&preg, ddef.words, REG_EXTENDED));
- }
+ error = p_regcomp(&preg, ddef.fns, REG_EXTENDED | ddef.flags);
+ regfree(&preg);
+ cl_must_pass(error);
- regfree(&preg);
+ error = p_regcomp(&preg, ddef.words, REG_EXTENDED);
+ regfree(&preg);
+ cl_must_pass(error);
+ }
}