From: Bruno Haible Date: Fri, 24 Mar 2023 11:11:52 +0000 (+0100) Subject: obstack-printf-gnu: New module. X-Git-Tag: v1.0~1575 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=7e73cf31ed32c3931a7f85cb863432d72e8af95f;p=gnulib.git obstack-printf-gnu: New module. * m4/obstack-printf-posix.m4 (gl_FUNC_OBSTACK_PRINTF_IS_POSIX): New macro, extracted from gl_FUNC_OBSTACK_PRINTF_POSIX. (gl_FUNC_OBSTACK_PRINTF_POSIX): Require it. Invoke gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS. * m4/obstack-printf-gnu.m4: New file, based on m4/obstack-printf-posix.m4. * modules/obstack-printf-gnu: New file, based on modules/vasnprintf-gnu. * doc/glibc-functions/obstack_printf.texi: Mention the new module. * doc/glibc-functions/obstack_vprintf.texi: Likewise. --- diff --git a/ChangeLog b/ChangeLog index bb0463cba7..8c1abcf037 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2023-03-24 Bruno Haible + + obstack-printf-gnu: New module. + * m4/obstack-printf-posix.m4 (gl_FUNC_OBSTACK_PRINTF_IS_POSIX): New + macro, extracted from gl_FUNC_OBSTACK_PRINTF_POSIX. + (gl_FUNC_OBSTACK_PRINTF_POSIX): Require it. Invoke + gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS. + * m4/obstack-printf-gnu.m4: New file, based on + m4/obstack-printf-posix.m4. + * modules/obstack-printf-gnu: New file, based on modules/vasnprintf-gnu. + * doc/glibc-functions/obstack_printf.texi: Mention the new module. + * doc/glibc-functions/obstack_vprintf.texi: Likewise. + 2023-03-24 Bruno Haible dprintf-gnu: Add tests. diff --git a/doc/glibc-functions/obstack_printf.texi b/doc/glibc-functions/obstack_printf.texi index 8b13e1296e..18d82a903c 100644 --- a/doc/glibc-functions/obstack_printf.texi +++ b/doc/glibc-functions/obstack_printf.texi @@ -10,17 +10,17 @@ Documentation:@* @url{https://www.gnu.org/software/libc/manual/html_node/Dynamic-Output.html}. @end ifnotinfo -Gnulib module: obstack-printf or obstack-printf-posix +Gnulib module: obstack-printf or obstack-printf-posix or obstack-printf-gnu Portability problems fixed by either Gnulib module -@code{obstack-printf} or @code{obstack-printf-posix}: +@code{obstack-printf} or @code{obstack-printf-posix} or @code{obstack-printf-gnu}: @itemize @item This function is missing on all non-glibc platforms: macOS 11.1, FreeBSD 13.0, NetBSD 9.0, OpenBSD 6.7, Minix 3.1.8, AIX 5.1, HP-UX 11, IRIX 6.5, Solaris 11.4, Cygwin 2.9, mingw, MSVC 14, Android 9.0. @end itemize -Portability problems fixed by Gnulib module @code{obstack-printf-posix}: +Portability problems fixed by either Gnulib module @code{obstack-printf-posix} or @code{obstack-printf-gnu}: @itemize @item This function does not support size specifiers as in C99 (@code{hh}, @code{ll}, @@ -88,6 +88,13 @@ This function does not fully support the @samp{n} directive on some platforms: HP-UX 11, mingw, MSVC 14. @end itemize +Portability problems fixed by Gnulib module @code{obstack-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 not fixed by Gnulib: @itemize @item diff --git a/doc/glibc-functions/obstack_vprintf.texi b/doc/glibc-functions/obstack_vprintf.texi index 2ea59ef4fa..6d7ba77b30 100644 --- a/doc/glibc-functions/obstack_vprintf.texi +++ b/doc/glibc-functions/obstack_vprintf.texi @@ -10,17 +10,17 @@ Documentation:@* @url{https://www.gnu.org/software/libc/manual/html_node/Variable-Arguments-Output.html}. @end ifnotinfo -Gnulib module: obstack-printf or obstack-printf-posix +Gnulib module: obstack-printf or obstack-printf-posix or obstack-printf-gnu Portability problems fixed by either Gnulib module -@code{obstack-printf} or @code{obstack-printf-posix}: +@code{obstack-printf} or @code{obstack-printf-posix} or @code{obstack-printf-gnu}: @itemize @item This function is missing on all non-glibc platforms: macOS 11.1, FreeBSD 13.0, NetBSD 9.0, OpenBSD 6.7, Minix 3.1.8, AIX 5.1, HP-UX 11, IRIX 6.5, Solaris 11.4, Cygwin 2.9, mingw, MSVC 14, Android 9.0. @end itemize -Portability problems fixed by Gnulib module @code{obstack-printf-posix}: +Portability problems fixed by either Gnulib module @code{obstack-printf-posix} or @code{obstack-printf-gnu}: @itemize @item This function does not support size specifiers as in C99 (@code{hh}, @code{ll}, @@ -88,6 +88,13 @@ This function does not fully support the @samp{n} directive on some platforms: HP-UX 11, mingw, MSVC 14. @end itemize +Portability problems fixed by Gnulib module @code{obstack-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 not fixed by Gnulib: @itemize @item diff --git a/m4/obstack-printf-gnu.m4 b/m4/obstack-printf-gnu.m4 new file mode 100644 index 0000000000..9a722ee05f --- /dev/null +++ b/m4/obstack-printf-gnu.m4 @@ -0,0 +1,26 @@ +# obstack-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_OBSTACK_PRINTF_GNU], +[ + AC_REQUIRE([gl_FUNC_OBSTACK_PRINTF_IS_POSIX]) + AC_REQUIRE([gl_PRINTF_DIRECTIVE_UPPERCASE_B]) + gl_cv_func_obstack_printf_gnu=no + if test $gl_cv_func_obstack_printf_posix = yes; then + case "$gl_cv_func_printf_directive_uppercase_b" in + *yes) + # obstack_printf exists and is already POSIX compliant and GNU compatible. + gl_cv_func_obstack_printf_gnu=yes + ;; + esac + fi + if test $gl_cv_func_obstack_printf_gnu = no; then + gl_PREREQ_VASNPRINTF_WITH_GNU_EXTRAS + gl_REPLACE_VASNPRINTF + gl_REPLACE_OBSTACK_PRINTF + fi + gl_DECL_OBSTACK_PRINTF +]) diff --git a/m4/obstack-printf-posix.m4 b/m4/obstack-printf-posix.m4 index 8092119906..751d6759cf 100644 --- a/m4/obstack-printf-posix.m4 +++ b/m4/obstack-printf-posix.m4 @@ -1,10 +1,23 @@ -# obstack-printf-posix.m4 serial 6 +# obstack-printf-posix.m4 serial 7 dnl Copyright (C) 2008-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_OBSTACK_PRINTF_POSIX], +[ + AC_REQUIRE([gl_FUNC_OBSTACK_PRINTF_IS_POSIX]) + if test $gl_cv_func_obstack_printf_posix = no; then + gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS + gl_REPLACE_VASNPRINTF + gl_REPLACE_OBSTACK_PRINTF + fi + gl_DECL_OBSTACK_PRINTF +]) + +dnl Test whether obstack_printf exists and is POSIX compliant. +dnl Result is gl_cv_func_obstack_printf_posix. +AC_DEFUN([gl_FUNC_OBSTACK_PRINTF_IS_POSIX], [ dnl Persuade glibc to declare obstack_printf(), obstack_vprintf(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) @@ -96,22 +109,4 @@ AC_DEFUN([gl_FUNC_OBSTACK_PRINTF_POSIX], ;; esac fi - if test $gl_cv_func_obstack_printf_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_OBSTACK_PRINTF - fi - gl_DECL_OBSTACK_PRINTF ]) diff --git a/modules/obstack-printf-gnu b/modules/obstack-printf-gnu new file mode 100644 index 0000000000..c6538ba701 --- /dev/null +++ b/modules/obstack-printf-gnu @@ -0,0 +1,31 @@ +Description: +POSIX and GNU compatible formatted printing into an obstack. + +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/obstack-printf-gnu.m4 + +Depends-on: +obstack-printf-posix + +configure.ac: +gl_FUNC_OBSTACK_PRINTF_GNU +if test $ac_cv_func_obstack_printf = no || test $REPLACE_OBSTACK_PRINTF = 1; then + AC_LIBOBJ([obstack_printf]) +fi + +Makefile.am: + +Include: + + +License: +GPL + +Maintainer: +Eric Blake