summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2023-03-24 11:46:24 +0100
committerBruno Haible <bruno@clisp.org>2023-03-24 11:46:24 +0100
commit9b58230c21b08eec75539978269668e0213f4608 (patch)
tree6640ceedec687dbe38cfaf2244acdefa98e45f83
parentd00bce3996ec46b0c4ad1690c1d153b9101d2239 (diff)
downloadgnulib-9b58230c21b08eec75539978269668e0213f4608.tar.gz
vprintf-gnu: New module.
* m4/vprintf-posix.m4 (gl_FUNC_VPRINTF_IS_POSIX): New macro. (gl_FUNC_VPRINTF_POSIX): Require it. Don't require gl_FUNC_VFPRINTF_POSIX. Invoke gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS and gl_REPLACE_VASNPRINTF. * m4/vprintf-gnu.m4: New file, based on m4/vfprintf-posix.m4. * modules/vprintf-gnu: New file, based on modules/vasnprintf-gnu. * doc/posix-functions/vprintf.texi: Mention the new module.
-rw-r--r--ChangeLog11
-rw-r--r--doc/posix-functions/vprintf.texi15
-rw-r--r--m4/vprintf-gnu.m425
-rw-r--r--m4/vprintf-posix.m416
-rw-r--r--modules/vprintf-gnu29
5 files changed, 89 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 54de6d019e..8b6d0f41ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2023-03-24 Bruno Haible <bruno@clisp.org>
+ vprintf-gnu: New module.
+ * m4/vprintf-posix.m4 (gl_FUNC_VPRINTF_IS_POSIX): New macro.
+ (gl_FUNC_VPRINTF_POSIX): Require it. Don't require
+ gl_FUNC_VFPRINTF_POSIX. Invoke gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS
+ and gl_REPLACE_VASNPRINTF.
+ * m4/vprintf-gnu.m4: New file, based on m4/vfprintf-posix.m4.
+ * modules/vprintf-gnu: New file, based on modules/vasnprintf-gnu.
+ * doc/posix-functions/vprintf.texi: Mention the new module.
+
+2023-03-24 Bruno Haible <bruno@clisp.org>
+
fprintf-gnu: Add tests.
* tests/test-fprintf-gnu.sh: New file, based on
tests/test-fprintf-posix.sh.
diff --git a/doc/posix-functions/vprintf.texi b/doc/posix-functions/vprintf.texi
index 8272e50fd9..051aef880d 100644
--- a/doc/posix-functions/vprintf.texi
+++ b/doc/posix-functions/vprintf.texi
@@ -4,9 +4,9 @@
POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9699919799/functions/vprintf.html}
-Gnulib module: vprintf-posix or stdio, nonblocking, sigpipe
+Gnulib module: vprintf-posix or vprintf-gnu or stdio, nonblocking, sigpipe
-Portability problems fixed by Gnulib module @code{vprintf-posix}:
+Portability problems fixed by either Gnulib module @code{vprintf-posix} or @code{vprintf-gnu}:
@itemize
@item
This function does not support size specifiers as in C99 (@code{hh}, @code{ll},
@@ -77,7 +77,14 @@ This function can crash in out-of-memory conditions on some platforms:
FreeBSD 13.0, NetBSD 5.0.
@end itemize
-Portability problems fixed by Gnulib module @code{stdio} or @code{vprintf-posix}, together with module @code{nonblocking}:
+Portability problems fixed by Gnulib module @code{vprintf-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{vprintf-posix} or @code{vprintf-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 @@ platforms:
mingw, MSVC 14.
@end itemize
-Portability problems fixed by Gnulib module @code{stdio} or @code{vprintf-posix}, together with module @code{sigpipe}:
+Portability problems fixed by Gnulib module @code{stdio} or @code{vprintf-posix} or @code{vprintf-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/vprintf-gnu.m4 b/m4/vprintf-gnu.m4
new file mode 100644
index 0000000000..4e30a77712
--- /dev/null
+++ b/m4/vprintf-gnu.m4
@@ -0,0 +1,25 @@
+# vprintf-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_VPRINTF_GNU],
+[
+ AC_REQUIRE([gl_FUNC_VPRINTF_IS_POSIX])
+ AC_REQUIRE([gl_PRINTF_DIRECTIVE_UPPERCASE_B])
+ gl_cv_func_vprintf_gnu=no
+ if test $gl_cv_func_vprintf_posix = yes; then
+ case "$gl_cv_func_printf_directive_uppercase_b" in
+ *yes)
+ # vprintf exists and is already POSIX compliant and GNU compatible.
+ gl_cv_func_vprintf_gnu=yes
+ ;;
+ esac
+ fi
+ if test $gl_cv_func_vprintf_gnu = no; then
+ gl_PREREQ_VASNPRINTF_WITH_GNU_EXTRAS
+ gl_REPLACE_VASNPRINTF
+ gl_REPLACE_VPRINTF
+ fi
+])
diff --git a/m4/vprintf-posix.m4 b/m4/vprintf-posix.m4
index b25d326bf8..9161c70f90 100644
--- a/m4/vprintf-posix.m4
+++ b/m4/vprintf-posix.m4
@@ -1,4 +1,4 @@
-# vprintf-posix.m4 serial 3
+# vprintf-posix.m4 serial 4
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 @@ dnl with or without modifications, as long as this notice is preserved.
AC_DEFUN([gl_FUNC_VPRINTF_POSIX],
[
- AC_REQUIRE([gl_FUNC_VFPRINTF_POSIX])
- if test $gl_cv_func_vfprintf_posix = no; then
+ AC_REQUIRE([gl_FUNC_VPRINTF_IS_POSIX])
+ if test $gl_cv_func_vprintf_posix = no; then
+ gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS
+ gl_REPLACE_VASNPRINTF
gl_REPLACE_VPRINTF
fi
])
+dnl Test whether vprintf is POSIX compliant.
+dnl Result is gl_cv_func_vprintf_posix.
+AC_DEFUN([gl_FUNC_VPRINTF_IS_POSIX],
+[
+ AC_REQUIRE([gl_FUNC_VFPRINTF_IS_POSIX])
+ gl_cv_func_vprintf_posix="$gl_cv_func_vfprintf_posix"
+])
+
AC_DEFUN([gl_REPLACE_VPRINTF],
[
AC_REQUIRE([gl_STDIO_H_DEFAULTS])
diff --git a/modules/vprintf-gnu b/modules/vprintf-gnu
new file mode 100644
index 0000000000..0fbefc85ba
--- /dev/null
+++ b/modules/vprintf-gnu
@@ -0,0 +1,29 @@
+Description:
+POSIX and GNU compatible vprintf() 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/vprintf-gnu.m4
+
+Depends-on:
+vprintf-posix
+
+configure.ac:
+gl_FUNC_VPRINTF_GNU
+
+Makefile.am:
+
+Include:
+<stdio.h>
+
+License:
+LGPL
+
+Maintainer:
+all