Mercurial > gnulib

changeset 40043:b3a43d4c1a81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localename: Fix test failure on AIX 7. Reported by Assaf Gordon in <https://lists.gnu.org/archive/html/sed-devel/2018-12/msg00019.html>. * m4/intl-thread-locale.m4 (gt_FUNC_USELOCALE): New macro. (gt_INTL_THREAD_LOCALE_NAME): Invoke it. Test gt_cv_func_uselocale_works instead of ac_cv_func_uselocale. * lib/localename.c: Test HAVE_WORKING_USELOCALE instead of HAVE_USELOCALE. * lib/localename-table.h: Likewise. * lib/localename-table.c: Likewise. * tests/test-localename.c: Likewise. * doc/posix-functions/uselocale.texi: Mention the AIX problem.
author Bruno Haible <bruno@clisp.org>
date Tue, 18 Dec 2018 09:49:42 +0100
parents bd426cb23907
children 74054cd6d907
files ChangeLog doc/posix-functions/uselocale.texi lib/localename-table.c lib/localename-table.h lib/localename.c m4/intl-thread-locale.m4 tests/test-localename.c
diffstat 7 files changed, 128 insertions(+), 55 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Dec 18 08:53:49 2018 +0100
+++ b/ChangeLog	Tue Dec 18 09:49:42 2018 +0100
@@ -1,3 +1,18 @@
+2018-12-18  Bruno Haible  <bruno@clisp.org>
+
+	localename: Fix test failure on AIX 7.
+	Reported by Assaf Gordon in
+	<https://lists.gnu.org/archive/html/sed-devel/2018-12/msg00019.html>.
+	* m4/intl-thread-locale.m4 (gt_FUNC_USELOCALE): New macro.
+	(gt_INTL_THREAD_LOCALE_NAME): Invoke it. Test gt_cv_func_uselocale_works
+	instead of ac_cv_func_uselocale.
+	* lib/localename.c: Test HAVE_WORKING_USELOCALE instead of
+	HAVE_USELOCALE.
+	* lib/localename-table.h: Likewise.
+	* lib/localename-table.c: Likewise.
+	* tests/test-localename.c: Likewise.
+	* doc/posix-functions/uselocale.texi: Mention the AIX problem.
+
 2018-12-18  Bruno Haible  <bruno@clisp.org>
 
 	localename: Update comments regarding Cygwin.
--- a/doc/posix-functions/uselocale.texi	Tue Dec 18 08:53:49 2018 +0100
+++ b/doc/posix-functions/uselocale.texi	Tue Dec 18 09:49:42 2018 +0100
@@ -16,6 +16,10 @@
 This function is missing on many platforms:
 Mac OS X 10.3, FreeBSD 9.0, NetBSD 5.0, OpenBSD 6.1, Minix 3.1.8, AIX 6.1, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 11.3, Cygwin 2.5.x, mingw, MSVC 14, Interix 3.5, BeOS, Android 4.4.
 @item
+This function is not documented and leads to crashes in subsequent
+@code{setlocale} invocations on some platforms:
+AIX 7.2.
+@item
 This function is useless because the @code{locale_t} type contains basically
 no information on some platforms:
 OpenBSD 6.3.
--- a/lib/localename-table.c	Tue Dec 18 08:53:49 2018 +0100
+++ b/lib/localename-table.c	Tue Dec 18 09:49:42 2018 +0100
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#if HAVE_USELOCALE && HAVE_NAMELESS_LOCALES
+#if HAVE_WORKING_USELOCALE && HAVE_NAMELESS_LOCALES
 
 /* Specification.  */
 #include "localename-table.h"
--- a/lib/localename-table.h	Tue Dec 18 08:53:49 2018 +0100
+++ b/lib/localename-table.h	Tue Dec 18 09:49:42 2018 +0100
@@ -16,7 +16,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2018.  */
 
-#if HAVE_USELOCALE && HAVE_NAMELESS_LOCALES
+#if HAVE_WORKING_USELOCALE && HAVE_NAMELESS_LOCALES
 
 # include <stddef.h>
 # include <locale.h>
--- a/lib/localename.c	Tue Dec 18 08:53:49 2018 +0100
+++ b/lib/localename.c	Tue Dec 18 09:49:42 2018 +0100
@@ -37,7 +37,7 @@
 
 /* We cannot support uselocale() on platforms where the locale_t type is fake.
    See intl-thread-locale.m4 for details.  */
-#if HAVE_USELOCALE && !HAVE_FAKE_LOCALES
+#if HAVE_WORKING_USELOCALE && !HAVE_FAKE_LOCALES
 # define HAVE_GOOD_USELOCALE 1
 #endif
 
