* lib/strings.in.h: Include <locale.h>.
(strcasecmp_l): New declaration.
* lib/strcasecmp_l.c: New file, based on lib/strcasecmp.c.
* m4/strcasecmp_l.m4: New file.
* m4/strings_h.m4 (gl_STRINGS_H): Test for strcasecmp_l.
(gl_STRINGS_H_REQUIRE_DEFAULTS): Initialize GNULIB_STRCASECMP_L.
(gl_STRINGS_H_DEFAULTS): Initialize HAVE_STRCASECMP_L,
REPLACE_STRCASECMP_L.
* modules/strings-h (Makefile.am): Substitute GNULIB_STRCASECMP_L,
HAVE_STRCASECMP_L, REPLACE_STRCASECMP_L.
* modules/strcasecmp_l: New file.
* tests/test-strings-h-c++.cc: Check declaration of strcasecmp_l.
* doc/posix-functions/strcasecmp_l.texi: Mention the new module and the
macOS, Solaris, Cygwin bugs.
+2025-02-16 Bruno Haible <bruno@clisp.org>
+
+ strcasecmp_l: New module.
+ * lib/strings.in.h: Include <locale.h>.
+ (strcasecmp_l): New declaration.
+ * lib/strcasecmp_l.c: New file, based on lib/strcasecmp.c.
+ * m4/strcasecmp_l.m4: New file.
+ * m4/strings_h.m4 (gl_STRINGS_H): Test for strcasecmp_l.
+ (gl_STRINGS_H_REQUIRE_DEFAULTS): Initialize GNULIB_STRCASECMP_L.
+ (gl_STRINGS_H_DEFAULTS): Initialize HAVE_STRCASECMP_L,
+ REPLACE_STRCASECMP_L.
+ * modules/strings-h (Makefile.am): Substitute GNULIB_STRCASECMP_L,
+ HAVE_STRCASECMP_L, REPLACE_STRCASECMP_L.
+ * modules/strcasecmp_l: New file.
+ * tests/test-strings-h-c++.cc: Check declaration of strcasecmp_l.
+ * doc/posix-functions/strcasecmp_l.texi: Mention the new module and the
+ macOS, Solaris, Cygwin bugs.
+
2025-02-16 Collin Funk <collin.funk1@gmail.com>
unistd-h tests: Check that unistd.h defines O_CLOEXEC.
POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/functions/strcasecmp_l.html}
-Gnulib module: ---
+Gnulib module: strcasecmp_l
+@mindex strcasecmp_l
Portability problems fixed by Gnulib:
@itemize
+@item
+This function is missing on many platforms:
+FreeBSD 9.0, NetBSD 10.0, OpenBSD 6.1, Minix 3.3.0, AIX 6.1, HP-UX 11, Solaris 11.3, Cygwin 2.5.x, mingw, MSVC 14, Android 5.1.
+@item
+This function is declared in @code{<string.h>} instead of @code{<strings.h>}
+on some platforms:
+glibc 2.9, macOS 15.
+@item
+This function uses the case mappings of a wrong locale on some platforms:
+Solaris 11.4, Cygwin 3.5.6.
@end itemize
Portability problems not fixed by Gnulib:
@itemize
-@item
-This function is missing on many platforms:
-FreeBSD 6.0, NetBSD 10.0, OpenBSD 6.0, Minix 3.1.8, AIX 5.1, HP-UX 11, Solaris 11.3, Cygwin 1.7.x, mingw, MSVC 14, Android 5.1.
@end itemize
--- /dev/null
+/* Case-insensitive string comparison function for unibyte locales.
+ Copyright (C) 1998-2025 Free Software Foundation, Inc.
+
+ This file is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of the
+ License, or (at your option) any later version.
+
+ This file is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>. */
+
+#include <config.h>
+
+/* Specification. */
+#include <strings.h>
+
+#include <ctype.h>
+#include <limits.h>
+#include <string.h>
+
+int
+strcasecmp_l (const char *s1, const char *s2, locale_t locale)
+{
+#if GNULIB_defined_locale_t
+
+ struct gl_locale_category_t *plc =
+ &locale->category[gl_log2_lc_mask (LC_CTYPE)];
+ if (plc->is_c_locale)
+ /* Implementation for the "C" locale. */
+ return c_strcasecmp (s1, s2);
+# if HAVE_WINDOWS_LOCALE_T
+ /* Documentation:
+ <https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/stricmp-wcsicmp-mbsicmp-stricmp-l-wcsicmp-l-mbsicmp-l> */
+ return _stricmp_l (s1, s2, plc->system_locale);
+# else
+ /* Implementation for the global locale. */
+ {
+ int ret;
+# if HAVE_WORKING_USELOCALE
+ locale_t saved_locale = uselocale (LC_GLOBAL_LOCALE);
+# endif
+ ret = strcasecmp (s1, s2);
+# if HAVE_WORKING_USELOCALE
+ uselocale (saved_locale);
+# endif
+ return ret;
+ }
+# endif
+
+#else
+
+ unsigned char c1, c2;
+
+ if (s1 == s2)
+ return 0;
+
+ do
+ {
+ c1 = tolower_l ((unsigned char) *s1, locale);
+ c2 = tolower_l ((unsigned char) *s2, locale);
+
+ if (c1 == '\0')
+ break;
+
+ ++s1;
+ ++s2;
+ }
+ while (c1 == c2);
+
+ if (UCHAR_MAX <= INT_MAX)
+ return c1 - c2;
+ else
+ /* On machines where 'char' and 'int' are types of the same size, the
+ difference of two 'unsigned char' values - including the sign bit -
+ doesn't fit in an 'int'. */
+ return _GL_CMP (c1, c2);
+
+#endif
+}
#ifndef _@GUARD_PREFIX@_STRINGS_H
#define _@GUARD_PREFIX@_STRINGS_H
-/* This file uses GNULIB_POSIXCHECK, HAVE_RAW_DECL_*. */
+/* This file uses _GL_ARG_NONNULL, GNULIB_POSIXCHECK, HAVE_RAW_DECL_*. */
#if !_GL_CONFIG_H_INCLUDED
#error "Please include config.h first."
#endif
# include <stddef.h>
#endif
+#if @GNULIB_STRCASECMP_L@
+/* Get locale_t. */
+# include <locale.h>
+# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ < 10) \
+ || (defined __APPLE__ && defined __MACH__))
+/* Get the declaration of strcasecmp_l. */
+# include <string.h>
+# endif
+#endif
+
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
# endif
#endif
+#if @GNULIB_STRCASECMP_L@
+# if @REPLACE_STRCASECMP_L@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef strcasecmp_l
+# define strcasecmp_l rpl_strcasecmp_l
+# endif
+_GL_FUNCDECL_RPL (strcasecmp_l, int,
+ (const char *s1, const char *s2, locale_t locale),
+ _GL_ARG_NONNULL ((1, 2, 3)));
+_GL_CXXALIAS_RPL (strcasecmp_l, int,
+ (const char *s1, const char *s2, locale_t locale));
+# else
+# if !@HAVE_STRCASECMP_L@
+_GL_FUNCDECL_SYS (strcasecmp_l, int,
+ (const char *s1, const char *s2, locale_t locale),
+ _GL_ARG_NONNULL ((1, 2, 3)));
+# endif
+_GL_CXXALIAS_SYS (strcasecmp_l, int,
+ (const char *s1, const char *s2, locale_t locale));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (strcasecmp_l);
+# endif
+#elif defined GNULIB_POSIXCHECK
+/* strcasecmp_l() does not work with multibyte strings:
+ POSIX says that it operates on "strings", and "string" in POSIX is defined
+ as a sequence of bytes, not of characters. */
+# undef strcasecmp_l
+# if HAVE_RAW_DECL_STRCASECMP_L
+_GL_WARN_ON_USE (strcasecmp_l, "strcasecmp_l cannot work correctly on "
+ "character strings in multibyte locales and is unportable - "
+ "use gnulib module strcasecmp_l for portability");
+# endif
+#endif
+
#if @GNULIB_STRNCASECMP@
/* Compare no more than N bytes of strings S1 and S2, ignoring case,
returning less than, equal to or greater than zero if S1 is
--- /dev/null
+# strcasecmp_l.m4
+# serial 1
+dnl Copyright (C) 2009-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+AC_DEFUN([gl_FUNC_STRCASECMP_L],
+[
+ AC_REQUIRE([gl_STRINGS_H_DEFAULTS])
+
+ dnl Persuade glibc <strings.h> to declare strcasecmp_l().
+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+
+ AC_CHECK_FUNCS_ONCE([strcasecmp_l])
+ if test $ac_cv_func_strcasecmp_l = yes; then
+ dnl strcasecmp_l usually has the same bug as strcasecmp.
+ gl_STRCASECMP_WORKS
+ case "$gl_cv_func_strcasecmp_works" in
+ *yes) ;;
+ *) REPLACE_STRCASECMP_L=1 ;;
+ esac
+ else
+ HAVE_STRCASECMP_L=0
+ fi
+])
+
+# Prerequisites of lib/strcasecmp_l.c.
+AC_DEFUN([gl_PREREQ_STRCASECMP_L],
+[
+ AC_REQUIRE([gt_FUNC_USELOCALE])
+ :
+])
# strings_h.m4
-# serial 12
+# serial 13
dnl Copyright (C) 2007, 2009-2025 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
<strings.h>. */
#include <sys/types.h>
#include <strings.h>
- ]], [ffs strcasecmp strncasecmp])
+ ]], [ffs strcasecmp strcasecmp_l strncasecmp])
])
# gl_STRINGS_MODULE_INDICATOR([modulename])
m4_defun(GL_MODULE_INDICATOR_PREFIX[_STRINGS_H_MODULE_INDICATOR_DEFAULTS], [
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFS])
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRCASECMP])
+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRCASECMP_L])
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNCASECMP])
])
m4_require(GL_MODULE_INDICATOR_PREFIX[_STRINGS_H_MODULE_INDICATOR_DEFAULTS])
dnl Assume proper GNU behavior unless another module says otherwise.
HAVE_FFS=1; AC_SUBST([HAVE_FFS])
HAVE_STRCASECMP=1; AC_SUBST([HAVE_STRCASECMP])
+ HAVE_STRCASECMP_L=1; AC_SUBST([HAVE_STRCASECMP_L])
HAVE_STRNCASECMP=1; AC_SUBST([HAVE_STRNCASECMP])
HAVE_DECL_STRNCASECMP=1; AC_SUBST([HAVE_DECL_STRNCASECMP])
REPLACE_STRCASECMP=0; AC_SUBST([REPLACE_STRCASECMP])
+ REPLACE_STRCASECMP_L=0; AC_SUBST([REPLACE_STRCASECMP_L])
REPLACE_STRNCASECMP=0; AC_SUBST([REPLACE_STRNCASECMP])
])
--- /dev/null
+Description:
+Case-insensitive string comparison for unibyte locales.
+
+Files:
+lib/strcasecmp_l.c
+m4/strcasecmp_l.m4
+m4/strcasecmp.m4
+m4/intl-thread-locale.m4
+
+Depends-on:
+strings-h
+locale-h
+extensions
+c-strcasecmp [test $HAVE_STRCASECMP_L = 0 || test $REPLACE_STRCASECMP_L = 1]
+tolower_l [test $HAVE_STRCASECMP_L = 0 || test $REPLACE_STRCASECMP_L = 1]
+
+configure.ac:
+gl_FUNC_STRCASECMP_L
+gl_CONDITIONAL([GL_COND_OBJ_STRCASECMP_L],
+ [test $HAVE_STRCASECMP_L = 0 || test $REPLACE_STRCASECMP_L = 1])
+AM_COND_IF([GL_COND_OBJ_STRCASECMP_L], [
+ gl_PREREQ_STRCASECMP_L
+])
+gl_MODULE_INDICATOR([strcasecmp_l])
+gl_STRINGS_MODULE_INDICATOR([strcasecmp_l])
+
+Makefile.am:
+if GL_COND_OBJ_STRCASECMP_L
+lib_SOURCES += strcasecmp_l.c
+endif
+
+Include:
+<strings.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all
-e 's|@''NEXT_STRINGS_H''@|$(NEXT_STRINGS_H)|g' \
-e 's/@''GNULIB_FFS''@/$(GNULIB_FFS)/g' \
-e 's/@''GNULIB_STRCASECMP''@/$(GNULIB_STRCASECMP)/g' \
+ -e 's/@''GNULIB_STRCASECMP_L''@/$(GNULIB_STRCASECMP_L)/g' \
-e 's/@''GNULIB_STRNCASECMP''@/$(GNULIB_STRNCASECMP)/g' \
-e 's|@''HAVE_FFS''@|$(HAVE_FFS)|g' \
-e 's|@''HAVE_STRCASECMP''@|$(HAVE_STRCASECMP)|g' \
+ -e 's|@''HAVE_STRCASECMP_L''@|$(HAVE_STRCASECMP_L)|g' \
-e 's|@''HAVE_STRNCASECMP''@|$(HAVE_STRNCASECMP)|g' \
-e 's|@''HAVE_DECL_STRNCASECMP''@|$(HAVE_DECL_STRNCASECMP)|g' \
-e 's|@''REPLACE_STRCASECMP''@|$(REPLACE_STRCASECMP)|g' \
+ -e 's|@''REPLACE_STRCASECMP_L''@|$(REPLACE_STRCASECMP_L)|g' \
-e 's|@''REPLACE_STRNCASECMP''@|$(REPLACE_STRNCASECMP)|g' \
-e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
SIGNATURE_CHECK (GNULIB_NAMESPACE::ffs, int, (int));
#endif
+#if GNULIB_TEST_STRCASECMP_L
+SIGNATURE_CHECK (GNULIB_NAMESPACE::strcasecmp_l, int,
+ (const char *, const char *, locale_t));
+#endif
+
int
main ()