>From 1d4cd9aec717ac8f914fcdb6e1c997dffde6a079 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 24 Mar 2023 11:05:38 +0100 Subject: [PATCH 04/31] vsnprintf-gnu: New module. * m4/vsnprintf-posix.m4 (gl_FUNC_VSNPRINTF_IS_POSIX): New macro, extracted from gl_FUNC_VSNPRINTF_POSIX. (gl_FUNC_VSNPRINTF_POSIX): Require it. Invoke gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS. * m4/vsnprintf-gnu.m4: New file, based on m4/vsnprintf-posix.m4. * modules/vsnprintf-gnu: New file, based on modules/vasnprintf-gnu. * doc/posix-functions/vsnprintf.texi: Mention the new module. --- ChangeLog | 11 +++++++++++ doc/posix-functions/vsnprintf.texi | 13 ++++++++++--- m4/vsnprintf-gnu.m4 | 25 ++++++++++++++++++++++++ m4/vsnprintf-posix.m4 | 31 +++++++++++++----------------- modules/vsnprintf-gnu | 29 ++++++++++++++++++++++++++++ 5 files changed, 88 insertions(+), 21 deletions(-) create mode 100644 m4/vsnprintf-gnu.m4 create mode 100644 modules/vsnprintf-gnu diff --git a/ChangeLog b/ChangeLog index cd2f17b2f9..e152b9cd55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2023-03-24 Bruno Haible + + vsnprintf-gnu: New module. + * m4/vsnprintf-posix.m4 (gl_FUNC_VSNPRINTF_IS_POSIX): New macro, + extracted from gl_FUNC_VSNPRINTF_POSIX. + (gl_FUNC_VSNPRINTF_POSIX): Require it. Invoke + gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS. + * m4/vsnprintf-gnu.m4: New file, based on m4/vsnprintf-posix.m4. + * modules/vsnprintf-gnu: New file, based on modules/vasnprintf-gnu. + * doc/posix-functions/vsnprintf.texi: Mention the new module. + 2023-03-23 Bruno Haible vasnprintf-gnu: Add tests. diff --git a/doc/posix-functions/vsnprintf.texi b/doc/posix-functions/vsnprintf.texi index 3531644660..e99292f178 100644 --- a/doc/posix-functions/vsnprintf.texi +++ b/doc/posix-functions/vsnprintf.texi @@ -4,9 +4,9 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9699919799/functions/vsnprintf.html} -Gnulib module: vsnprintf or vsnprintf-posix +Gnulib module: vsnprintf or vsnprintf-posix or vsnprintf-gnu -Portability problems fixed by either Gnulib module @code{vsnprintf} or @code{vsnprintf-posix}: +Portability problems fixed by either Gnulib module @code{vsnprintf} or @code{vsnprintf-posix} or @code{vsnprintf-gnu}: @itemize @item This function does not support format directives that access arguments in an @@ -18,7 +18,7 @@ HP-UX 11, IRIX 6.5, Solaris 9, mingw, MSVC 14. @end itemize -Portability problems fixed by Gnulib module @code{vsnprintf-posix}: +Portability problems fixed by either Gnulib module @code{vsnprintf-posix} or @code{vsnprintf-gnu}: @itemize @item This function does not support size specifiers as in C99 (@code{hh}, @code{ll}, @@ -92,6 +92,13 @@ HP-UX 11. @end itemize +Portability problems fixed by Gnulib module @code{vsnprintf-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/vsnprintf-gnu.m4 b/m4/vsnprintf-gnu.m4 new file mode 100644 index 0000000000..98098b52d9 --- /dev/null +++ b/m4/vsnprintf-gnu.m4 @@ -0,0 +1,25 @@ +# vsnprintf-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_VSNPRINTF_GNU], +[ + AC_REQUIRE([gl_FUNC_VSNPRINTF_IS_POSIX]) + AC_REQUIRE([gl_PRINTF_DIRECTIVE_UPPERCASE_B]) + gl_cv_func_vsnprintf_gnu=no + if test $gl_cv_func_vsnprintf_posix = yes; then + case "$gl_cv_func_printf_directive_uppercase_b" in + *yes) + # vsnprintf exists and is already POSIX compliant and GNU compatible. + gl_cv_func_vsnprintf_gnu=yes + ;; + esac + fi + if test $gl_cv_func_vsnprintf_gnu = no; then + gl_PREREQ_VASNPRINTF_WITH_GNU_EXTRAS + gl_REPLACE_VASNPRINTF + gl_REPLACE_VSNPRINTF + fi +]) diff --git a/m4/vsnprintf-posix.m4 b/m4/vsnprintf-posix.m4 index d1e1933aa3..d65ca929a3 100644 --- a/m4/vsnprintf-posix.m4 +++ b/m4/vsnprintf-posix.m4 @@ -1,10 +1,22 @@ -# vsnprintf-posix.m4 serial 17 +# vsnprintf-posix.m4 serial 18 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_VSNPRINTF_POSIX], +[ + AC_REQUIRE([gl_FUNC_VSNPRINTF_IS_POSIX]) + if test $gl_cv_func_vsnprintf_posix = no; then + gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS + gl_REPLACE_VASNPRINTF + gl_REPLACE_VSNPRINTF + fi +]) + +dnl Test whether vsnprintf exists and is POSIX compliant. +dnl Result is gl_cv_func_vsnprintf_posix. +AC_DEFUN([gl_FUNC_VSNPRINTF_IS_POSIX], [ AC_REQUIRE([gl_PRINTF_SIZES_C99]) AC_REQUIRE([gl_PRINTF_LONG_DOUBLE]) @@ -119,21 +131,4 @@ AC_DEFUN([gl_FUNC_VSNPRINTF_POSIX] ;; esac fi - if test $gl_cv_func_vsnprintf_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_VSNPRINTF - fi ]) diff --git a/modules/vsnprintf-gnu b/modules/vsnprintf-gnu new file mode 100644 index 0000000000..36c4cbd586 --- /dev/null +++ b/modules/vsnprintf-gnu @@ -0,0 +1,29 @@ +Description: +POSIX and GNU compatible vsnprintf() function: print formatted output to +a fixed length string + +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/vsnprintf-gnu.m4 + +Depends-on: +vsnprintf-posix + +configure.ac: +gl_FUNC_VSNPRINTF_GNU + +Makefile.am: + +Include: + + +License: +LGPL + +Maintainer: +all -- 2.34.1