>From 3968e4d4f1b2ad9afb1ff162509d0abf0dc22d2d Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 24 Mar 2023 11:35:26 +0100 Subject: [PATCH 14/31] vfprintf-gnu: New module. * m4/vfprintf-posix.m4 (gl_FUNC_VFPRINTF_IS_POSIX): New macro, extracted from gl_FUNC_VFPRINTF_POSIX. (gl_FUNC_VFPRINTF_POSIX): Require it. Invoke gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS. * m4/vfprintf-gnu.m4: New file, based on m4/vfprintf-posix.m4. * modules/vfprintf-gnu: New file, based on modules/vasnprintf-gnu. * doc/posix-functions/vfprintf.texi: Mention the new module. --- ChangeLog | 11 +++++++++++ doc/posix-functions/vfprintf.texi | 15 +++++++++++---- m4/vfprintf-gnu.m4 | 25 +++++++++++++++++++++++++ m4/vfprintf-posix.m4 | 31 +++++++++++++------------------ modules/vfprintf-gnu | 28 ++++++++++++++++++++++++++++ 5 files changed, 88 insertions(+), 22 deletions(-) create mode 100644 m4/vfprintf-gnu.m4 create mode 100644 modules/vfprintf-gnu diff --git a/ChangeLog b/ChangeLog index 6ab03e83a1..e5af17568f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2023-03-24 Bruno Haible + + vfprintf-gnu: New module. + * m4/vfprintf-posix.m4 (gl_FUNC_VFPRINTF_IS_POSIX): New macro, + extracted from gl_FUNC_VFPRINTF_POSIX. + (gl_FUNC_VFPRINTF_POSIX): Require it. Invoke + gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS. + * m4/vfprintf-gnu.m4: New file, based on m4/vfprintf-posix.m4. + * modules/vfprintf-gnu: New file, based on modules/vasnprintf-gnu. + * doc/posix-functions/vfprintf.texi: Mention the new module. + 2023-03-24 Bruno Haible vasprintf-gnu: Add tests. diff --git a/doc/posix-functions/vfprintf.texi b/doc/posix-functions/vfprintf.texi index 252ac10e2b..719bba0698 100644 --- a/doc/posix-functions/vfprintf.texi +++ b/doc/posix-functions/vfprintf.texi @@ -4,9 +4,9 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9699919799/functions/vfprintf.html} -Gnulib module: vfprintf-posix or stdio, nonblocking, sigpipe +Gnulib module: vfprintf-posix or vfprintf-gnu or stdio, nonblocking, sigpipe -Portability problems fixed by Gnulib module @code{vfprintf-posix}: +Portability problems fixed by either Gnulib module @code{vfprintf-posix} or @code{vfprintf-gnu}: @itemize @item This function does not support size specifiers as in C99 (@code{hh}, @code{ll}, @@ -77,7 +77,14 @@ FreeBSD 13.0, NetBSD 5.0. @end itemize -Portability problems fixed by Gnulib module @code{stdio} or @code{vfprintf-posix}, together with module @code{nonblocking}: +Portability problems fixed by Gnulib module @code{vfprintf-gnu}: +@itemize +@item +This function does not support the @samp{B} directive on some platforms: +glibc 2.34, FreeBSD 13.1, NetBSD 9.0, OpenBSD 7.2, macOS 12.5, AIX 7.2, Solaris 11.4, and others. +@end itemize + +Portability problems fixed by Gnulib module @code{stdio} or @code{vfprintf-posix} or @code{vfprintf-gnu}, together with module @code{nonblocking}: @itemize @item When writing to a non-blocking pipe whose buffer is full, this function fails @@ -86,7 +93,7 @@ mingw, MSVC 14. @end itemize -Portability problems fixed by Gnulib module @code{stdio} or @code{vfprintf-posix}, together with module @code{sigpipe}: +Portability problems fixed by Gnulib module @code{stdio} or @code{vfprintf-posix} or @code{vfprintf-gnu}, together with module @code{sigpipe}: @itemize @item When writing to a pipe with no readers, this function fails, instead of diff --git a/m4/vfprintf-gnu.m4 b/m4/vfprintf-gnu.m4 new file mode 100644 index 0000000000..bb60781c17 --- /dev/null +++ b/m4/vfprintf-gnu.m4 @@ -0,0 +1,25 @@ +# vfprintf-gnu.m4 serial 1 +dnl Copyright (C) 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, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_FUNC_VFPRINTF_GNU], +[ + AC_REQUIRE([gl_FUNC_VFPRINTF_IS_POSIX]) + AC_REQUIRE([gl_PRINTF_DIRECTIVE_UPPERCASE_B]) + gl_cv_func_vfprintf_gnu=no + if test $gl_cv_func_vfprintf_posix = yes; then + case "$gl_cv_func_printf_directive_uppercase_b" in + *yes) + # vfprintf is already POSIX compliant and GNU compatible. + gl_cv_func_vfprintf_gnu=yes + ;; + esac + fi + if test $gl_cv_func_vfprintf_gnu = no; then + gl_PREREQ_VASNPRINTF_WITH_GNU_EXTRAS + gl_REPLACE_VASNPRINTF + gl_REPLACE_VFPRINTF + fi +]) diff --git a/m4/vfprintf-posix.m4 b/m4/vfprintf-posix.m4 index f248292cc4..f7e97a862a 100644 --- a/m4/vfprintf-posix.m4 +++ b/m4/vfprintf-posix.m4 @@ -1,10 +1,22 @@ -# vfprintf-posix.m4 serial 16 +# vfprintf-posix.m4 serial 17 dnl Copyright (C) 2007-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, dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_VFPRINTF_POSIX], +[ + AC_REQUIRE([gl_FUNC_VFPRINTF_IS_POSIX]) + if test $gl_cv_func_vfprintf_posix = no; then + gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS + gl_REPLACE_VASNPRINTF + gl_REPLACE_VFPRINTF + fi +]) + +dnl Test whether vfprintf is POSIX compliant. +dnl Result is gl_cv_func_vfprintf_posix. +AC_DEFUN([gl_FUNC_VFPRINTF_IS_POSIX], [ AC_REQUIRE([gl_PRINTF_SIZES_C99]) AC_REQUIRE([gl_PRINTF_LONG_DOUBLE]) @@ -90,23 +102,6 @@ AC_DEFUN([gl_FUNC_VFPRINTF_POSIX] esac ;; esac - if test $gl_cv_func_vfprintf_posix = no; then - gl_PREREQ_VASNPRINTF_LONG_DOUBLE - gl_PREREQ_VASNPRINTF_INFINITE_DOUBLE - gl_PREREQ_VASNPRINTF_INFINITE_LONG_DOUBLE - gl_PREREQ_VASNPRINTF_DIRECTIVE_A - gl_PREREQ_VASNPRINTF_DIRECTIVE_B - gl_PREREQ_VASNPRINTF_DIRECTIVE_F - gl_PREREQ_VASNPRINTF_DIRECTIVE_LS - gl_PREREQ_VASNPRINTF_DIRECTIVE_LC - gl_PREREQ_VASNPRINTF_FLAG_GROUPING - gl_PREREQ_VASNPRINTF_FLAG_LEFTADJUST - gl_PREREQ_VASNPRINTF_FLAG_ZERO - gl_PREREQ_VASNPRINTF_PRECISION - gl_PREREQ_VASNPRINTF_ENOMEM - gl_REPLACE_VASNPRINTF - gl_REPLACE_VFPRINTF - fi ]) AC_DEFUN([gl_REPLACE_VFPRINTF], diff --git a/modules/vfprintf-gnu b/modules/vfprintf-gnu new file mode 100644 index 0000000000..71a8c82d3b --- /dev/null +++ b/modules/vfprintf-gnu @@ -0,0 +1,28 @@ +Description: +POSIX and GNU compatible vfprintf() function: print formatted output to a stream + +Comment: +This module should not be used as a dependency from a test module, +otherwise when this module occurs as a tests-related module, it will +have side effects on the compilation of the 'vasnprintf' module, if +that module occurs among the main modules in lib/. + +Files: +m4/vfprintf-gnu.m4 + +Depends-on: +vfprintf-posix + +configure.ac: +gl_FUNC_VFPRINTF_GNU + +Makefile.am: + +Include: + + +License: +LGPL + +Maintainer: +all -- 2.34.1