+2020-07-29 Bruno Haible <bruno@clisp.org>
+
+ unicodeio: Fix wrong result on musl libc.
+ Reported by A. Wilcox <awilfox@adelielinux.org> in
+ <https://www.openwall.com/lists/musl/2020/07/29/2>.
+ * lib/unicodeio.c (unicode_to_mb): Handle asterisk fallback characters
+ on musl libc.
+ * m4/unicodeio.m4 (gl_UNICODEIO): Invoke gl_MUSL_LIBC.
+ * modules/unicodeio (Files): Add m4/musl.m4.
+
2020-07-29 Paul Eggert <eggert@cs.ucla.edu>
fsusage, regex, stat-size: remove Cray support
(ICONV_CONST char **)&inptr, &inbytesleft,
&outptr, &outbytesleft);
if (inbytesleft > 0 || res == (size_t)(-1)
- /* Irix iconv() inserts a NUL byte if it cannot convert. */
+ /* Irix iconv() inserts a NUL byte if it cannot convert. */
# if !defined _LIBICONV_VERSION && (defined sgi || defined __sgi)
|| (res > 0 && code != 0 && outptr - outbuf == 1 && *outbuf == '\0')
# endif
convert. */
# if !defined _LIBICONV_VERSION && (defined __NetBSD__ || defined __sun)
|| (res > 0 && outptr - outbuf == 1 && *outbuf == '?')
+# endif
+ /* musl libc iconv() inserts a '*' if it cannot convert. */
+# if !defined _LIBICONV_VERSION && MUSL_LIBC
+ || (res > 0 && outptr - outbuf == 1 && *outbuf == '*')
# endif
)
return failure (code, NULL, callback_arg);
-# unicodeio.m4 serial 2
+# unicodeio.m4 serial 3
dnl Copyright (C) 2002-2003, 2009-2020 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
AC_DEFUN([gl_UNICODEIO],
[
- dnl No prerequisites of lib/unicodeio.c.
- :
+ dnl Prerequisites of lib/unicodeio.c.
+ gl_MUSL_LIBC
])
lib/unicodeio.h
lib/unicodeio.c
m4/unicodeio.m4
+m4/musl.m4
Depends-on:
unistr/u8-uctomb