From bd7cc50d498bc0dcf403af437accdc82dea5f587 Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@draconx.ca>
Date: Tue, 13 Jun 2023 02:14:44 -0400
Subject: [PATCH] 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).
---
 bootstrap          | 4 ++--
 m4/.gitignore      | 1 +
 m4/gnulib-cache.m4 | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bootstrap b/bootstrap
index 5acafcb..8b6bf0b 100755
--- 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 6cf6b45..37b4b19 100644
--- 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 b01b510..3d38968 100644
--- 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])
-- 
2.43.2