>From 171d2a5f80f3d0dc720a291c349486944fd35243 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 24 Mar 2023 11:55:38 +0100 Subject: [PATCH 20/31] printf-gnu: New module. * m4/printf-posix.m4: Renamed from m4/printf-posix-rpl.m4. (gl_FUNC_PRINTF_IS_POSIX): New macro. (gl_FUNC_PRINTF_POSIX): Require it. Don't require gl_FUNC_VFPRINTF_POSIX. Invoke gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS and gl_REPLACE_VASNPRINTF. * m4/printf-gnu.m4: New file, based on m4/fprintf-posix.m4. * modules/printf-posix (Files): Update. * modules/printf-gnu: New file, based on modules/vasnprintf-gnu. * doc/posix-functions/printf.texi: Mention the new module. --- ChangeLog | 13 +++++++++ doc/posix-functions/printf.texi | 15 ++++++++--- m4/printf-gnu.m4 | 25 ++++++++++++++++++ m4/{printf-posix-rpl.m4 => printf-posix.m4} | 16 +++++++++--- modules/printf-gnu | 29 +++++++++++++++++++++ modules/printf-posix | 2 +- 6 files changed, 92 insertions(+), 8 deletions(-) create mode 100644 m4/printf-gnu.m4 rename m4/{printf-posix-rpl.m4 => printf-posix.m4} (61%) create mode 100644 modules/printf-gnu diff --git a/ChangeLog b/ChangeLog index aa826b376a..cbab39bd9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2023-03-24 Bruno Haible + + printf-gnu: New module. + * m4/printf-posix.m4: Renamed from m4/printf-posix-rpl.m4. + (gl_FUNC_PRINTF_IS_POSIX): New macro. + (gl_FUNC_PRINTF_POSIX): Require it. Don't require + gl_FUNC_VFPRINTF_POSIX. Invoke gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS + and gl_REPLACE_VASNPRINTF. + * m4/printf-gnu.m4: New file, based on m4/fprintf-posix.m4. + * modules/printf-posix (Files): Update. + * modules/printf-gnu: New file, based on modules/vasnprintf-gnu. + * doc/posix-functions/printf.texi: Mention the new module. + 2023-03-24 Bruno Haible vprintf-gnu: Add tests. diff --git a/doc/posix-functions/printf.texi b/doc/posix-functions/printf.texi index 8a3971aa30..382873e9e0 100644 --- a/doc/posix-functions/printf.texi +++ b/doc/posix-functions/printf.texi @@ -4,9 +4,9 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9699919799/functions/printf.html} -Gnulib module: printf-posix or stdio, nonblocking, sigpipe +Gnulib module: printf-posix or printf-gnu or stdio, nonblocking, sigpipe -Portability problems fixed by Gnulib module @code{printf-posix}: +Portability problems fixed by either Gnulib module @code{printf-posix} or @code{printf-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{printf-posix}, together with module @code{nonblocking}: +Portability problems fixed by Gnulib module @code{printf-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{printf-posix} or @code{printf-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{printf-posix}, together with module @code{sigpipe}: +Portability problems fixed by Gnulib module @code{stdio} or @code{printf-posix} or @code{printf-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/printf-gnu.m4 b/m4/printf-gnu.m4 new file mode 100644 index 0000000000..4d8f3c70ff --- /dev/null +++ b/m4/printf-gnu.m4 @@ -0,0 +1,25 @@ +# printf-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_PRINTF_GNU], +[ + AC_REQUIRE([gl_FUNC_PRINTF_IS_POSIX]) + AC_REQUIRE([gl_PRINTF_DIRECTIVE_UPPERCASE_B]) + gl_cv_func_printf_gnu=no + if test $gl_cv_func_printf_posix = yes; then + case "$gl_cv_func_printf_directive_uppercase_b" in + *yes) + # printf is already POSIX compliant and GNU compatible. + gl_cv_func_printf_gnu=yes + ;; + esac + fi + if test $gl_cv_func_printf_gnu = no; then + gl_PREREQ_VASNPRINTF_WITH_GNU_EXTRAS + gl_REPLACE_VASNPRINTF + gl_REPLACE_PRINTF + fi +]) diff --git a/m4/printf-posix-rpl.m4 b/m4/printf-posix.m4 similarity index 61% rename from m4/printf-posix-rpl.m4 rename to m4/printf-posix.m4 index 36156d4350..9aebf4002d 100644 --- a/m4/printf-posix-rpl.m4 +++ b/m4/printf-posix.m4 @@ -1,4 +1,4 @@ -# printf-posix-rpl.m4 serial 4 +# printf-posix.m4 serial 5 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, @@ -6,12 +6,22 @@ AC_DEFUN([gl_FUNC_PRINTF_POSIX], [ - AC_REQUIRE([gl_FUNC_VFPRINTF_POSIX]) - if test $gl_cv_func_vfprintf_posix = no; then + AC_REQUIRE([gl_FUNC_PRINTF_IS_POSIX]) + if test $gl_cv_func_printf_posix = no; then + gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS + gl_REPLACE_VASNPRINTF gl_REPLACE_PRINTF fi ]) +dnl Test whether printf is POSIX compliant. +dnl Result is gl_cv_func_printf_posix. +AC_DEFUN([gl_FUNC_PRINTF_IS_POSIX], +[ + AC_REQUIRE([gl_FUNC_VFPRINTF_IS_POSIX]) + gl_cv_func_printf_posix="$gl_cv_func_vfprintf_posix" +]) + AC_DEFUN([gl_REPLACE_PRINTF], [ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) diff --git a/modules/printf-gnu b/modules/printf-gnu new file mode 100644 index 0000000000..f42a18fd5b --- /dev/null +++ b/modules/printf-gnu @@ -0,0 +1,29 @@ +Description: +POSIX and GNU compatible printf() function: print formatted output to +standard output + +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/printf-gnu.m4 + +Depends-on: +printf-posix + +configure.ac: +gl_FUNC_PRINTF_GNU + +Makefile.am: + +Include: + + +License: +LGPL + +Maintainer: +all diff --git a/modules/printf-posix b/modules/printf-posix index 51e2c1ac2a..8ad5c75810 100644 --- a/modules/printf-posix +++ b/modules/printf-posix @@ -9,7 +9,7 @@ that module occurs among the main modules in lib/. Files: lib/printf.c -m4/printf-posix-rpl.m4 +m4/printf-posix.m4 m4/printf.m4 m4/asm-underscore.m4 -- 2.34.1