This set of patches adds -posix variants for the *z*printf-posix modules
that we have so far, along with small unit tests.
2024-06-24 Bruno Haible <br...@clisp.org>
obstack-zprintf-posix: Add tests.
* tests/test-obstack-zprintf-posix.c: New file, based on
tests/test-vazsprintf-posix.c.
* modules/obstack-zprintf-posix-tests: New file.
obstack-zprintf-posix: New module.
* modules/obstack-zprintf-posix: New file.
2024-06-24 Bruno Haible <br...@clisp.org>
vazsprintf-posix: Add tests.
* tests/test-vazsprintf-posix.c: New file, based on
tests/test-zsnprintf-posix.h.
* modules/vazsprintf-posix-tests: New file.
vazsprintf-posix: New module.
* modules/vazsprintf-posix: New file.
2024-06-24 Bruno Haible <br...@clisp.org>
zsprintf-posix: Add tests.
* tests/test-zsprintf-posix.c: New file.
* modules/zsprintf-posix-tests: New file.
zsprintf-posix: New module.
* modules/zsprintf-posix: New file.
2024-06-24 Bruno Haible <br...@clisp.org>
vzsprintf-posix: Add tests.
* tests/test-vzsprintf-posix.c: New file.
* tests/test-zsprintf-posix.h: New file, based on
tests/test-zsnprintf-posix.h.
* modules/vzsprintf-posix-tests: New file.
vzsprintf-posix: New module.
* modules/vzsprintf-posix: New file.
2024-06-24 Bruno Haible <br...@clisp.org>
zsnprintf-posix: Add tests.
* tests/test-zsnprintf-posix.c: New file.
* modules/zsnprintf-posix-tests: New file.
zsnprintf-posix: New module.
* modules/zsnprintf-posix: New file.
2024-06-24 Bruno Haible <br...@clisp.org>
vzsnprintf-posix: Add tests.
* tests/test-vzsnprintf-posix.c: New file.
* tests/test-zsnprintf-posix.h: New file, based on
tests/test-snprintf-posix.h.
* modules/vzsnprintf-posix-tests: New file.
vzsnprintf-posix: New module.
* modules/vzsnprintf-posix: New file.
>From 3b5067e98d78af7c971b4b6fd178092d76aaa611 Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Tue, 25 Jun 2024 01:09:21 +0200
Subject: [PATCH 01/12] vzsnprintf-posix: New module.
* modules/vzsnprintf-posix: New file.
---
ChangeLog | 5 +++++
modules/vzsnprintf-posix | 22 ++++++++++++++++++++++
2 files changed, 27 insertions(+)
create mode 100644 modules/vzsnprintf-posix
diff --git a/ChangeLog b/ChangeLog
index 3162246429..6b7006d2da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-06-24 Bruno Haible <br...@clisp.org>
+
+ vzsnprintf-posix: New module.
+ * modules/vzsnprintf-posix: New file.
+
2024-06-24 Bruno Haible <br...@clisp.org>
Ease maintainability of *printf-gnu modules.
diff --git a/modules/vzsnprintf-posix b/modules/vzsnprintf-posix
new file mode 100644
index 0000000000..e1d30cf54f
--- /dev/null
+++ b/modules/vzsnprintf-posix
@@ -0,0 +1,22 @@
+Description:
+vzsnprintf() function with POSIX compliant format string interpretation
+
+Files:
+
+Depends-on:
+vzsnprintf
+mixin/printf-posix
+
+configure.ac:
+gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS
+
+Makefile.am:
+
+Include:
+<stdio.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all
--
2.34.1
>From ccc053ead71ef63dbcef5d13d603ab0bc762fbc6 Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Tue, 25 Jun 2024 01:09:28 +0200
Subject: [PATCH 02/12] vzsnprintf-posix: Add tests.
* tests/test-vzsnprintf-posix.c: New file.
* tests/test-zsnprintf-posix.h: New file, based on
tests/test-snprintf-posix.h.
* modules/vzsnprintf-posix-tests: New file.
---
ChangeLog | 6 ++
modules/vzsnprintf-posix-tests | 14 +++
tests/test-vzsnprintf-posix.c | 48 +++++++++
tests/test-zsnprintf-posix.h | 183 +++++++++++++++++++++++++++++++++
4 files changed, 251 insertions(+)
create mode 100644 modules/vzsnprintf-posix-tests
create mode 100644 tests/test-vzsnprintf-posix.c
create mode 100644 tests/test-zsnprintf-posix.h
diff --git a/ChangeLog b/ChangeLog
index 6b7006d2da..84abf933b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2024-06-24 Bruno Haible <br...@clisp.org>
+ vzsnprintf-posix: Add tests.
+ * tests/test-vzsnprintf-posix.c: New file.
+ * tests/test-zsnprintf-posix.h: New file, based on
+ tests/test-snprintf-posix.h.
+ * modules/vzsnprintf-posix-tests: New file.
+
vzsnprintf-posix: New module.
* modules/vzsnprintf-posix: New file.
diff --git a/modules/vzsnprintf-posix-tests b/modules/vzsnprintf-posix-tests
new file mode 100644
index 0000000000..58df0a2436
--- /dev/null
+++ b/modules/vzsnprintf-posix-tests
@@ -0,0 +1,14 @@
+Files:
+tests/test-vzsnprintf-posix.c
+tests/test-zsnprintf-posix.h
+tests/infinity.h
+tests/macros.h
+
+Depends-on:
+nan
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-vzsnprintf-posix
+check_PROGRAMS += test-vzsnprintf-posix
diff --git a/tests/test-vzsnprintf-posix.c b/tests/test-vzsnprintf-posix.c
new file mode 100644
index 0000000000..e44b94cafc
--- /dev/null
+++ b/tests/test-vzsnprintf-posix.c
@@ -0,0 +1,48 @@
+/* Test of POSIX compatible vzsnprintf() function.
+ Copyright (C) 2007-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/>. */
+
+/* Written by Bruno Haible <br...@clisp.org>, 2007. */
+
+#include <config.h>
+
+#include <stdio.h>
+
+#include <stdarg.h>
+#include <stddef.h>
+#include <string.h>
+
+#include "macros.h"
+
+#include "test-zsnprintf-posix.h"
+
+static ptrdiff_t
+my_zsnprintf (char *str, size_t size, const char *format, ...)
+{
+ va_list args;
+ ptrdiff_t ret;
+
+ va_start (args, format);
+ ret = vzsnprintf (str, size, format, args);
+ va_end (args);
+ return ret;
+}
+
+int
+main (int argc, char *argv[])
+{
+ test_function (my_zsnprintf);
+ return test_exit_status;
+}
diff --git a/tests/test-zsnprintf-posix.h b/tests/test-zsnprintf-posix.h
new file mode 100644
index 0000000000..64639d4f17
--- /dev/null
+++ b/tests/test-zsnprintf-posix.h
@@ -0,0 +1,183 @@
+/* Test of POSIX compatible vzsnprintf() and zsnprintf() functions.
+ Copyright (C) 2007-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/>. */
+
+/* Written by Bruno Haible <br...@clisp.org>, 2024. */
+
+/* This test exercises only a few POSIX compliance problems that are still
+ visible on platforms relevant in 2024. For a much more complete test suite,
+ see test-snprintf-posix.h. */
+
+#include "infinity.h"
+#include "nan.h"
+
+/* Test whether string[start_index..end_index-1] is a valid textual
+ representation of NaN. */
+static int
+strisnan (const char *string, size_t start_index, size_t end_index, int uppercase)
+{
+ if (start_index < end_index)
+ {
+ if (string[start_index] == '-')
+ start_index++;
+ if (start_index + 3 <= end_index
+ && memcmp (string + start_index, uppercase ? "NAN" : "nan", 3) == 0)
+ {
+ start_index += 3;
+ if (start_index == end_index
+ || (string[start_index] == '(' && string[end_index - 1] == ')'))
+ return 1;
+ }
+ }
+ return 0;
+}
+
+static void
+test_function (ptrdiff_t (*my_zsnprintf) (char *, size_t, const char *, ...))
+{
+ char result[5000];
+
+ /* Test the support of the 'a' and 'A' conversion specifier for hexadecimal
+ output of floating-point numbers. */
+
+ { /* This test would fail on Solaris 11.4. */
+ ptrdiff_t retval =
+ my_zsnprintf (result, sizeof (result), "%a %d", 3.1416015625, 33, 44, 55);
+ ASSERT (strcmp (result, "0x1.922p+1 33") == 0
+ || strcmp (result, "0x3.244p+0 33") == 0
+ || strcmp (result, "0x6.488p-1 33") == 0
+ || strcmp (result, "0xc.91p-2 33") == 0);
+ ASSERT (retval == strlen (result));
+ }
+
+ { /* This test would fail on Solaris 11.4. */
+ ptrdiff_t retval =
+ my_zsnprintf (result, sizeof (result), "%A %d", -3.1416015625, 33, 44, 55);
+ ASSERT (strcmp (result, "-0X1.922P+1 33") == 0
+ || strcmp (result, "-0X3.244P+0 33") == 0
+ || strcmp (result, "-0X6.488P-1 33") == 0
+ || strcmp (result, "-0XC.91P-2 33") == 0);
+ ASSERT (retval == strlen (result));
+ }
+
+ { /* This test would fail on FreeBSD 6.1, NetBSD 10.0. */
+ ptrdiff_t retval =
+ my_zsnprintf (result, sizeof (result), "%.2a %d", 1.51, 33, 44, 55);
+ ASSERT (strcmp (result, "0x1.83p+0 33") == 0
+ || strcmp (result, "0x3.05p-1 33") == 0
+ || strcmp (result, "0x6.0ap-2 33") == 0
+ || strcmp (result, "0xc.14p-3 33") == 0);
+ ASSERT (retval == strlen (result));
+ }
+
+ { /* This test would fail on macOS 14, FreeBSD 14.0, OpenBSD 7.5, AIX 7.3,
+ Solaris 11.4. */
+ ptrdiff_t retval =
+ my_zsnprintf (result, sizeof (result), "%.0a %d", 1.51, 33, 44, 55);
+ ASSERT (strcmp (result, "0x2p+0 33") == 0
+ || strcmp (result, "0x3p-1 33") == 0
+ || strcmp (result, "0x6p-2 33") == 0
+ || strcmp (result, "0xcp-3 33") == 0);
+ ASSERT (retval == strlen (result));
+ }
+
+ /* Test the support of the %f format directive. */
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ ptrdiff_t retval =
+ my_zsnprintf (result, sizeof (result), "%f %d", Infinityd (), 33, 44, 55);
+ ASSERT (strcmp (result, "inf 33") == 0
+ || strcmp (result, "infinity 33") == 0);
+ ASSERT (retval == strlen (result));
+ }
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ ptrdiff_t retval =
+ my_zsnprintf (result, sizeof (result), "%f %d", NaNd (), 33, 44, 55);
+ ASSERT (strlen (result) >= 3 + 3
+ && strisnan (result, 0, strlen (result) - 3, 0)
+ && strcmp (result + strlen (result) - 3, " 33") == 0);
+ ASSERT (retval == strlen (result));
+ }
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ ptrdiff_t retval =
+ my_zsnprintf (result, sizeof (result), "%010f %d", Infinityd (), 33, 44, 55);
+ ASSERT (strcmp (result, " inf 33") == 0
+ || strcmp (result, " infinity 33") == 0);
+ ASSERT (retval == strlen (result));
+ }
+
+ /* Test the support of the %e format directive. */
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ ptrdiff_t retval =
+ my_zsnprintf (result, sizeof (result), "%e %d", Infinityd (), 33, 44, 55);
+ ASSERT (strcmp (result, "inf 33") == 0
+ || strcmp (result, "infinity 33") == 0);
+ ASSERT (retval == strlen (result));
+ }
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ ptrdiff_t retval =
+ my_zsnprintf (result, sizeof (result), "%e %d", NaNd (), 33, 44, 55);
+ ASSERT (strlen (result) >= 3 + 3
+ && strisnan (result, 0, strlen (result) - 3, 0)
+ && strcmp (result + strlen (result) - 3, " 33") == 0);
+ ASSERT (retval == strlen (result));
+ }
+
+ /* Test the support of the %g format directive. */
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ ptrdiff_t retval =
+ my_zsnprintf (result, sizeof (result), "%g %d", Infinityd (), 33, 44, 55);
+ ASSERT (strcmp (result, "inf 33") == 0
+ || strcmp (result, "infinity 33") == 0);
+ ASSERT (retval == strlen (result));
+ }
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ ptrdiff_t retval =
+ my_zsnprintf (result, sizeof (result), "%g %d", NaNd (), 33, 44, 55);
+ ASSERT (strlen (result) >= 3 + 3
+ && strisnan (result, 0, strlen (result) - 3, 0)
+ && strcmp (result + strlen (result) - 3, " 33") == 0);
+ ASSERT (retval == strlen (result));
+ }
+
+ /* Test the support of large precision. */
+
+ { /* This test would fail on AIX 7.1. */
+ ptrdiff_t retval =
+ my_zsnprintf (result, sizeof (result), "%.4000d %d", 1234567, 99);
+ size_t i;
+ for (i = 0; i < 4000 - 7; i++)
+ ASSERT (result[i] == '0');
+ ASSERT (strcmp (result + 4000 - 7, "1234567 99") == 0);
+ ASSERT (retval == strlen (result));
+ }
+
+ /* Test the support of the 'b' conversion specifier for binary output of
+ integers. */
+
+ { /* This test would fail on glibc 2.34, musl libc, macOS 14,
+ FreeBSD 13.2, NetBSD 10.0, OpenBSD 7.5, AIX 7.3, Solaris 11.4. */
+ ptrdiff_t retval =
+ my_zsnprintf (result, sizeof (result), "%b %d", 12345, 33, 44, 55);
+ ASSERT (strcmp (result, "11000000111001 33") == 0);
+ ASSERT (retval == strlen (result));
+ }
+}
--
2.34.1
>From 892d32e59c3603ab75116a83144dddab5d98cfb5 Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Tue, 25 Jun 2024 01:09:34 +0200
Subject: [PATCH 03/12] zsnprintf-posix: New module.
* modules/zsnprintf-posix: New file.
---
ChangeLog | 5 +++++
modules/zsnprintf-posix | 22 ++++++++++++++++++++++
2 files changed, 27 insertions(+)
create mode 100644 modules/zsnprintf-posix
diff --git a/ChangeLog b/ChangeLog
index 84abf933b8..933190ff3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-06-24 Bruno Haible <br...@clisp.org>
+
+ zsnprintf-posix: New module.
+ * modules/zsnprintf-posix: New file.
+
2024-06-24 Bruno Haible <br...@clisp.org>
vzsnprintf-posix: Add tests.
diff --git a/modules/zsnprintf-posix b/modules/zsnprintf-posix
new file mode 100644
index 0000000000..6e2f2c6589
--- /dev/null
+++ b/modules/zsnprintf-posix
@@ -0,0 +1,22 @@
+Description:
+zsnprintf() function with POSIX compliant format string interpretation
+
+Files:
+
+Depends-on:
+zsnprintf
+mixin/printf-posix
+
+configure.ac:
+gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS
+
+Makefile.am:
+
+Include:
+<stdio.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all
--
2.34.1
>From c40e39a7f5f89ed376a711dfdf507a56220dcfd2 Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Tue, 25 Jun 2024 01:09:40 +0200
Subject: [PATCH 04/12] zsnprintf-posix: Add tests.
* tests/test-zsnprintf-posix.c: New file.
* modules/zsnprintf-posix-tests: New file.
---
ChangeLog | 4 ++++
modules/zsnprintf-posix-tests | 14 ++++++++++++++
tests/test-zsnprintf-posix.c | 35 +++++++++++++++++++++++++++++++++++
3 files changed, 53 insertions(+)
create mode 100644 modules/zsnprintf-posix-tests
create mode 100644 tests/test-zsnprintf-posix.c
diff --git a/ChangeLog b/ChangeLog
index 933190ff3b..ffb2b7fecf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2024-06-24 Bruno Haible <br...@clisp.org>
+ zsnprintf-posix: Add tests.
+ * tests/test-zsnprintf-posix.c: New file.
+ * modules/zsnprintf-posix-tests: New file.
+
zsnprintf-posix: New module.
* modules/zsnprintf-posix: New file.
diff --git a/modules/zsnprintf-posix-tests b/modules/zsnprintf-posix-tests
new file mode 100644
index 0000000000..75f7594293
--- /dev/null
+++ b/modules/zsnprintf-posix-tests
@@ -0,0 +1,14 @@
+Files:
+tests/test-zsnprintf-posix.c
+tests/test-zsnprintf-posix.h
+tests/infinity.h
+tests/macros.h
+
+Depends-on:
+nan
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-zsnprintf-posix
+check_PROGRAMS += test-zsnprintf-posix
diff --git a/tests/test-zsnprintf-posix.c b/tests/test-zsnprintf-posix.c
new file mode 100644
index 0000000000..0acefb59dc
--- /dev/null
+++ b/tests/test-zsnprintf-posix.c
@@ -0,0 +1,35 @@
+/* Test of POSIX compatible zsnprintf() function.
+ Copyright (C) 2007-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/>. */
+
+/* Written by Bruno Haible <br...@clisp.org>, 2007. */
+
+#include <config.h>
+
+#include <stdio.h>
+
+#include <stddef.h>
+#include <string.h>
+
+#include "macros.h"
+
+#include "test-zsnprintf-posix.h"
+
+int
+main (int argc, char *argv[])
+{
+ test_function (zsnprintf);
+ return test_exit_status;
+}
--
2.34.1
>From eae7f66a061c7e4e0e78e457d25caff296396cc4 Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Tue, 25 Jun 2024 01:09:45 +0200
Subject: [PATCH 05/12] vzsprintf-posix: New module.
* modules/vzsprintf-posix: New file.
---
ChangeLog | 5 +++++
modules/vzsprintf-posix | 22 ++++++++++++++++++++++
2 files changed, 27 insertions(+)
create mode 100644 modules/vzsprintf-posix
diff --git a/ChangeLog b/ChangeLog
index ffb2b7fecf..aba08dc3e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-06-24 Bruno Haible <br...@clisp.org>
+
+ vzsprintf-posix: New module.
+ * modules/vzsprintf-posix: New file.
+
2024-06-24 Bruno Haible <br...@clisp.org>
zsnprintf-posix: Add tests.
diff --git a/modules/vzsprintf-posix b/modules/vzsprintf-posix
new file mode 100644
index 0000000000..fb3428a8e1
--- /dev/null
+++ b/modules/vzsprintf-posix
@@ -0,0 +1,22 @@
+Description:
+vzsprintf() function with POSIX compliant format string interpretation
+
+Files:
+
+Depends-on:
+vzsprintf
+mixin/printf-posix
+
+configure.ac:
+gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS
+
+Makefile.am:
+
+Include:
+<stdio.h>
+
+License:
+LGPL
+
+Maintainer:
+all
--
2.34.1
>From 20ac07997afaf79bcd26379c067f82c4c958988c Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Tue, 25 Jun 2024 01:09:49 +0200
Subject: [PATCH 06/12] vzsprintf-posix: Add tests.
* tests/test-vzsprintf-posix.c: New file.
* tests/test-zsprintf-posix.h: New file, based on
tests/test-zsnprintf-posix.h.
* modules/vzsprintf-posix-tests: New file.
---
ChangeLog | 6 ++
modules/vzsprintf-posix-tests | 14 +++
tests/test-vzsprintf-posix.c | 48 +++++++++
tests/test-zsprintf-posix.h | 183 ++++++++++++++++++++++++++++++++++
4 files changed, 251 insertions(+)
create mode 100644 modules/vzsprintf-posix-tests
create mode 100644 tests/test-vzsprintf-posix.c
create mode 100644 tests/test-zsprintf-posix.h
diff --git a/ChangeLog b/ChangeLog
index aba08dc3e2..45a312df53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2024-06-24 Bruno Haible <br...@clisp.org>
+ vzsprintf-posix: Add tests.
+ * tests/test-vzsprintf-posix.c: New file.
+ * tests/test-zsprintf-posix.h: New file, based on
+ tests/test-zsnprintf-posix.h.
+ * modules/vzsprintf-posix-tests: New file.
+
vzsprintf-posix: New module.
* modules/vzsprintf-posix: New file.
diff --git a/modules/vzsprintf-posix-tests b/modules/vzsprintf-posix-tests
new file mode 100644
index 0000000000..ea4682d504
--- /dev/null
+++ b/modules/vzsprintf-posix-tests
@@ -0,0 +1,14 @@
+Files:
+tests/test-vzsprintf-posix.c
+tests/test-zsprintf-posix.h
+tests/infinity.h
+tests/macros.h
+
+Depends-on:
+nan
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-vzsprintf-posix
+check_PROGRAMS += test-vzsprintf-posix
diff --git a/tests/test-vzsprintf-posix.c b/tests/test-vzsprintf-posix.c
new file mode 100644
index 0000000000..a3dd260731
--- /dev/null
+++ b/tests/test-vzsprintf-posix.c
@@ -0,0 +1,48 @@
+/* Test of POSIX compatible vzsprintf() function.
+ Copyright (C) 2007-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/>. */
+
+/* Written by Bruno Haible <br...@clisp.org>, 2007. */
+
+#include <config.h>
+
+#include <stdio.h>
+
+#include <stdarg.h>
+#include <stddef.h>
+#include <string.h>
+
+#include "macros.h"
+
+#include "test-zsprintf-posix.h"
+
+static ptrdiff_t
+my_zsprintf (char *str, const char *format, ...)
+{
+ va_list args;
+ ptrdiff_t ret;
+
+ va_start (args, format);
+ ret = vzsprintf (str, format, args);
+ va_end (args);
+ return ret;
+}
+
+int
+main (int argc, char *argv[])
+{
+ test_function (my_zsprintf);
+ return test_exit_status;
+}
diff --git a/tests/test-zsprintf-posix.h b/tests/test-zsprintf-posix.h
new file mode 100644
index 0000000000..c12754970d
--- /dev/null
+++ b/tests/test-zsprintf-posix.h
@@ -0,0 +1,183 @@
+/* Test of POSIX compatible vzsprintf() and zsprintf() functions.
+ Copyright (C) 2007-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/>. */
+
+/* Written by Bruno Haible <br...@clisp.org>, 2024. */
+
+/* This test exercises only a few POSIX compliance problems that are still
+ visible on platforms relevant in 2024. For a much more complete test suite,
+ see test-sprintf-posix.h. */
+
+#include "infinity.h"
+#include "nan.h"
+
+/* Test whether string[start_index..end_index-1] is a valid textual
+ representation of NaN. */
+static int
+strisnan (const char *string, size_t start_index, size_t end_index, int uppercase)
+{
+ if (start_index < end_index)
+ {
+ if (string[start_index] == '-')
+ start_index++;
+ if (start_index + 3 <= end_index
+ && memcmp (string + start_index, uppercase ? "NAN" : "nan", 3) == 0)
+ {
+ start_index += 3;
+ if (start_index == end_index
+ || (string[start_index] == '(' && string[end_index - 1] == ')'))
+ return 1;
+ }
+ }
+ return 0;
+}
+
+static void
+test_function (ptrdiff_t (*my_zsprintf) (char *, const char *, ...))
+{
+ char result[5000];
+
+ /* Test the support of the 'a' and 'A' conversion specifier for hexadecimal
+ output of floating-point numbers. */
+
+ { /* This test would fail on Solaris 11.4. */
+ ptrdiff_t retval =
+ my_zsprintf (result, "%a %d", 3.1416015625, 33, 44, 55);
+ ASSERT (strcmp (result, "0x1.922p+1 33") == 0
+ || strcmp (result, "0x3.244p+0 33") == 0
+ || strcmp (result, "0x6.488p-1 33") == 0
+ || strcmp (result, "0xc.91p-2 33") == 0);
+ ASSERT (retval == strlen (result));
+ }
+
+ { /* This test would fail on Solaris 11.4. */
+ ptrdiff_t retval =
+ my_zsprintf (result, "%A %d", -3.1416015625, 33, 44, 55);
+ ASSERT (strcmp (result, "-0X1.922P+1 33") == 0
+ || strcmp (result, "-0X3.244P+0 33") == 0
+ || strcmp (result, "-0X6.488P-1 33") == 0
+ || strcmp (result, "-0XC.91P-2 33") == 0);
+ ASSERT (retval == strlen (result));
+ }
+
+ { /* This test would fail on FreeBSD 6.1, NetBSD 10.0. */
+ ptrdiff_t retval =
+ my_zsprintf (result, "%.2a %d", 1.51, 33, 44, 55);
+ ASSERT (strcmp (result, "0x1.83p+0 33") == 0
+ || strcmp (result, "0x3.05p-1 33") == 0
+ || strcmp (result, "0x6.0ap-2 33") == 0
+ || strcmp (result, "0xc.14p-3 33") == 0);
+ ASSERT (retval == strlen (result));
+ }
+
+ { /* This test would fail on macOS 14, FreeBSD 14.0, OpenBSD 7.5, AIX 7.3,
+ Solaris 11.4. */
+ ptrdiff_t retval =
+ my_zsprintf (result, "%.0a %d", 1.51, 33, 44, 55);
+ ASSERT (strcmp (result, "0x2p+0 33") == 0
+ || strcmp (result, "0x3p-1 33") == 0
+ || strcmp (result, "0x6p-2 33") == 0
+ || strcmp (result, "0xcp-3 33") == 0);
+ ASSERT (retval == strlen (result));
+ }
+
+ /* Test the support of the %f format directive. */
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ ptrdiff_t retval =
+ my_zsprintf (result, "%f %d", Infinityd (), 33, 44, 55);
+ ASSERT (strcmp (result, "inf 33") == 0
+ || strcmp (result, "infinity 33") == 0);
+ ASSERT (retval == strlen (result));
+ }
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ ptrdiff_t retval =
+ my_zsprintf (result, "%f %d", NaNd (), 33, 44, 55);
+ ASSERT (strlen (result) >= 3 + 3
+ && strisnan (result, 0, strlen (result) - 3, 0)
+ && strcmp (result + strlen (result) - 3, " 33") == 0);
+ ASSERT (retval == strlen (result));
+ }
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ ptrdiff_t retval =
+ my_zsprintf (result, "%010f %d", Infinityd (), 33, 44, 55);
+ ASSERT (strcmp (result, " inf 33") == 0
+ || strcmp (result, " infinity 33") == 0);
+ ASSERT (retval == strlen (result));
+ }
+
+ /* Test the support of the %e format directive. */
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ ptrdiff_t retval =
+ my_zsprintf (result, "%e %d", Infinityd (), 33, 44, 55);
+ ASSERT (strcmp (result, "inf 33") == 0
+ || strcmp (result, "infinity 33") == 0);
+ ASSERT (retval == strlen (result));
+ }
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ ptrdiff_t retval =
+ my_zsprintf (result, "%e %d", NaNd (), 33, 44, 55);
+ ASSERT (strlen (result) >= 3 + 3
+ && strisnan (result, 0, strlen (result) - 3, 0)
+ && strcmp (result + strlen (result) - 3, " 33") == 0);
+ ASSERT (retval == strlen (result));
+ }
+
+ /* Test the support of the %g format directive. */
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ ptrdiff_t retval =
+ my_zsprintf (result, "%g %d", Infinityd (), 33, 44, 55);
+ ASSERT (strcmp (result, "inf 33") == 0
+ || strcmp (result, "infinity 33") == 0);
+ ASSERT (retval == strlen (result));
+ }
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ ptrdiff_t retval =
+ my_zsprintf (result, "%g %d", NaNd (), 33, 44, 55);
+ ASSERT (strlen (result) >= 3 + 3
+ && strisnan (result, 0, strlen (result) - 3, 0)
+ && strcmp (result + strlen (result) - 3, " 33") == 0);
+ ASSERT (retval == strlen (result));
+ }
+
+ /* Test the support of large precision. */
+
+ { /* This test would fail on AIX 7.1. */
+ ptrdiff_t retval =
+ my_zsprintf (result, "%.4000d %d", 1234567, 99);
+ size_t i;
+ for (i = 0; i < 4000 - 7; i++)
+ ASSERT (result[i] == '0');
+ ASSERT (strcmp (result + 4000 - 7, "1234567 99") == 0);
+ ASSERT (retval == strlen (result));
+ }
+
+ /* Test the support of the 'b' conversion specifier for binary output of
+ integers. */
+
+ { /* This test would fail on glibc 2.34, musl libc, macOS 14,
+ FreeBSD 13.2, NetBSD 10.0, OpenBSD 7.5, AIX 7.3, Solaris 11.4. */
+ ptrdiff_t retval =
+ my_zsprintf (result, "%b %d", 12345, 33, 44, 55);
+ ASSERT (strcmp (result, "11000000111001 33") == 0);
+ ASSERT (retval == strlen (result));
+ }
+}
--
2.34.1
>From 60b27976e67e80a837033eb4546eef7c775b71a8 Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Tue, 25 Jun 2024 01:09:55 +0200
Subject: [PATCH 07/12] zsprintf-posix: New module.
* modules/zsprintf-posix: New file.
---
ChangeLog | 5 +++++
modules/zsprintf-posix | 22 ++++++++++++++++++++++
2 files changed, 27 insertions(+)
create mode 100644 modules/zsprintf-posix
diff --git a/ChangeLog b/ChangeLog
index 45a312df53..820bcd3d22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-06-24 Bruno Haible <br...@clisp.org>
+
+ zsprintf-posix: New module.
+ * modules/zsprintf-posix: New file.
+
2024-06-24 Bruno Haible <br...@clisp.org>
vzsprintf-posix: Add tests.
diff --git a/modules/zsprintf-posix b/modules/zsprintf-posix
new file mode 100644
index 0000000000..c3ab891f88
--- /dev/null
+++ b/modules/zsprintf-posix
@@ -0,0 +1,22 @@
+Description:
+zsprintf() function with POSIX compliant format string interpretation
+
+Files:
+
+Depends-on:
+zsprintf
+mixin/printf-posix
+
+configure.ac:
+gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS
+
+Makefile.am:
+
+Include:
+<stdio.h>
+
+License:
+LGPL
+
+Maintainer:
+all
--
2.34.1
>From 4ae432545a1606cf174d590737653d219c3d3dce Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Tue, 25 Jun 2024 01:09:59 +0200
Subject: [PATCH 08/12] zsprintf-posix: Add tests.
* tests/test-zsprintf-posix.c: New file.
* modules/zsprintf-posix-tests: New file.
---
ChangeLog | 4 ++++
modules/zsprintf-posix-tests | 14 ++++++++++++++
tests/test-zsprintf-posix.c | 36 ++++++++++++++++++++++++++++++++++++
3 files changed, 54 insertions(+)
create mode 100644 modules/zsprintf-posix-tests
create mode 100644 tests/test-zsprintf-posix.c
diff --git a/ChangeLog b/ChangeLog
index 820bcd3d22..3690156667 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2024-06-24 Bruno Haible <br...@clisp.org>
+ zsprintf-posix: Add tests.
+ * tests/test-zsprintf-posix.c: New file.
+ * modules/zsprintf-posix-tests: New file.
+
zsprintf-posix: New module.
* modules/zsprintf-posix: New file.
diff --git a/modules/zsprintf-posix-tests b/modules/zsprintf-posix-tests
new file mode 100644
index 0000000000..8ea6819c06
--- /dev/null
+++ b/modules/zsprintf-posix-tests
@@ -0,0 +1,14 @@
+Files:
+tests/test-zsprintf-posix.c
+tests/test-zsprintf-posix.h
+tests/infinity.h
+tests/macros.h
+
+Depends-on:
+nan
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-zsprintf-posix
+check_PROGRAMS += test-zsprintf-posix
diff --git a/tests/test-zsprintf-posix.c b/tests/test-zsprintf-posix.c
new file mode 100644
index 0000000000..b5af845b15
--- /dev/null
+++ b/tests/test-zsprintf-posix.c
@@ -0,0 +1,36 @@
+/* Test of POSIX compatible zsprintf() function.
+ Copyright (C) 2007-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/>. */
+
+/* Written by Bruno Haible <br...@clisp.org>, 2007. */
+
+#include <config.h>
+
+#include <stdio.h>
+
+#include <stdarg.h>
+#include <stddef.h>
+#include <string.h>
+
+#include "macros.h"
+
+#include "test-zsprintf-posix.h"
+
+int
+main (int argc, char *argv[])
+{
+ test_function (zsprintf);
+ return test_exit_status;
+}
--
2.34.1
>From 970f2cf6387bface37081bdd917d837eae8450da Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Tue, 25 Jun 2024 01:10:03 +0200
Subject: [PATCH 09/12] vazsprintf-posix: New module.
* modules/vazsprintf-posix: New file.
---
ChangeLog | 5 +++++
modules/vazsprintf-posix | 23 +++++++++++++++++++++++
2 files changed, 28 insertions(+)
create mode 100644 modules/vazsprintf-posix
diff --git a/ChangeLog b/ChangeLog
index 3690156667..6b4f07b427 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-06-24 Bruno Haible <br...@clisp.org>
+
+ vazsprintf-posix: New module.
+ * modules/vazsprintf-posix: New file.
+
2024-06-24 Bruno Haible <br...@clisp.org>
zsprintf-posix: Add tests.
diff --git a/modules/vazsprintf-posix b/modules/vazsprintf-posix
new file mode 100644
index 0000000000..39a1da3800
--- /dev/null
+++ b/modules/vazsprintf-posix
@@ -0,0 +1,23 @@
+Description:
+azsprintf() and vazsprintf() functions
+with POSIX compliant format string interpretation
+
+Files:
+
+Depends-on:
+vazsprintf
+mixin/printf-posix
+
+configure.ac:
+gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS
+
+Makefile.am:
+
+Include:
+<stdio.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all
--
2.34.1
>From 154a3d42c54b7e86e2d6daaa2877ae6ec5f2ee63 Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Tue, 25 Jun 2024 01:10:08 +0200
Subject: [PATCH 10/12] vazsprintf-posix: Add tests.
* tests/test-vazsprintf-posix.c: New file, based on
tests/test-zsnprintf-posix.h.
* modules/vazsprintf-posix-tests: New file.
---
ChangeLog | 5 +
modules/vazsprintf-posix-tests | 13 ++
tests/test-vazsprintf-posix.c | 264 +++++++++++++++++++++++++++++++++
3 files changed, 282 insertions(+)
create mode 100644 modules/vazsprintf-posix-tests
create mode 100644 tests/test-vazsprintf-posix.c
diff --git a/ChangeLog b/ChangeLog
index 6b4f07b427..b383122fed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2024-06-24 Bruno Haible <br...@clisp.org>
+ vazsprintf-posix: Add tests.
+ * tests/test-vazsprintf-posix.c: New file, based on
+ tests/test-zsnprintf-posix.h.
+ * modules/vazsprintf-posix-tests: New file.
+
vazsprintf-posix: New module.
* modules/vazsprintf-posix: New file.
diff --git a/modules/vazsprintf-posix-tests b/modules/vazsprintf-posix-tests
new file mode 100644
index 0000000000..04c84e7861
--- /dev/null
+++ b/modules/vazsprintf-posix-tests
@@ -0,0 +1,13 @@
+Files:
+tests/test-vazsprintf-posix.c
+tests/infinity.h
+tests/macros.h
+
+Depends-on:
+nan
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-vazsprintf-posix
+check_PROGRAMS += test-vazsprintf-posix
diff --git a/tests/test-vazsprintf-posix.c b/tests/test-vazsprintf-posix.c
new file mode 100644
index 0000000000..550596652c
--- /dev/null
+++ b/tests/test-vazsprintf-posix.c
@@ -0,0 +1,264 @@
+/* Test of POSIX compatible vazsprintf() and azsprintf() functions.
+ Copyright (C) 2007-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/>. */
+
+/* Written by Bruno Haible <br...@clisp.org>, 2024. */
+
+/* This test exercises only a few POSIX compliance problems that are still
+ visible on platforms relevant in 2024. For a much more complete test suite,
+ see test-vasprintf-posix.c. */
+
+#include <config.h>
+
+#include <stdio.h>
+
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "macros.h"
+#include "infinity.h"
+#include "nan.h"
+
+/* Test whether string[start_index..end_index-1] is a valid textual
+ representation of NaN. */
+static int
+strisnan (const char *string, size_t start_index, size_t end_index, int uppercase)
+{
+ if (start_index < end_index)
+ {
+ if (string[start_index] == '-')
+ start_index++;
+ if (start_index + 3 <= end_index
+ && memcmp (string + start_index, uppercase ? "NAN" : "nan", 3) == 0)
+ {
+ start_index += 3;
+ if (start_index == end_index
+ || (string[start_index] == '(' && string[end_index - 1] == ')'))
+ return 1;
+ }
+ }
+ return 0;
+}
+
+static void
+test_function (ptrdiff_t (*my_azsprintf) (char **, const char *, ...))
+{
+ char result[5000];
+
+ /* Test the support of the 'a' and 'A' conversion specifier for hexadecimal
+ output of floating-point numbers. */
+
+ { /* This test would fail on Solaris 11.4. */
+ char *result;
+ ptrdiff_t retval =
+ my_azsprintf (&result, "%a %d", 3.1416015625, 33, 44, 55);
+ ASSERT (result != NULL);
+ ASSERT (strcmp (result, "0x1.922p+1 33") == 0
+ || strcmp (result, "0x3.244p+0 33") == 0
+ || strcmp (result, "0x6.488p-1 33") == 0
+ || strcmp (result, "0xc.91p-2 33") == 0);
+ ASSERT (retval == strlen (result));
+ free (result);
+ }
+
+ { /* This test would fail on Solaris 11.4. */
+ char *result;
+ ptrdiff_t retval =
+ my_azsprintf (&result, "%A %d", -3.1416015625, 33, 44, 55);
+ ASSERT (result != NULL);
+ ASSERT (strcmp (result, "-0X1.922P+1 33") == 0
+ || strcmp (result, "-0X3.244P+0 33") == 0
+ || strcmp (result, "-0X6.488P-1 33") == 0
+ || strcmp (result, "-0XC.91P-2 33") == 0);
+ ASSERT (retval == strlen (result));
+ free (result);
+ }
+
+ { /* This test would fail on FreeBSD 6.1, NetBSD 10.0. */
+ char *result;
+ ptrdiff_t retval =
+ my_azsprintf (&result, "%.2a %d", 1.51, 33, 44, 55);
+ ASSERT (result != NULL);
+ ASSERT (strcmp (result, "0x1.83p+0 33") == 0
+ || strcmp (result, "0x3.05p-1 33") == 0
+ || strcmp (result, "0x6.0ap-2 33") == 0
+ || strcmp (result, "0xc.14p-3 33") == 0);
+ ASSERT (retval == strlen (result));
+ free (result);
+ }
+
+ { /* This test would fail on macOS 14, FreeBSD 14.0, OpenBSD 7.5, AIX 7.3,
+ Solaris 11.4. */
+ char *result;
+ ptrdiff_t retval =
+ my_azsprintf (&result, "%.0a %d", 1.51, 33, 44, 55);
+ ASSERT (result != NULL);
+ ASSERT (strcmp (result, "0x2p+0 33") == 0
+ || strcmp (result, "0x3p-1 33") == 0
+ || strcmp (result, "0x6p-2 33") == 0
+ || strcmp (result, "0xcp-3 33") == 0);
+ ASSERT (retval == strlen (result));
+ free (result);
+ }
+
+ /* Test the support of the %f format directive. */
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ char *result;
+ ptrdiff_t retval =
+ my_azsprintf (&result, "%f %d", Infinityd (), 33, 44, 55);
+ ASSERT (result != NULL);
+ ASSERT (strcmp (result, "inf 33") == 0
+ || strcmp (result, "infinity 33") == 0);
+ ASSERT (retval == strlen (result));
+ free (result);
+ }
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ char *result;
+ ptrdiff_t retval =
+ my_azsprintf (&result, "%f %d", NaNd (), 33, 44, 55);
+ ASSERT (result != NULL);
+ ASSERT (strlen (result) >= 3 + 3
+ && strisnan (result, 0, strlen (result) - 3, 0)
+ && strcmp (result + strlen (result) - 3, " 33") == 0);
+ ASSERT (retval == strlen (result));
+ free (result);
+ }
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ char *result;
+ ptrdiff_t retval =
+ my_azsprintf (&result, "%010f %d", Infinityd (), 33, 44, 55);
+ ASSERT (result != NULL);
+ ASSERT (strcmp (result, " inf 33") == 0
+ || strcmp (result, " infinity 33") == 0);
+ ASSERT (retval == strlen (result));
+ free (result);
+ }
+
+ /* Test the support of the %e format directive. */
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ char *result;
+ ptrdiff_t retval =
+ my_azsprintf (&result, "%e %d", Infinityd (), 33, 44, 55);
+ ASSERT (result != NULL);
+ ASSERT (strcmp (result, "inf 33") == 0
+ || strcmp (result, "infinity 33") == 0);
+ ASSERT (retval == strlen (result));
+ free (result);
+ }
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ char *result;
+ ptrdiff_t retval =
+ my_azsprintf (&result, "%e %d", NaNd (), 33, 44, 55);
+ ASSERT (result != NULL);
+ ASSERT (strlen (result) >= 3 + 3
+ && strisnan (result, 0, strlen (result) - 3, 0)
+ && strcmp (result + strlen (result) - 3, " 33") == 0);
+ ASSERT (retval == strlen (result));
+ free (result);
+ }
+
+ /* Test the support of the %g format directive. */
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ char *result;
+ ptrdiff_t retval =
+ my_azsprintf (&result, "%g %d", Infinityd (), 33, 44, 55);
+ ASSERT (result != NULL);
+ ASSERT (strcmp (result, "inf 33") == 0
+ || strcmp (result, "infinity 33") == 0);
+ ASSERT (retval == strlen (result));
+ free (result);
+ }
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ char *result;
+ ptrdiff_t retval =
+ my_azsprintf (&result, "%g %d", NaNd (), 33, 44, 55);
+ ASSERT (result != NULL);
+ ASSERT (strlen (result) >= 3 + 3
+ && strisnan (result, 0, strlen (result) - 3, 0)
+ && strcmp (result + strlen (result) - 3, " 33") == 0);
+ ASSERT (retval == strlen (result));
+ free (result);
+ }
+
+ /* Test the support of large precision. */
+
+ { /* This test would fail on AIX 7.1. */
+ char *result;
+ ptrdiff_t retval =
+ my_azsprintf (&result, "%.4000d %d", 1234567, 99);
+ ASSERT (result != NULL);
+ size_t i;
+ for (i = 0; i < 4000 - 7; i++)
+ ASSERT (result[i] == '0');
+ ASSERT (strcmp (result + 4000 - 7, "1234567 99") == 0);
+ ASSERT (retval == strlen (result));
+ free (result);
+ }
+
+ /* Test the support of the 'b' conversion specifier for binary output of
+ integers. */
+
+ { /* This test would fail on glibc 2.34, musl libc, macOS 14,
+ FreeBSD 13.2, NetBSD 10.0, OpenBSD 7.5, AIX 7.3, Solaris 11.4. */
+ char *result;
+ ptrdiff_t retval =
+ my_azsprintf (&result, "%b %d", 12345, 33, 44, 55);
+ ASSERT (result != NULL);
+ ASSERT (strcmp (result, "11000000111001 33") == 0);
+ ASSERT (retval == strlen (result));
+ free (result);
+ }
+}
+
+static ptrdiff_t
+my_azsprintf (char **result, const char *format, ...)
+{
+ va_list args;
+ ptrdiff_t ret;
+
+ va_start (args, format);
+ ret = vazsprintf (result, format, args);
+ va_end (args);
+ return ret;
+}
+
+static void
+test_vazsprintf ()
+{
+ test_function (my_azsprintf);
+}
+
+static void
+test_azsprintf ()
+{
+ test_function (azsprintf);
+}
+
+int
+main (int argc, char *argv[])
+{
+ test_vazsprintf ();
+ test_azsprintf ();
+ return test_exit_status;
+}
--
2.34.1
>From 3a1e774a9931611444a23ab4267468f7f95186ee Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Tue, 25 Jun 2024 01:10:30 +0200
Subject: [PATCH 11/12] obstack-zprintf-posix: New module.
* modules/obstack-zprintf-posix: New file.
---
ChangeLog | 5 +++++
modules/obstack-zprintf-posix | 23 +++++++++++++++++++++++
2 files changed, 28 insertions(+)
create mode 100644 modules/obstack-zprintf-posix
diff --git a/ChangeLog b/ChangeLog
index b383122fed..c95a133559 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-06-24 Bruno Haible <br...@clisp.org>
+
+ obstack-zprintf-posix: New module.
+ * modules/obstack-zprintf-posix: New file.
+
2024-06-24 Bruno Haible <br...@clisp.org>
vazsprintf-posix: Add tests.
diff --git a/modules/obstack-zprintf-posix b/modules/obstack-zprintf-posix
new file mode 100644
index 0000000000..192b9b60fd
--- /dev/null
+++ b/modules/obstack-zprintf-posix
@@ -0,0 +1,23 @@
+Description:
+Formatted printing into an obstack (without INT_MAX limitation)
+with POSIX compliant format string interpretation
+
+Files:
+
+Depends-on:
+obstack-zprintf
+mixin/printf-posix
+
+configure.ac:
+gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS
+
+Makefile.am:
+
+Include:
+<stdio.h>
+
+License:
+GPL
+
+Maintainer:
+all
--
2.34.1
>From e967beab8b72086f4b9cea982e430b8f5cc8775b Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Tue, 25 Jun 2024 01:10:34 +0200
Subject: [PATCH 12/12] obstack-zprintf-posix: Add tests.
* tests/test-obstack-zprintf-posix.c: New file, based on
tests/test-vazsprintf-posix.c.
* modules/obstack-zprintf-posix-tests: New file.
---
ChangeLog | 5 +
modules/obstack-zprintf-posix-tests | 14 ++
tests/test-obstack-zprintf-posix.c | 262 ++++++++++++++++++++++++++++
3 files changed, 281 insertions(+)
create mode 100644 modules/obstack-zprintf-posix-tests
create mode 100644 tests/test-obstack-zprintf-posix.c
diff --git a/ChangeLog b/ChangeLog
index c95a133559..02fc3f35fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2024-06-24 Bruno Haible <br...@clisp.org>
+ obstack-zprintf-posix: Add tests.
+ * tests/test-obstack-zprintf-posix.c: New file, based on
+ tests/test-vazsprintf-posix.c.
+ * modules/obstack-zprintf-posix-tests: New file.
+
obstack-zprintf-posix: New module.
* modules/obstack-zprintf-posix: New file.
diff --git a/modules/obstack-zprintf-posix-tests b/modules/obstack-zprintf-posix-tests
new file mode 100644
index 0000000000..eeaf027340
--- /dev/null
+++ b/modules/obstack-zprintf-posix-tests
@@ -0,0 +1,14 @@
+Files:
+tests/test-obstack-zprintf-posix.c
+tests/infinity.h
+tests/macros.h
+
+Depends-on:
+nan
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-obstack-zprintf-posix
+check_PROGRAMS += test-obstack-zprintf-posix
+test_obstack_zprintf_posix_LDADD = $(LDADD) @LIBINTL@
diff --git a/tests/test-obstack-zprintf-posix.c b/tests/test-obstack-zprintf-posix.c
new file mode 100644
index 0000000000..0002f79174
--- /dev/null
+++ b/tests/test-obstack-zprintf-posix.c
@@ -0,0 +1,262 @@
+/* Test of POSIX compatible obstack_[v]zprintf() functions.
+ Copyright (C) 2007-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/>. */
+
+/* Written by Bruno Haible <br...@clisp.org>, 2024. */
+
+/* This test exercises only a few POSIX compliance problems that are still
+ visible on platforms relevant in 2024. */
+
+#include <config.h>
+
+#include <stdio.h>
+
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "obstack.h"
+
+#include "macros.h"
+#include "infinity.h"
+#include "nan.h"
+
+#define obstack_chunk_alloc malloc
+#define obstack_chunk_free free
+
+/* Test whether string[start_index..end_index-1] is a valid textual
+ representation of NaN. */
+static int
+strisnan (const char *string, size_t start_index, size_t end_index, int uppercase)
+{
+ if (start_index < end_index)
+ {
+ if (string[start_index] == '-')
+ start_index++;
+ if (start_index + 3 <= end_index
+ && memcmp (string + start_index, uppercase ? "NAN" : "nan", 3) == 0)
+ {
+ start_index += 3;
+ if (start_index == end_index
+ || (string[start_index] == '(' && string[end_index - 1] == ')'))
+ return 1;
+ }
+ }
+ return 0;
+}
+
+static void
+test_function (ptrdiff_t (*my_obstack_zprintf) (struct obstack *, const char *, ...))
+{
+ struct obstack obs;
+ obstack_init (&obs);
+
+ #define RESULT_EQ(expected) \
+ (len == strlen (expected) && memcmp (result, expected, len) == 0)
+
+ /* Test the support of the 'a' and 'A' conversion specifier for hexadecimal
+ output of floating-point numbers. */
+
+ { /* This test would fail on Solaris 11.4. */
+ ptrdiff_t len =
+ my_obstack_zprintf (&obs, "%a %d", 3.1416015625, 33, 44, 55);
+ ASSERT (len >= 0);
+ char *result = obstack_finish (&obs);
+ ASSERT (RESULT_EQ ("0x1.922p+1 33")
+ || RESULT_EQ ("0x3.244p+0 33")
+ || RESULT_EQ ("0x6.488p-1 33")
+ || RESULT_EQ ("0xc.91p-2 33"));
+ obstack_free (&obs, result);
+ }
+
+ { /* This test would fail on Solaris 11.4. */
+ ptrdiff_t len =
+ my_obstack_zprintf (&obs, "%A %d", -3.1416015625, 33, 44, 55);
+ ASSERT (len >= 0);
+ char *result = obstack_finish (&obs);
+ ASSERT (RESULT_EQ ("-0X1.922P+1 33")
+ || RESULT_EQ ("-0X3.244P+0 33")
+ || RESULT_EQ ("-0X6.488P-1 33")
+ || RESULT_EQ ("-0XC.91P-2 33"));
+ obstack_free (&obs, result);
+ }
+
+ { /* This test would fail on FreeBSD 6.1, NetBSD 10.0. */
+ ptrdiff_t len =
+ my_obstack_zprintf (&obs, "%.2a %d", 1.51, 33, 44, 55);
+ ASSERT (len >= 0);
+ char *result = obstack_finish (&obs);
+ ASSERT (RESULT_EQ ("0x1.83p+0 33")
+ || RESULT_EQ ("0x3.05p-1 33")
+ || RESULT_EQ ("0x6.0ap-2 33")
+ || RESULT_EQ ("0xc.14p-3 33"));
+ obstack_free (&obs, result);
+ }
+
+ { /* This test would fail on macOS 14, FreeBSD 14.0, OpenBSD 7.5, AIX 7.3,
+ Solaris 11.4. */
+ ptrdiff_t len =
+ my_obstack_zprintf (&obs, "%.0a %d", 1.51, 33, 44, 55);
+ ASSERT (len >= 0);
+ char *result = obstack_finish (&obs);
+ ASSERT (RESULT_EQ ("0x2p+0 33")
+ || RESULT_EQ ("0x3p-1 33")
+ || RESULT_EQ ("0x6p-2 33")
+ || RESULT_EQ ("0xcp-3 33"));
+ obstack_free (&obs, result);
+ }
+
+ /* Test the support of the %f format directive. */
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ ptrdiff_t len =
+ my_obstack_zprintf (&obs, "%f %d", Infinityd (), 33, 44, 55);
+ ASSERT (len >= 0);
+ char *result = obstack_finish (&obs);
+ ASSERT (RESULT_EQ ("inf 33")
+ || RESULT_EQ ("infinity 33"));
+ obstack_free (&obs, result);
+ }
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ ptrdiff_t len =
+ my_obstack_zprintf (&obs, "%f %d", NaNd (), 33, 44, 55);
+ ASSERT (len >= 0);
+ char *result = obstack_finish (&obs);
+ ASSERT (len >= 3 + 3
+ && strisnan (result, 0, len - 3, 0)
+ && memcmp (result + len - 3, " 33", 3) == 0);
+ obstack_free (&obs, result);
+ }
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ ptrdiff_t len =
+ my_obstack_zprintf (&obs, "%010f %d", Infinityd (), 33, 44, 55);
+ ASSERT (len >= 0);
+ char *result = obstack_finish (&obs);
+ ASSERT (RESULT_EQ (" inf 33")
+ || RESULT_EQ (" infinity 33"));
+ obstack_free (&obs, result);
+ }
+
+ /* Test the support of the %e format directive. */
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ ptrdiff_t len =
+ my_obstack_zprintf (&obs, "%e %d", Infinityd (), 33, 44, 55);
+ ASSERT (len >= 0);
+ char *result = obstack_finish (&obs);
+ ASSERT (RESULT_EQ ("inf 33")
+ || RESULT_EQ ("infinity 33"));
+ obstack_free (&obs, result);
+ }
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ ptrdiff_t len =
+ my_obstack_zprintf (&obs, "%e %d", NaNd (), 33, 44, 55);
+ ASSERT (len >= 0);
+ char *result = obstack_finish (&obs);
+ ASSERT (len >= 3 + 3
+ && strisnan (result, 0, len - 3, 0)
+ && memcmp (result + len - 3, " 33", 3) == 0);
+ obstack_free (&obs, result);
+ }
+
+ /* Test the support of the %g format directive. */
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ ptrdiff_t len =
+ my_obstack_zprintf (&obs, "%g %d", Infinityd (), 33, 44, 55);
+ ASSERT (len >= 0);
+ char *result = obstack_finish (&obs);
+ ASSERT (RESULT_EQ ("inf 33")
+ || RESULT_EQ ("infinity 33"));
+ obstack_free (&obs, result);
+ }
+
+ { /* This test would fail on AIX 7.3, Solaris 11.4. */
+ ptrdiff_t len =
+ my_obstack_zprintf (&obs, "%g %d", NaNd (), 33, 44, 55);
+ ASSERT (len >= 0);
+ char *result = obstack_finish (&obs);
+ ASSERT (len >= 3 + 3
+ && strisnan (result, 0, len - 3, 0)
+ && memcmp (result + len - 3, " 33", 3) == 0);
+ obstack_free (&obs, result);
+ }
+
+ /* Test the support of large precision. */
+
+ { /* This test would fail on AIX 7.1. */
+ ptrdiff_t len =
+ my_obstack_zprintf (&obs, "%.4000d %d", 1234567, 99);
+ ASSERT (len >= 0);
+ char *result = obstack_finish (&obs);
+ ASSERT (len == 4000 + 3);
+ size_t i;
+ for (i = 0; i < 4000 - 7; i++)
+ ASSERT (result[i] == '0');
+ ASSERT (memcmp (result + 4000 - 7, "1234567 99", 7 + 3) == 0);
+ obstack_free (&obs, result);
+ }
+
+ /* Test the support of the 'b' conversion specifier for binary output of
+ integers. */
+
+ { /* This test would fail on glibc 2.34, musl libc, macOS 14,
+ FreeBSD 13.2, NetBSD 10.0, OpenBSD 7.5, AIX 7.3, Solaris 11.4. */
+ ptrdiff_t len =
+ my_obstack_zprintf (&obs, "%b %d", 12345, 33, 44, 55);
+ ASSERT (len >= 0);
+ char *result = obstack_finish (&obs);
+ ASSERT (RESULT_EQ ("11000000111001 33"));
+ obstack_free (&obs, result);
+ }
+
+ obstack_free (&obs, NULL);
+}
+
+static ptrdiff_t
+my_obstack_zprintf (struct obstack *obs, const char *format, ...)
+{
+ va_list args;
+ ptrdiff_t ret;
+
+ va_start (args, format);
+ ret = obstack_vzprintf (obs, format, args);
+ va_end (args);
+ return ret;
+}
+
+static void
+test_obstack_vzprintf ()
+{
+ test_function (my_obstack_zprintf);
+}
+
+static void
+test_obstack_zprintf ()
+{
+ test_function (obstack_zprintf);
+}
+
+int
+main (int argc, char *argv[])
+{
+ test_obstack_vzprintf ();
+ test_obstack_zprintf ();
+ return test_exit_status;
+}
--
2.34.1
