diff options
author | Bruno Haible <bruno@clisp.org> | 2023-04-19 02:14:09 +0200 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2023-04-19 02:39:36 +0200 |
commit | 4b440d3568b01dd9acd5242bea8b63fc43428f5a (patch) | |
tree | 58e1ba3d97e79f2e21b73badab54a3b5b6d277d5 /m4 | |
parent | 7634eee7a8da4a2f5eb9522ec01d24b8ad105df7 (diff) | |
download | gnulib-4b440d3568b01dd9acd5242bea8b63fc43428f5a.tar.gz |
wcscmp: Work around two ISO C compliance bugs on several platforms.
* lib/wchar.in.h (wcscmp): Consider REPLACE_WCSCMP.
* lib/wcscmp-impl.h (wcscmp): Don't assume that the two wide characters
are in the range 0..INT_MAX.
* m4/wcscmp.m4 (gl_FUNC_WCSCMP): Test whether wcscmp works for all wide
characters. Set REPLACE_WCSCMP.
* m4/wchar_h.m4 (gl_WCHAR_H_DEFAULTS): Initialize REPLACE_WCSCMP.
* modules/wchar (Makefile.am): Substitute REPLACE_WCSCMP.
* modules/wcscmp (Status, Notice): Un-obsolete this module.
(configure.ac): Consider REPLACE_WCSCMP.
* doc/posix-functions/wcscmp.texi: Mention the two bugs.
Diffstat (limited to 'm4')
-rw-r--r-- | m4/wchar_h.m4 | 3 | ||||
-rw-r--r-- | m4/wcscmp.m4 | 58 |
2 files changed, 59 insertions, 2 deletions
diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 index dfd154f8e9..b9fa7cec84 100644 --- a/m4/wchar_h.m4 +++ b/m4/wchar_h.m4 @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. dnl Written by Eric Blake. -# wchar_h.m4 serial 58 +# wchar_h.m4 serial 59 AC_DEFUN_ONCE([gl_WCHAR_H], [ @@ -253,6 +253,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], REPLACE_WCWIDTH=0; AC_SUBST([REPLACE_WCWIDTH]) REPLACE_WCSWIDTH=0; AC_SUBST([REPLACE_WCSWIDTH]) REPLACE_WCSFTIME=0; AC_SUBST([REPLACE_WCSFTIME]) + REPLACE_WCSCMP=0; AC_SUBST([REPLACE_WCSCMP]) REPLACE_WCSSTR=0; AC_SUBST([REPLACE_WCSSTR]) REPLACE_WCSTOK=0; AC_SUBST([REPLACE_WCSTOK]) REPLACE_WMEMCMP=0; AC_SUBST([REPLACE_WMEMCMP]) diff --git a/m4/wcscmp.m4 b/m4/wcscmp.m4 index 61fd800e4d..a3000ed275 100644 --- a/m4/wcscmp.m4 +++ b/m4/wcscmp.m4 @@ -1,4 +1,4 @@ -# wcscmp.m4 serial 2 +# wcscmp.m4 serial 3 dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,5 +10,61 @@ AC_DEFUN([gl_FUNC_WCSCMP], AC_CHECK_FUNCS_ONCE([wcscmp]) if test $ac_cv_func_wcscmp = no; then HAVE_WCSCMP=0 + else + AC_CACHE_CHECK([whether wcscmp works for all wide characters], + [gl_cv_func_wcscmp_works], + [AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ + #include <wchar.h> + int main () + { + int result = 0; + { /* This test fails on glibc < 2.15, musl libc 1.2.3, macOS 12.5, + FreeBSD 13.2, NetBSD 9.0, OpenBSD 7.2, Solaris 11.4. */ + wchar_t a[2] = { (wchar_t) 0x76547654, 0 }; + wchar_t b[2] = { (wchar_t) 0x9abc9abc, 0 }; + int cmp = wcscmp (a, b); + if (!((wchar_t)-1 < 0 ? cmp > 0 : cmp < 0)) + result |= 1; + } + { /* This test fails on AIX in 64-bit mode. */ + wchar_t c[2] = { (wchar_t) 'x', 0 }; + wchar_t d[3] = { (wchar_t) 'x', (wchar_t) 0x9abc9abc, 0 }; + int cmp = wcscmp (c, d); + if (!((wchar_t)-1 < 0 ? cmp > 0 : cmp < 0)) + result |= 2; + } + return result; + } + ]]) + ], + [gl_cv_func_wcscmp_works=yes], + [gl_cv_func_wcscmp_works=no], + [case "$host_on" in + # Guess no on glibc versions < 2.15. + *-gnu* | gnu*) + AC_EGREP_CPP([Unlucky], + [ +#include <features.h> +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ < 15) + Unlucky GNU user + #endif +#endif + ], + [gl_cv_func_wcscmp_works="guessing no"], + [gl_cv_func_wcscmp_works="guessing yes"]) + ;; + # Guess no on musl systems. + *-musl* | midipix*) gl_cv_func_wcscmp_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_wcscmp_works="$gl_cross_guess_normal" ;; + esac + ]) + ]) + case "$gl_cv_func_wcscmp_works" in + *yes) ;; + *) REPLACE_WCSCMP=1 ;; + esac fi ]) |