Use gnulib's vsnprintf module.

The snprintf module provides only snprintf, not vsnprintf.  As we
currently depend on both functions in the library, it is necessary
to use both modules.

This fixes failures in the new cdeclerr test on HP-UX 11, which has
vsnprintf but it is not entirely C99-like (wrong return value).

diff --git a/bootstrap b/bootstrap
index 5acafcb0849ea1abd3c6d4ffe5f0b9f87a4e1aea..8b6bf0b6a02d61e864bb0488b6a553ef7dd0f0e4 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright © 2011-2012, 2021-2022 Nick Bowler
+# Copyright © 2011-2012, 2021-2023 Nick Bowler
 #
 # Simple script to get started from a fresh git checkout.
 #
@@ -33,7 +33,7 @@ if test -x $GNULIB/gnulib-tool; then
   exec 3>lib/symfiles.tmp 4<lib/symfiles.tmp
   rm -f lib/symfiles.tmp
 
-  shared_modules='lock tls flexmember snprintf'
+  shared_modules='lock tls snprintf vsnprintf'
   set x --extract-recursive-dependencies $shared_modules; shift
   (set -x; $GNULIB/gnulib-tool "$@" >&3 ) || die "gnulib-tool failed"
   shared_modules=`LC_ALL=C sort -u <&4`

diff --git a/m4/.gitignore b/m4/.gitignore
index 6cf6b45ab886ce4bf18c3c673977573aab5d05bd..37b4b199c5d7ac99cb6b90652d3179b83ff95bf4 100644 (file)
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -78,6 +78,7 @@
 /unistd_h.m4
 /vasnprintf.m4
 /visibility.m4
+/vsnprintf.m4
 /warn-on-use.m4
 /wchar_h.m4
 /wchar_t.m4

diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index b01b510061691931204921c373324f84ca5fdca2..3d38968a8cd557e9d0eaf523dd078b15174a09d0 100644 (file)
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -51,7 +51,8 @@
 #  mbswidth \
 #  readline \
 #  snprintf \
-#  tls
+#  tls \
+#  vsnprintf
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
@@ -67,6 +68,7 @@ gl_MODULES([
   readline
   snprintf
   tls
+  vsnprintf
 ])
 gl_AVOID([gperf std-gnu11])
 gl_SOURCE_BASE([lib])