>From 459992e2602eb90fb7d62960a605a5245f522148 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 24 Mar 2023 12:00:23 +0100 Subject: [PATCH 22/31] vdprintf-gnu: New module. * m4/vdprintf-posix.m4 (gl_FUNC_VDPRINTF_IS_POSIX): New macro, extracted from gl_FUNC_VDPRINTF_POSIX. (gl_FUNC_VDPRINTF_POSIX): Require it. Invoke gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS. * m4/vdprintf-gnu.m4: New file, based on m4/vdprintf-posix.m4. * modules/vdprintf-gnu: New file, based on modules/vasnprintf-gnu. * doc/posix-functions/vdprintf.texi: Mention the new module. --- ChangeLog | 11 +++++++++++ doc/posix-functions/vdprintf.texi | 13 ++++++++++--- m4/vdprintf-gnu.m4 | 25 +++++++++++++++++++++++++ m4/vdprintf-posix.m4 | 31 +++++++++++++------------------ modules/vdprintf-gnu | 29 +++++++++++++++++++++++++++++ 5 files changed, 88 insertions(+), 21 deletions(-) create mode 100644 m4/vdprintf-gnu.m4 create mode 100644 modules/vdprintf-gnu diff --git a/ChangeLog b/ChangeLog index 71ddf71163..e385339bb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2023-03-24 Bruno Haible + + vdprintf-gnu: New module. + * m4/vdprintf-posix.m4 (gl_FUNC_VDPRINTF_IS_POSIX): New macro, + extracted from gl_FUNC_VDPRINTF_POSIX. + (gl_FUNC_VDPRINTF_POSIX): Require it. Invoke + gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS. + * m4/vdprintf-gnu.m4: New file, based on m4/vdprintf-posix.m4. + * modules/vdprintf-gnu: New file, based on modules/vasnprintf-gnu. + * doc/posix-functions/vdprintf.texi: Mention the new module. + 2023-03-24 Bruno Haible printf-gnu: Add tests. diff --git a/doc/posix-functions/vdprintf.texi b/doc/posix-functions/vdprintf.texi index d533d32892..59138d5d15 100644 --- a/doc/posix-functions/vdprintf.texi +++ b/doc/posix-functions/vdprintf.texi @@ -4,16 +4,16 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9699919799/functions/vdprintf.html} -Gnulib module: vdprintf or vdprintf-posix +Gnulib module: vdprintf or vdprintf-posix or vdprintf-gnu -Portability problems fixed by either Gnulib module @code{vdprintf} or @code{vdprintf-posix}: +Portability problems fixed by either Gnulib module @code{vdprintf} or @code{vdprintf-posix} or @code{vdprintf-gnu}: @itemize @item This function is missing on some platforms: Mac OS X 10.5, FreeBSD 6.0, NetBSD 5.0, OpenBSD 3.8, Minix 3.1.8, AIX 5.1, HP-UX 11, IRIX 6.5, Solaris 11.3, Cygwin 1.5.x, mingw, MSVC 14. @end itemize -Portability problems fixed by Gnulib module @code{vdprintf-posix}: +Portability problems fixed by either Gnulib module @code{vdprintf-posix} or @code{vdprintf-gnu}: @itemize @item printf @code{"%f"}, @code{"%e"}, @code{"%g"} of Infinity and NaN yields an @@ -50,6 +50,13 @@ glibc 2.35, 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{vdprintf-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 not fixed by Gnulib: @itemize @item diff --git a/m4/vdprintf-gnu.m4 b/m4/vdprintf-gnu.m4 new file mode 100644 index 0000000000..09cec803b2 --- /dev/null +++ b/m4/vdprintf-gnu.m4 @@ -0,0 +1,25 @@ +# vdprintf-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_VDPRINTF_GNU], +[ + AC_REQUIRE([gl_FUNC_VDPRINTF_IS_POSIX]) + AC_REQUIRE([gl_PRINTF_DIRECTIVE_UPPERCASE_B]) + gl_cv_func_vdprintf_gnu=no + if test $gl_cv_func_vdprintf_posix = yes; then + case "$gl_cv_func_printf_directive_uppercase_b" in + *yes) + # vdprintf exists and is already POSIX compliant and GNU compatible. + gl_cv_func_vdprintf_gnu=yes + ;; + esac + fi + if test $gl_cv_func_vdprintf_gnu = no; then + gl_PREREQ_VASNPRINTF_WITH_GNU_EXTRAS + gl_REPLACE_VASNPRINTF + gl_REPLACE_VDPRINTF + fi +]) diff --git a/m4/vdprintf-posix.m4 b/m4/vdprintf-posix.m4 index ff74fdaab4..01664d4a52 100644 --- a/m4/vdprintf-posix.m4 +++ b/m4/vdprintf-posix.m4 @@ -1,10 +1,22 @@ -# vdprintf-posix.m4 serial 5 +# vdprintf-posix.m4 serial 6 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_VDPRINTF_POSIX], +[ + AC_REQUIRE([gl_FUNC_VDPRINTF_IS_POSIX]) + if test $gl_cv_func_vdprintf_posix = no; then + gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS + gl_REPLACE_VASNPRINTF + gl_REPLACE_VDPRINTF + fi +]) + +dnl Test whether vdprintf exists and is POSIX compliant. +dnl Result is gl_cv_func_vdprintf_posix. +AC_DEFUN([gl_FUNC_VDPRINTF_IS_POSIX], [ AC_REQUIRE([gl_PRINTF_SIZES_C99]) AC_REQUIRE([gl_PRINTF_LONG_DOUBLE]) @@ -93,21 +105,4 @@ AC_DEFUN([gl_FUNC_VDPRINTF_POSIX] ;; esac fi - if test $gl_cv_func_vdprintf_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_VDPRINTF - fi ]) diff --git a/modules/vdprintf-gnu b/modules/vdprintf-gnu new file mode 100644 index 0000000000..b7bbb74fbe --- /dev/null +++ b/modules/vdprintf-gnu @@ -0,0 +1,29 @@ +Description: +POSIX and GNU compatible vdprintf() function: print formatted output to a file +descriptor + +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/vdprintf-gnu.m4 + +Depends-on: +vdprintf-posix + +configure.ac: +gl_FUNC_VDPRINTF_GNU + +Makefile.am: + +Include: + + +License: +LGPL + +Maintainer: +all -- 2.34.1