sprintf-gnu: New module.

* m4/sprintf-posix.m4 (gl_FUNC_SPRINTF_IS_POSIX): New macro,
extracted from gl_FUNC_SPRINTF_POSIX.
(gl_FUNC_SPRINTF_POSIX): Require it. Invoke
gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS.
* m4/sprintf-gnu.m4: New file, based on m4/sprintf-posix.m4.
* modules/sprintf-gnu: New file, based on modules/vasnprintf-gnu.
* doc/posix-functions/sprintf.texi: Mention the new module.

5 files changed, 86 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index 385e6c4f17..4656a575ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2023-03-24  Bruno Haible  <bruno@clisp.org>
 
+	sprintf-gnu: New module.
+	* m4/sprintf-posix.m4 (gl_FUNC_SPRINTF_IS_POSIX): New macro,
+	extracted from gl_FUNC_SPRINTF_POSIX.
+	(gl_FUNC_SPRINTF_POSIX): Require it. Invoke
+	gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS.
+	* m4/sprintf-gnu.m4: New file, based on m4/sprintf-posix.m4.
+	* modules/sprintf-gnu: New file, based on modules/vasnprintf-gnu.
+	* doc/posix-functions/sprintf.texi: Mention the new module.
+
+2023-03-24  Bruno Haible  <bruno@clisp.org>
+
 	vsprintf-gnu: Add tests.
 	* tests/test-vsprintf-gnu.c: New file, based on
 	tests/test-vsprintf-posix.c.
diff --git a/doc/posix-functions/sprintf.texi b/doc/posix-functions/sprintf.texi
index 57c42c294d..54816f26ab 100644
--- a/doc/posix-functions/sprintf.texi
+++ b/doc/posix-functions/sprintf.texi
@@ -4,9 +4,9 @@
 
 POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9699919799/functions/sprintf.html}
 
-Gnulib module: sprintf-posix
+Gnulib module: sprintf-posix or sprintf-gnu
 
-Portability problems fixed by Gnulib:
+Portability problems fixed by either Gnulib module @code{sprintf-posix} or @code{sprintf-gnu}:
 @itemize
 @item
 This function does not support size specifiers as in C99 (@code{hh}, @code{ll},
@@ -80,6 +80,13 @@ The compiler warns that this function is deprecated:
 macOS 13.0.
 @end itemize
 
+Portability problems fixed by Gnulib module @code{sprintf-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/sprintf-gnu.m4 b/m4/sprintf-gnu.m4
new file mode 100644
index 0000000000..963cfcf847
--- /dev/null
+++ b/m4/sprintf-gnu.m4
@@ -0,0 +1,25 @@
+# sprintf-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_SPRINTF_GNU],
+[
+  AC_REQUIRE([gl_FUNC_SPRINTF_IS_POSIX])
+  AC_REQUIRE([gl_PRINTF_DIRECTIVE_UPPERCASE_B])
+  gl_cv_func_sprintf_gnu=no
+  if test $gl_cv_func_sprintf_posix = yes; then
+    case "$gl_cv_func_printf_directive_uppercase_b" in
+      *yes)
+        # sprintf is already POSIX compliant and GNU compatible.
+        gl_cv_func_sprintf_gnu=yes
+        ;;
+    esac
+  fi
+  if test $gl_cv_func_sprintf_gnu = no; then
+    gl_PREREQ_VASNPRINTF_WITH_GNU_EXTRAS
+    gl_REPLACE_VASNPRINTF
+    gl_REPLACE_SPRINTF
+  fi
+])
diff --git a/m4/sprintf-posix.m4 b/m4/sprintf-posix.m4
index 96d0e0dacc..fe152d4eff 100644
--- a/m4/sprintf-posix.m4
+++ b/m4/sprintf-posix.m4
@@ -1,4 +1,4 @@
-# sprintf-posix.m4 serial 14
+# sprintf-posix.m4 serial 15
 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,6 +6,18 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_SPRINTF_POSIX],
 [
+  AC_REQUIRE([gl_FUNC_SPRINTF_IS_POSIX])
+  if test $gl_cv_func_sprintf_posix = no; then
+    gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS
+    gl_REPLACE_VASNPRINTF
+    gl_REPLACE_SPRINTF
+  fi
+])
+
+dnl Test whether sprintf is POSIX compliant.
+dnl Result is gl_cv_func_sprintf_posix.
+AC_DEFUN([gl_FUNC_SPRINTF_IS_POSIX],
+[
   AC_REQUIRE([gl_PRINTF_SIZES_C99])
   AC_REQUIRE([gl_PRINTF_LONG_DOUBLE])
   AC_REQUIRE([gl_PRINTF_INFINITE])
@@ -90,23 +102,6 @@ AC_DEFUN([gl_FUNC_SPRINTF_POSIX],
       esac
       ;;
   esac
-  if test $gl_cv_func_sprintf_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_SPRINTF
-  fi
 ])
 
 AC_DEFUN([gl_REPLACE_SPRINTF],
diff --git a/modules/sprintf-gnu b/modules/sprintf-gnu
new file mode 100644
index 0000000000..87daff3832
--- /dev/null
+++ b/modules/sprintf-gnu
@@ -0,0 +1,28 @@
+Description:
+POSIX and GNU compatible sprintf() function: print formatted output to a 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/sprintf-gnu.m4
+
+Depends-on:
+sprintf-posix
+
+configure.ac:
+gl_FUNC_SPRINTF_GNU
+
+Makefile.am:
+
+Include:
+<stdio.h>
+
+License:
+LGPL
+
+Maintainer:
+all