This set of patches adds -gnu variants for the *z*printf modules
that we have so far, along with small unit tests.
2024-06-25 Bruno Haible <br...@clisp.org>
obstack-zprintf-gnu: Add tests.
* tests/test-obstack-zprintf-gnu.c: New file, based on
tests/test-vazsprintf-gnu.c.
* modules/obstack-zprintf-gnu-tests: New file.
obstack-zprintf-gnu: New module.
* modules/obstack-zprintf-gnu: New file.
2024-06-25 Bruno Haible <br...@clisp.org>
vazsprintf-gnu: Add tests.
* tests/test-vazsprintf-gnu.c: New file, based on
tests/test-zsnprintf-gnu.h.
* modules/vazsprintf-gnu-tests: New file.
vazsprintf-gnu: New module.
* modules/vazsprintf-gnu: New file.
2024-06-25 Bruno Haible <br...@clisp.org>
zsprintf-gnu: Add tests.
* tests/test-zsprintf-gnu.c: New file.
* modules/zsprintf-gnu-tests: New file.
zsprintf-gnu: New module.
* modules/zsprintf-gnu: New file.
2024-06-25 Bruno Haible <br...@clisp.org>
vzsprintf-gnu: Add tests.
* tests/test-vzsprintf-gnu.c: New file.
* tests/test-zsprintf-gnu.h: New file, based on
tests/test-zsnprintf-gnu.h.
* modules/vzsprintf-gnu-tests: New file.
vzsprintf-gnu: New module.
* modules/vzsprintf-gnu: New file.
2024-06-25 Bruno Haible <br...@clisp.org>
zsnprintf-gnu: Add tests.
* tests/test-zsnprintf-gnu.c: New file.
* modules/zsnprintf-gnu-tests: New file.
zsnprintf-gnu: New module.
* modules/zsnprintf-gnu: New file.
2024-06-25 Bruno Haible <br...@clisp.org>
vzsnprintf-gnu: Add tests.
* tests/test-vzsnprintf-gnu.c: New file.
* tests/test-zsnprintf-gnu.h: New file, based on
tests/test-snprintf-gnu.h.
* modules/vzsnprintf-gnu-tests: New file.
vzsnprintf-gnu: New module.
* modules/vzsnprintf-gnu: New file.
>From 3b70d6b43286fedec9b8b92ba69e706db187c1f8 Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Tue, 25 Jun 2024 16:36:18 +0200
Subject: [PATCH 01/12] vzsnprintf-gnu: New module.
* modules/vzsnprintf-gnu: New file.
---
ChangeLog | 5 +++++
modules/vzsnprintf-gnu | 23 +++++++++++++++++++++++
2 files changed, 28 insertions(+)
create mode 100644 modules/vzsnprintf-gnu
diff --git a/ChangeLog b/ChangeLog
index 02fc3f35fa..2272ada314 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-06-25 Bruno Haible <br...@clisp.org>
+
+ vzsnprintf-gnu: New module.
+ * modules/vzsnprintf-gnu: New file.
+
2024-06-24 Bruno Haible <br...@clisp.org>
obstack-zprintf-posix: Add tests.
diff --git a/modules/vzsnprintf-gnu b/modules/vzsnprintf-gnu
new file mode 100644
index 0000000000..04c46a3cc3
--- /dev/null
+++ b/modules/vzsnprintf-gnu
@@ -0,0 +1,23 @@
+Description:
+vzsnprintf() function
+with POSIX compliant and GNU compatible format string interpretation
+
+Files:
+
+Depends-on:
+vzsnprintf-posix
+mixin/printf-gnu
+
+configure.ac:
+gl_PREREQ_VASNPRINTF_WITH_GNU_EXTRAS
+
+Makefile.am:
+
+Include:
+<stdio.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all
--
2.34.1
From b6fa7b47c363f799bcb4a65b34c1f63e8ee74f9c Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Tue, 25 Jun 2024 16:38:11 +0200
Subject: [PATCH 02/12] vzsnprintf-gnu: Add tests.
* tests/test-vzsnprintf-gnu.c: New file.
* tests/test-zsnprintf-gnu.h: New file, based on
tests/test-snprintf-gnu.h.
* modules/vzsnprintf-gnu-tests: New file.
---
ChangeLog | 6 +++++
modules/vzsnprintf-gnu-tests | 12 +++++++++
tests/test-vzsnprintf-gnu.c | 48 ++++++++++++++++++++++++++++++++++++
tests/test-zsnprintf-gnu.h | 37 +++++++++++++++++++++++++++
4 files changed, 103 insertions(+)
create mode 100644 modules/vzsnprintf-gnu-tests
create mode 100644 tests/test-vzsnprintf-gnu.c
create mode 100644 tests/test-zsnprintf-gnu.h
diff --git a/ChangeLog b/ChangeLog
index 2272ada314..2aafab3277 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2024-06-25 Bruno Haible <br...@clisp.org>
+ vzsnprintf-gnu: Add tests.
+ * tests/test-vzsnprintf-gnu.c: New file.
+ * tests/test-zsnprintf-gnu.h: New file, based on
+ tests/test-snprintf-gnu.h.
+ * modules/vzsnprintf-gnu-tests: New file.
+
vzsnprintf-gnu: New module.
* modules/vzsnprintf-gnu: New file.
diff --git a/modules/vzsnprintf-gnu-tests b/modules/vzsnprintf-gnu-tests
new file mode 100644
index 0000000000..caf3f4ee8d
--- /dev/null
+++ b/modules/vzsnprintf-gnu-tests
@@ -0,0 +1,12 @@
+Files:
+tests/test-vzsnprintf-gnu.c
+tests/test-zsnprintf-gnu.h
+tests/macros.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-vzsnprintf-gnu
+check_PROGRAMS += test-vzsnprintf-gnu
diff --git a/tests/test-vzsnprintf-gnu.c b/tests/test-vzsnprintf-gnu.c
new file mode 100644
index 0000000000..65e893c050
--- /dev/null
+++ b/tests/test-vzsnprintf-gnu.c
@@ -0,0 +1,48 @@
+/* Test of POSIX and GNU 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-gnu.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-gnu.h b/tests/test-zsnprintf-gnu.h
new file mode 100644
index 0000000000..0e28c588ab
--- /dev/null
+++ b/tests/test-zsnprintf-gnu.h
@@ -0,0 +1,37 @@
+/* Test of POSIX and GNU 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. */
+
+static void
+test_function (ptrdiff_t (*my_zsnprintf) (char *, size_t, const char *, ...))
+{
+ char result[5000];
+
+ /* Test the support of the 'B' conversion specifier for binary output of
+ integers. */
+
+ { /* This test would fail on all platforms other than glibc ≥ 2.35. */
+ ptrdiff_t retval =
+ my_zsnprintf (result, sizeof (result), "%#B %d", 12345, 33, 44, 55);
+ ASSERT (strcmp (result, "0B11000000111001 33") == 0);
+ ASSERT (retval == strlen (result));
+ }
+}
--
2.34.1
>From 3458ffccc6db6f519fece010d8176bdeff59e890 Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Tue, 25 Jun 2024 16:38:52 +0200
Subject: [PATCH 03/12] zsnprintf-gnu: New module.
* modules/zsnprintf-gnu: New file.
---
ChangeLog | 5 +++++
modules/zsnprintf-gnu | 23 +++++++++++++++++++++++
2 files changed, 28 insertions(+)
create mode 100644 modules/zsnprintf-gnu
diff --git a/ChangeLog b/ChangeLog
index 2aafab3277..c6b6b38295 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-06-25 Bruno Haible <br...@clisp.org>
+
+ zsnprintf-gnu: New module.
+ * modules/zsnprintf-gnu: New file.
+
2024-06-25 Bruno Haible <br...@clisp.org>
vzsnprintf-gnu: Add tests.
diff --git a/modules/zsnprintf-gnu b/modules/zsnprintf-gnu
new file mode 100644
index 0000000000..d0bd55792d
--- /dev/null
+++ b/modules/zsnprintf-gnu
@@ -0,0 +1,23 @@
+Description:
+zsnprintf() function
+with POSIX compliant and GNU compatible format string interpretation
+
+Files:
+
+Depends-on:
+zsnprintf-posix
+mixin/printf-gnu
+
+configure.ac:
+gl_PREREQ_VASNPRINTF_WITH_GNU_EXTRAS
+
+Makefile.am:
+
+Include:
+<stdio.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all
--
2.34.1
>From fd50fbc48af21d926db97168395ffe9c7ed0b31d Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Tue, 25 Jun 2024 16:39:20 +0200
Subject: [PATCH 04/12] zsnprintf-gnu: Add tests.
* tests/test-zsnprintf-gnu.c: New file.
* modules/zsnprintf-gnu-tests: New file.
---
ChangeLog | 4 ++++
modules/zsnprintf-gnu-tests | 12 ++++++++++++
tests/test-zsnprintf-gnu.c | 35 +++++++++++++++++++++++++++++++++++
3 files changed, 51 insertions(+)
create mode 100644 modules/zsnprintf-gnu-tests
create mode 100644 tests/test-zsnprintf-gnu.c
diff --git a/ChangeLog b/ChangeLog
index c6b6b38295..3365ab6997 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2024-06-25 Bruno Haible <br...@clisp.org>
+ zsnprintf-gnu: Add tests.
+ * tests/test-zsnprintf-gnu.c: New file.
+ * modules/zsnprintf-gnu-tests: New file.
+
zsnprintf-gnu: New module.
* modules/zsnprintf-gnu: New file.
diff --git a/modules/zsnprintf-gnu-tests b/modules/zsnprintf-gnu-tests
new file mode 100644
index 0000000000..6fd7c1c83f
--- /dev/null
+++ b/modules/zsnprintf-gnu-tests
@@ -0,0 +1,12 @@
+Files:
+tests/test-zsnprintf-gnu.c
+tests/test-zsnprintf-gnu.h
+tests/macros.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-zsnprintf-gnu
+check_PROGRAMS += test-zsnprintf-gnu
diff --git a/tests/test-zsnprintf-gnu.c b/tests/test-zsnprintf-gnu.c
new file mode 100644
index 0000000000..efd4f5b53f
--- /dev/null
+++ b/tests/test-zsnprintf-gnu.c
@@ -0,0 +1,35 @@
+/* Test of POSIX and GNU 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-gnu.h"
+
+int
+main (int argc, char *argv[])
+{
+ test_function (zsnprintf);
+ return test_exit_status;
+}
--
2.34.1
>From b3ac00b49070d630fe42db089f1a6978f934ee19 Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Tue, 25 Jun 2024 16:39:59 +0200
Subject: [PATCH 05/12] vzsprintf-gnu: New module.
* modules/vzsprintf-gnu: New file.
---
ChangeLog | 5 +++++
modules/vzsprintf-gnu | 23 +++++++++++++++++++++++
2 files changed, 28 insertions(+)
create mode 100644 modules/vzsprintf-gnu
diff --git a/ChangeLog b/ChangeLog
index 3365ab6997..1195557131 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-06-25 Bruno Haible <br...@clisp.org>
+
+ vzsprintf-gnu: New module.
+ * modules/vzsprintf-gnu: New file.
+
2024-06-25 Bruno Haible <br...@clisp.org>
zsnprintf-gnu: Add tests.
diff --git a/modules/vzsprintf-gnu b/modules/vzsprintf-gnu
new file mode 100644
index 0000000000..3241ea5235
--- /dev/null
+++ b/modules/vzsprintf-gnu
@@ -0,0 +1,23 @@
+Description:
+vzsprintf() function
+with POSIX compliant and GNU compatible format string interpretation
+
+Files:
+
+Depends-on:
+vzsprintf-posix
+mixin/printf-gnu
+
+configure.ac:
+gl_PREREQ_VASNPRINTF_WITH_GNU_EXTRAS
+
+Makefile.am:
+
+Include:
+<stdio.h>
+
+License:
+LGPL
+
+Maintainer:
+all
--
2.34.1
From 80979ac249eaae1d6125a9514f89b8dc7e393597 Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Tue, 25 Jun 2024 16:40:28 +0200
Subject: [PATCH 06/12] vzsprintf-gnu: Add tests.
* tests/test-vzsprintf-gnu.c: New file.
* tests/test-zsprintf-gnu.h: New file, based on
tests/test-zsnprintf-gnu.h.
* modules/vzsprintf-gnu-tests: New file.
---
ChangeLog | 6 +++++
modules/vzsprintf-gnu-tests | 12 ++++++++++
tests/test-vzsprintf-gnu.c | 48 +++++++++++++++++++++++++++++++++++++
tests/test-zsprintf-gnu.h | 37 ++++++++++++++++++++++++++++
4 files changed, 103 insertions(+)
create mode 100644 modules/vzsprintf-gnu-tests
create mode 100644 tests/test-vzsprintf-gnu.c
create mode 100644 tests/test-zsprintf-gnu.h
diff --git a/ChangeLog b/ChangeLog
index 1195557131..5c1ab2b9e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2024-06-25 Bruno Haible <br...@clisp.org>
+ vzsprintf-gnu: Add tests.
+ * tests/test-vzsprintf-gnu.c: New file.
+ * tests/test-zsprintf-gnu.h: New file, based on
+ tests/test-zsnprintf-gnu.h.
+ * modules/vzsprintf-gnu-tests: New file.
+
vzsprintf-gnu: New module.
* modules/vzsprintf-gnu: New file.
diff --git a/modules/vzsprintf-gnu-tests b/modules/vzsprintf-gnu-tests
new file mode 100644
index 0000000000..38bf0381ad
--- /dev/null
+++ b/modules/vzsprintf-gnu-tests
@@ -0,0 +1,12 @@
+Files:
+tests/test-vzsprintf-gnu.c
+tests/test-zsprintf-gnu.h
+tests/macros.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-vzsprintf-gnu
+check_PROGRAMS += test-vzsprintf-gnu
diff --git a/tests/test-vzsprintf-gnu.c b/tests/test-vzsprintf-gnu.c
new file mode 100644
index 0000000000..8920fa1ca5
--- /dev/null
+++ b/tests/test-vzsprintf-gnu.c
@@ -0,0 +1,48 @@
+/* Test of POSIX and GNU 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-gnu.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-gnu.h b/tests/test-zsprintf-gnu.h
new file mode 100644
index 0000000000..d33a18f6f4
--- /dev/null
+++ b/tests/test-zsprintf-gnu.h
@@ -0,0 +1,37 @@
+/* Test of POSIX and GNU 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. */
+
+static void
+test_function (ptrdiff_t (*my_zsprintf) (char *, const char *, ...))
+{
+ char result[5000];
+
+ /* Test the support of the 'B' conversion specifier for binary output of
+ integers. */
+
+ { /* This test would fail on all platforms other than glibc ≥ 2.35. */
+ ptrdiff_t retval =
+ my_zsprintf (result, "%#B %d", 12345, 33, 44, 55);
+ ASSERT (strcmp (result, "0B11000000111001 33") == 0);
+ ASSERT (retval == strlen (result));
+ }
+}
--
2.34.1
>From 00f13ff31a2f0979445c813741db6913cbc135b3 Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Tue, 25 Jun 2024 16:41:03 +0200
Subject: [PATCH 07/12] zsprintf-gnu: New module.
* modules/zsprintf-gnu: New file.
---
ChangeLog | 5 +++++
modules/zsprintf-gnu | 23 +++++++++++++++++++++++
2 files changed, 28 insertions(+)
create mode 100644 modules/zsprintf-gnu
diff --git a/ChangeLog b/ChangeLog
index 5c1ab2b9e4..0013853b49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-06-25 Bruno Haible <br...@clisp.org>
+
+ zsprintf-gnu: New module.
+ * modules/zsprintf-gnu: New file.
+
2024-06-25 Bruno Haible <br...@clisp.org>
vzsprintf-gnu: Add tests.
diff --git a/modules/zsprintf-gnu b/modules/zsprintf-gnu
new file mode 100644
index 0000000000..a530b34303
--- /dev/null
+++ b/modules/zsprintf-gnu
@@ -0,0 +1,23 @@
+Description:
+zsprintf() function
+with POSIX compliant and GNU compatible format string interpretation
+
+Files:
+
+Depends-on:
+zsprintf-posix
+mixin/printf-gnu
+
+configure.ac:
+gl_PREREQ_VASNPRINTF_WITH_GNU_EXTRAS
+
+Makefile.am:
+
+Include:
+<stdio.h>
+
+License:
+LGPL
+
+Maintainer:
+all
--
2.34.1
>From fc2324d59ee7ea3148861616f89b968bb260222c Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Tue, 25 Jun 2024 16:41:31 +0200
Subject: [PATCH 08/12] zsprintf-gnu: Add tests.
* tests/test-zsprintf-gnu.c: New file.
* modules/zsprintf-gnu-tests: New file.
---
ChangeLog | 4 ++++
modules/zsprintf-gnu-tests | 12 ++++++++++++
tests/test-zsprintf-gnu.c | 36 ++++++++++++++++++++++++++++++++++++
3 files changed, 52 insertions(+)
create mode 100644 modules/zsprintf-gnu-tests
create mode 100644 tests/test-zsprintf-gnu.c
diff --git a/ChangeLog b/ChangeLog
index 0013853b49..5530ba91de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2024-06-25 Bruno Haible <br...@clisp.org>
+ zsprintf-gnu: Add tests.
+ * tests/test-zsprintf-gnu.c: New file.
+ * modules/zsprintf-gnu-tests: New file.
+
zsprintf-gnu: New module.
* modules/zsprintf-gnu: New file.
diff --git a/modules/zsprintf-gnu-tests b/modules/zsprintf-gnu-tests
new file mode 100644
index 0000000000..7db1e58043
--- /dev/null
+++ b/modules/zsprintf-gnu-tests
@@ -0,0 +1,12 @@
+Files:
+tests/test-zsprintf-gnu.c
+tests/test-zsprintf-gnu.h
+tests/macros.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-zsprintf-gnu
+check_PROGRAMS += test-zsprintf-gnu
diff --git a/tests/test-zsprintf-gnu.c b/tests/test-zsprintf-gnu.c
new file mode 100644
index 0000000000..8f95471d13
--- /dev/null
+++ b/tests/test-zsprintf-gnu.c
@@ -0,0 +1,36 @@
+/* Test of POSIX and GNU 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-gnu.h"
+
+int
+main (int argc, char *argv[])
+{
+ test_function (zsprintf);
+ return test_exit_status;
+}
--
2.34.1
>From 0827eeb4c2f5e775e51a774b09ba00554089b203 Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Tue, 25 Jun 2024 16:42:04 +0200
Subject: [PATCH 09/12] vazsprintf-gnu: New module.
* modules/vazsprintf-gnu: New file.
---
ChangeLog | 5 +++++
modules/vazsprintf-gnu | 23 +++++++++++++++++++++++
2 files changed, 28 insertions(+)
create mode 100644 modules/vazsprintf-gnu
diff --git a/ChangeLog b/ChangeLog
index 5530ba91de..e1b41b8e08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-06-25 Bruno Haible <br...@clisp.org>
+
+ vazsprintf-gnu: New module.
+ * modules/vazsprintf-gnu: New file.
+
2024-06-25 Bruno Haible <br...@clisp.org>
zsprintf-gnu: Add tests.
diff --git a/modules/vazsprintf-gnu b/modules/vazsprintf-gnu
new file mode 100644
index 0000000000..ce3c0e1788
--- /dev/null
+++ b/modules/vazsprintf-gnu
@@ -0,0 +1,23 @@
+Description:
+azsprintf() and vazsprintf() functions
+with POSIX compliant and GNU compatible format string interpretation
+
+Files:
+
+Depends-on:
+vazsprintf-posix
+mixin/printf-gnu
+
+configure.ac:
+gl_PREREQ_VASNPRINTF_WITH_GNU_EXTRAS
+
+Makefile.am:
+
+Include:
+<stdio.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all
--
2.34.1
From 56f77044cfa5591c4c8b5bace4d01e0755a58f86 Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Tue, 25 Jun 2024 16:42:30 +0200
Subject: [PATCH 10/12] vazsprintf-gnu: Add tests.
* tests/test-vazsprintf-gnu.c: New file, based on
tests/test-zsnprintf-gnu.h.
* modules/vazsprintf-gnu-tests: New file.
---
ChangeLog | 5 +++
modules/vazsprintf-gnu-tests | 11 +++++
tests/test-vazsprintf-gnu.c | 83 ++++++++++++++++++++++++++++++++++++
3 files changed, 99 insertions(+)
create mode 100644 modules/vazsprintf-gnu-tests
create mode 100644 tests/test-vazsprintf-gnu.c
diff --git a/ChangeLog b/ChangeLog
index e1b41b8e08..60f37baf05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2024-06-25 Bruno Haible <br...@clisp.org>
+ vazsprintf-gnu: Add tests.
+ * tests/test-vazsprintf-gnu.c: New file, based on
+ tests/test-zsnprintf-gnu.h.
+ * modules/vazsprintf-gnu-tests: New file.
+
vazsprintf-gnu: New module.
* modules/vazsprintf-gnu: New file.
diff --git a/modules/vazsprintf-gnu-tests b/modules/vazsprintf-gnu-tests
new file mode 100644
index 0000000000..33cb15cd56
--- /dev/null
+++ b/modules/vazsprintf-gnu-tests
@@ -0,0 +1,11 @@
+Files:
+tests/test-vazsprintf-gnu.c
+tests/macros.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-vazsprintf-gnu
+check_PROGRAMS += test-vazsprintf-gnu
diff --git a/tests/test-vazsprintf-gnu.c b/tests/test-vazsprintf-gnu.c
new file mode 100644
index 0000000000..cd31b378ce
--- /dev/null
+++ b/tests/test-vazsprintf-gnu.c
@@ -0,0 +1,83 @@
+/* Test of POSIX and GNU 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"
+
+static void
+test_function (ptrdiff_t (*my_azsprintf) (char **, const char *, ...))
+{
+ char result[5000];
+
+ /* Test the support of the 'B' conversion specifier for binary output of
+ integers. */
+
+ { /* This test would fail on all platforms other than glibc ≥ 2.35. */
+ char *result;
+ ptrdiff_t retval =
+ my_azsprintf (&result, "%#B %d", 12345, 33, 44, 55);
+ ASSERT (result != NULL);
+ ASSERT (strcmp (result, "0B11000000111001 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 0dd7d57f7f2169a89b3b6872c3c65610591cc9ae Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Tue, 25 Jun 2024 16:42:56 +0200
Subject: [PATCH 11/12] obstack-zprintf-gnu: New module.
* modules/obstack-zprintf-gnu: New file.
---
ChangeLog | 5 +++++
modules/obstack-zprintf-gnu | 23 +++++++++++++++++++++++
2 files changed, 28 insertions(+)
create mode 100644 modules/obstack-zprintf-gnu
diff --git a/ChangeLog b/ChangeLog
index 60f37baf05..fcff06d2f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-06-25 Bruno Haible <br...@clisp.org>
+
+ obstack-zprintf-gnu: New module.
+ * modules/obstack-zprintf-gnu: New file.
+
2024-06-25 Bruno Haible <br...@clisp.org>
vazsprintf-gnu: Add tests.
diff --git a/modules/obstack-zprintf-gnu b/modules/obstack-zprintf-gnu
new file mode 100644
index 0000000000..86c870320d
--- /dev/null
+++ b/modules/obstack-zprintf-gnu
@@ -0,0 +1,23 @@
+Description:
+Formatted printing into an obstack (without INT_MAX limitation)
+with POSIX compliant and GNU compatible format string interpretation
+
+Files:
+
+Depends-on:
+obstack-zprintf-posix
+mixin/printf-gnu
+
+configure.ac:
+gl_PREREQ_VASNPRINTF_WITH_GNU_EXTRAS
+
+Makefile.am:
+
+Include:
+<stdio.h>
+
+License:
+GPL
+
+Maintainer:
+all
--
2.34.1
From 0cee72af55afea661bf4bd8bbb704c85841e1ed1 Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Tue, 25 Jun 2024 16:43:20 +0200
Subject: [PATCH 12/12] obstack-zprintf-gnu: Add tests.
* tests/test-obstack-zprintf-gnu.c: New file, based on
tests/test-vazsprintf-gnu.c.
* modules/obstack-zprintf-gnu-tests: New file.
---
ChangeLog | 5 ++
modules/obstack-zprintf-gnu-tests | 12 ++++
tests/test-obstack-zprintf-gnu.c | 92 +++++++++++++++++++++++++++++++
3 files changed, 109 insertions(+)
create mode 100644 modules/obstack-zprintf-gnu-tests
create mode 100644 tests/test-obstack-zprintf-gnu.c
diff --git a/ChangeLog b/ChangeLog
index fcff06d2f9..48274cadbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2024-06-25 Bruno Haible <br...@clisp.org>
+ obstack-zprintf-gnu: Add tests.
+ * tests/test-obstack-zprintf-gnu.c: New file, based on
+ tests/test-vazsprintf-gnu.c.
+ * modules/obstack-zprintf-gnu-tests: New file.
+
obstack-zprintf-gnu: New module.
* modules/obstack-zprintf-gnu: New file.
diff --git a/modules/obstack-zprintf-gnu-tests b/modules/obstack-zprintf-gnu-tests
new file mode 100644
index 0000000000..e5906d35db
--- /dev/null
+++ b/modules/obstack-zprintf-gnu-tests
@@ -0,0 +1,12 @@
+Files:
+tests/test-obstack-zprintf-gnu.c
+tests/macros.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-obstack-zprintf-gnu
+check_PROGRAMS += test-obstack-zprintf-gnu
+test_obstack_zprintf_gnu_LDADD = $(LDADD) @LIBINTL@
diff --git a/tests/test-obstack-zprintf-gnu.c b/tests/test-obstack-zprintf-gnu.c
new file mode 100644
index 0000000000..cb06f24c84
--- /dev/null
+++ b/tests/test-obstack-zprintf-gnu.c
@@ -0,0 +1,92 @@
+/* Test of POSIX and GNU 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"
+
+#define obstack_chunk_alloc malloc
+#define obstack_chunk_free free
+
+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 'B' conversion specifier for binary output of
+ integers. */
+
+ { /* This test would fail on all platforms other than glibc ≥ 2.35. */
+ ptrdiff_t len =
+ my_obstack_zprintf (&obs, "%#B %d", 12345, 33, 44, 55);
+ ASSERT (len >= 0);
+ char *result = obstack_finish (&obs);
+ ASSERT (RESULT_EQ ("0B11000000111001 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
