c-vasnprintf has a long-standing bug: When I add a unit test for it, it leads
to link errors:
/usr/bin/ld: ../gllib/libgnu.a(c-vasnprintf.o): in function `c_vasnprintf':
/GNULIB/testdir2/build-64/gllib/../../gllib/vasnprintf.c:2246: undefined
reference to `printf_parse'
/usr/bin/ld: /GNULIB/testdir2/build-64/gllib/../../gllib/vasnprintf.c:2257:
undefined reference to `printf_fetchargs'
collect2: error: ld returned 1 exit status
make[3]: *** [Makefile:3610: test-c-vasnprintf] Error 1
These two patches fix the bug and add the unit test. Will push once savannah
is up again.
2024-06-25 Bruno Haible <br...@clisp.org>
c-vasnprintf: Add tests.
* tests/test-c-vasnprintf.c: New file, based on tests/test-c-snprintf.c.
* tests/test-c-vasnprintf.sh: New file, based on
tests/test-c-snprintf.sh.
* modules/c-vasnprintf-tests: New file.
2024-06-25 Bruno Haible <br...@clisp.org>
c-vasnprintf: Fix link errors.
* modules/c-vasnprintf (configure.ac): Ensure printf-args.c and
printf-parse.c get compiled. Invoke gl_PREREQ_PRINTF_ARGS,
gl_PREREQ_PRINTF_PARSE.
>From 82791096e9320f4fbf0390f7fa7e06e49b4c9672 Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Tue, 25 Jun 2024 19:35:20 +0200
Subject: [PATCH 1/2] c-vasnprintf: Fix link errors.
* modules/c-vasnprintf (configure.ac): Ensure printf-args.c and
printf-parse.c get compiled. Invoke gl_PREREQ_PRINTF_ARGS,
gl_PREREQ_PRINTF_PARSE.
---
ChangeLog | 7 +++++++
modules/c-vasnprintf | 4 ++++
2 files changed, 11 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 48274cadbf..f97591d3f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-06-25 Bruno Haible <br...@clisp.org>
+
+ c-vasnprintf: Fix link errors.
+ * modules/c-vasnprintf (configure.ac): Ensure printf-args.c and
+ printf-parse.c get compiled. Invoke gl_PREREQ_PRINTF_ARGS,
+ gl_PREREQ_PRINTF_PARSE.
+
2024-06-25 Bruno Haible <br...@clisp.org>
obstack-zprintf-gnu: Add tests.
diff --git a/modules/c-vasnprintf b/modules/c-vasnprintf
index ab48d64310..53c7babe84 100644
--- a/modules/c-vasnprintf
+++ b/modules/c-vasnprintf
@@ -39,6 +39,10 @@ mbszero
configure.ac:
AC_REQUIRE([AC_C_RESTRICT])
+AC_LIBOBJ([printf-args])
+AC_LIBOBJ([printf-parse])
+gl_PREREQ_PRINTF_ARGS
+gl_PREREQ_PRINTF_PARSE
gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS
Makefile.am:
--
2.34.1
>From d2267879157bb4817fcf2eeeda4797b6f0c31d58 Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Tue, 25 Jun 2024 19:27:42 +0200
Subject: [PATCH 2/2] c-vasnprintf: Add tests.
* tests/test-c-vasnprintf.c: New file, based on tests/test-c-snprintf.c.
* tests/test-c-vasnprintf.sh: New file, based on
tests/test-c-snprintf.sh.
* modules/c-vasnprintf-tests: New file.
---
ChangeLog | 8 ++++++
modules/c-vasnprintf-tests | 18 ++++++++++++
tests/test-c-vasnprintf.c | 57 ++++++++++++++++++++++++++++++++++++++
tests/test-c-vasnprintf.sh | 15 ++++++++++
4 files changed, 98 insertions(+)
create mode 100644 modules/c-vasnprintf-tests
create mode 100644 tests/test-c-vasnprintf.c
create mode 100755 tests/test-c-vasnprintf.sh
diff --git a/ChangeLog b/ChangeLog
index f97591d3f3..12be34ac2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2024-06-25 Bruno Haible <br...@clisp.org>
+
+ c-vasnprintf: Add tests.
+ * tests/test-c-vasnprintf.c: New file, based on tests/test-c-snprintf.c.
+ * tests/test-c-vasnprintf.sh: New file, based on
+ tests/test-c-snprintf.sh.
+ * modules/c-vasnprintf-tests: New file.
+
2024-06-25 Bruno Haible <br...@clisp.org>
c-vasnprintf: Fix link errors.
diff --git a/modules/c-vasnprintf-tests b/modules/c-vasnprintf-tests
new file mode 100644
index 0000000000..8837f3c185
--- /dev/null
+++ b/modules/c-vasnprintf-tests
@@ -0,0 +1,18 @@
+Files:
+tests/test-c-vasnprintf.c
+tests/test-c-vasnprintf.sh
+tests/macros.h
+m4/locale-fr.m4
+m4/codeset.m4
+
+Depends-on:
+setlocale
+
+configure.ac:
+gt_LOCALE_FR
+
+Makefile.am:
+TESTS += test-c-vasnprintf.sh
+TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
+check_PROGRAMS += test-c-vasnprintf
+test_c_vasnprintf_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/tests/test-c-vasnprintf.c b/tests/test-c-vasnprintf.c
new file mode 100644
index 0000000000..3ac92c2408
--- /dev/null
+++ b/tests/test-c-vasnprintf.c
@@ -0,0 +1,57 @@
+/* Test of c_vasnprintf() function.
+ Copyright (C) 2011-2024 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>. */
+
+#include <config.h>
+
+#include "c-vasnprintf.h"
+
+#include <locale.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "macros.h"
+
+static char *
+my_c_asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...)
+{
+ va_list args;
+ char *ret;
+
+ va_start (args, format);
+ ret = c_vasnprintf (resultbuf, lengthp, format, args);
+ va_end (args);
+ return ret;
+}
+
+int
+main (int argc, char *argv[])
+{
+ /* configure should already have checked that the locale is supported. */
+ if (setlocale (LC_ALL, "") == NULL)
+ return 1;
+
+ /* Test behaviour of c_vasnprintf().
+ It should always use '.' as the decimal point. */
+ {
+ char buf[16];
+ size_t length = sizeof (buf);
+ char *result = my_c_asnprintf (buf, &length, "%#.0f", 1.0);
+ ASSERT (result == buf);
+ ASSERT (strcmp (result, "1.") == 0);
+ }
+
+ return test_exit_status;
+}
diff --git a/tests/test-c-vasnprintf.sh b/tests/test-c-vasnprintf.sh
new file mode 100755
index 0000000000..69e73c7fdf
--- /dev/null
+++ b/tests/test-c-vasnprintf.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Test in an ISO-8859-1 or ISO-8859-15 locale.
+: "${LOCALE_FR=fr_FR}"
+if test $LOCALE_FR = none; then
+ if test -f /usr/bin/localedef; then
+ echo "Skipping test: no traditional french locale is installed"
+ else
+ echo "Skipping test: no traditional french locale is supported"
+ fi
+ exit 77
+fi
+
+LC_ALL=$LOCALE_FR \
+${CHECKER} ./test-c-vasnprintf${EXEEXT} 1
--
2.34.1