@@ -2629,7 +2629,7 @@
 #endif
 
 
-#if HAVE_GOOD_USELOCALE /* glibc, Mac OS X, FreeBSD >= 9.1, AIX >= 7, Cygwin >= 2.6,
+#if HAVE_GOOD_USELOCALE /* glibc, Mac OS X, FreeBSD >= 9.1, Cygwin >= 2.6,
                            Solaris 11 OpenIndiana, or Solaris >= 11.4  */
 
 /* Simple hash set of strings.  We don't want to drag in lots of hash table
--- a/m4/intl-thread-locale.m4	Tue Dec 18 08:53:49 2018 +0100
+++ b/m4/intl-thread-locale.m4	Tue Dec 18 09:49:42 2018 +0100
@@ -1,4 +1,4 @@
-# intl-thread-locale.m4 serial 3
+# intl-thread-locale.m4 serial 4
 dnl Copyright (C) 2015-2018 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -22,7 +22,8 @@
   dnl Persuade Solaris <locale.h> to define 'locale_t'.
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
-  AC_CHECK_FUNCS_ONCE([uselocale])
+  dnl Test whether uselocale() exists and works at all.
+  gt_FUNC_USELOCALE
 
   dnl On OpenBSD >= 6.2, the locale_t type and the uselocale(), newlocale(),
   dnl duplocale(), freelocale() functions exist but are effectively useless,
@@ -37,12 +38,13 @@
   dnl they did not think about the programs.
   dnl In this situation, even the HAVE_NAMELESS_LOCALES support does not work.
   dnl So, define HAVE_FAKE_LOCALES and disable all locale_t support.
-  if test $ac_cv_func_uselocale = yes; then
-    AC_CHECK_HEADERS_ONCE([xlocale.h])
-    AC_CACHE_CHECK([for fake locale system (OpenBSD)],
-      [gt_cv_locale_fake],
-      [AC_RUN_IFELSE(
-         [AC_LANG_SOURCE([[
+  case "$gt_cv_func_uselocale_works" in
+    *yes)
+      AC_CHECK_HEADERS_ONCE([xlocale.h])
+      AC_CACHE_CHECK([for fake locale system (OpenBSD)],
+        [gt_cv_locale_fake],
+        [AC_RUN_IFELSE(
+           [AC_LANG_SOURCE([[
 #include <locale.h>
 #if HAVE_XLOCALE_H
 # include <xlocale.h>
@@ -56,18 +58,18 @@
   loc2 = newlocale (LC_ALL_MASK, "fr_FR.UTF-8", (locale_t)0);
   return !(loc1 == loc2);
 }]])],
-         [gt_cv_locale_fake=yes],
-         [gt_cv_locale_fake=no],
-         [dnl Guess the locale system is fake only on OpenBSD.
-          case "$host_os" in
-            openbsd*) gt_cv_locale_fake="guessing yes" ;;
-            *)        gt_cv_locale_fake="guessing no" ;;
-          esac
-         ])
-      ])
-  else
-    gt_cv_locale_fake=no
-  fi
+           [gt_cv_locale_fake=yes],
+           [gt_cv_locale_fake=no],
+           [dnl Guess the locale system is fake only on OpenBSD.
+            case "$host_os" in
+              openbsd*) gt_cv_locale_fake="guessing yes" ;;
+              *)        gt_cv_locale_fake="guessing no" ;;
+            esac
+           ])
+        ])
+      ;;
+    *) gt_cv_locale_fake=no ;;
+  esac
   case "$gt_cv_locale_fake" in
     *yes)
       AC_DEFINE([HAVE_FAKE_LOCALES], [1],
@@ -75,33 +77,34 @@
       ;;
   esac
 
-  if test $ac_cv_func_uselocale = yes; then
-    AC_CACHE_CHECK([for Solaris 11.4 locale system],
-      [gt_cv_locale_solaris114],
-      [case "$host_os" in
-         solaris*)
-           dnl Test whether <locale.h> defines locale_t as a typedef of
-           dnl 'struct _LC_locale_t **' (whereas Illumos defines it as a
-           dnl typedef of 'struct _locale *').
-           dnl Another possible test would be to include <sys/localedef.h>
-           dnl and test whether it defines the _LC_core_data_locale_t type.
-           dnl This type was added in Solaris 11.4.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_PROGRAM([[
-                #include <locale.h>
-                struct _LC_locale_t *x;
-                locale_t y;
-              ]],
-              [[*y = x;]])],
-             [gt_cv_locale_solaris114=yes],
-             [gt_cv_locale_solaris114=no])
-           ;;
-         *) gt_cv_locale_solaris114=no ;;
-       esac
-      ])
-  else
-    gt_cv_locale_solaris114=no
-  fi
+  case "$gt_cv_func_uselocale_works" in
+    *yes)
+      AC_CACHE_CHECK([for Solaris 11.4 locale system],
+        [gt_cv_locale_solaris114],
+        [case "$host_os" in
+           solaris*)
+             dnl Test whether <locale.h> defines locale_t as a typedef of
+             dnl 'struct _LC_locale_t **' (whereas Illumos defines it as a
+             dnl typedef of 'struct _locale *').
+             dnl Another possible test would be to include <sys/localedef.h>
+             dnl and test whether it defines the _LC_core_data_locale_t type.
+             dnl This type was added in Solaris 11.4.
+             AC_COMPILE_IFELSE(
+               [AC_LANG_PROGRAM([[
+                  #include <locale.h>
+                  struct _LC_locale_t *x;
+                  locale_t y;
+                ]],
+                [[*y = x;]])],
+               [gt_cv_locale_solaris114=yes],
+               [gt_cv_locale_solaris114=no])
+             ;;
+           *) gt_cv_locale_solaris114=no ;;
+         esac
+        ])
+      ;;
+    *) gt_cv_locale_solaris114=no ;;
+  esac
   if test $gt_cv_locale_solaris114 = yes; then
     AC_DEFINE([HAVE_SOLARIS114_LOCALES], [1],
       [Define if the locale_t type is as on Solaris 11.4.])
@@ -110,9 +113,11 @@
   dnl Solaris 12 will maybe provide getlocalename_l.  If it does, it will
   dnl improve the implementation of gl_locale_name_thread(), by removing
   dnl the use of undocumented structures.
-  if test $ac_cv_func_uselocale = yes; then
-    AC_CHECK_FUNCS([getlocalename_l])
-  fi
+  case "$gt_cv_func_uselocale_works" in
+    *yes)
+      AC_CHECK_FUNCS([getlocalename_l])
+      ;;
+  esac
 
   dnl This code is for future use, in case we some day have to port to a
   dnl platform where the locale_t type does not provide access to the name of
@@ -127,3 +132,52 @@
       [Define if the locale_t type does not contain the name of each locale category.])
   fi
 ])
+
+dnl Tests whether uselocale() exists and is usable.
+dnl Sets gt_cv_func_uselocale_works. Defines HAVE_WORKING_USELOCALE.
+AC_DEFUN([gt_FUNC_USELOCALE],
+[
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+
+  dnl Persuade Solaris <locale.h> to define 'locale_t'.
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+
+  AC_CHECK_FUNCS_ONCE([uselocale])
+
+  dnl On AIX 7.2, the uselocale() function is not documented and leads to
+  dnl crashes in subsequent setlocale() invocations.
+  if test $ac_cv_func_uselocale = yes; then
+    AC_CHECK_HEADERS_ONCE([xlocale.h])
+    AC_CACHE_CHECK([whether uselocale works],
+      [gt_cv_func_uselocale_works],
+      [AC_RUN_IFELSE(
+         [AC_LANG_SOURCE([[
+#include <locale.h>
+#if HAVE_XLOCALE_H
+# include <xlocale.h>
+#endif
+int main ()
+{
+  uselocale (NULL);
+  setlocale (LC_ALL, "en_US.UTF-8");
+  return 0;
+}]])],
+         [gt_cv_func_uselocale_works=yes],
+         [gt_cv_func_uselocale_works=no],
+         [# Guess no on AIX, yes otherwise.
+          case "$host_os" in
+            aix*) gt_cv_func_uselocale_works="guessing no" ;;
+            *)    gt_cv_func_uselocale_works="guessing yes" ;;
+          esac
+         ])
+      ])
+  else
+    gt_cv_func_uselocale_works=no
+  fi
+  case "$gt_cv_func_uselocale_works" in
+    *yes)
+      AC_DEFINE([HAVE_WORKING_USELOCALE], [1],
+        [Define if the uselocale function exists any may safely be called.])
+      ;;
+  esac
+])
--- a/tests/test-localename.c	Tue Dec 18 08:53:49 2018 +0100
+++ b/tests/test-localename.c	Tue Dec 18 09:49:42 2018 +0100
@@ -26,7 +26,7 @@
 
 #include "macros.h"
 
-#if HAVE_NEWLOCALE && HAVE_USELOCALE && !HAVE_FAKE_LOCALES
+#if HAVE_NEWLOCALE && HAVE_WORKING_USELOCALE && !HAVE_FAKE_LOCALES
 # define HAVE_GOOD_USELOCALE 1
 #endif