aboutsummaryrefslogtreecommitdiff
path: root/stdio-common
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2022-12-19 18:56:54 +0100
committerFlorian Weimer <fweimer@redhat.com>2022-12-19 18:56:54 +0100
commitc7bf2e99cafbd8970f81c38d6f32842cc7846421 (patch)
tree6df9a7855896e846ccd8fe8db570c13ad2895018 /stdio-common
parent659fe9fdd14b0772f4e9722b751b9b010665e053 (diff)
downloadglibc-c7bf2e99cafbd8970f81c38d6f32842cc7846421.zip
glibc-c7bf2e99cafbd8970f81c38d6f32842cc7846421.tar.gz
glibc-c7bf2e99cafbd8970f81c38d6f32842cc7846421.tar.bz2
stdio-common: Add __printf_function_invoke
And __wprintf_function_invoke. These functions will be used to to call registered printf specifier callbacks on printf buffers after vfprintf and vfwprintf have been converted to buffers. The new implementation avoids alloca/variable length arrays. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/Makefile2
-rw-r--r--stdio-common/Xprintf_function_invoke.c58
-rw-r--r--stdio-common/printf_function_invoke.c22
-rw-r--r--stdio-common/wprintf_function_invoke.c22
4 files changed, 104 insertions, 0 deletions
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index 120d66e..6e6da09 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -63,6 +63,7 @@ routines := \
printf_buffer_write \
printf_fp \
printf_fphex \
+ printf_function_invoke \
printf_size \
psiginfo \
psignal \
@@ -101,6 +102,7 @@ routines := \
wprintf_buffer_puts_1 \
wprintf_buffer_to_file \
wprintf_buffer_write \
+ wprintf_function_invoke \
# routines
aux := \
diff --git a/stdio-common/Xprintf_function_invoke.c b/stdio-common/Xprintf_function_invoke.c
new file mode 100644
index 0000000..908d02b
--- /dev/null
+++ b/stdio-common/Xprintf_function_invoke.c
@@ -0,0 +1,58 @@
+/* Invoke a printf specifier handler. Generic version.
+ Copyright (C) 1991-2022 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <array_length.h>
+
+int
+Xprintf (function_invoke) (void *buf,
+ printf_function callback,
+ union printf_arg *args_value,
+ size_t ndata_args,
+ struct printf_info *info)
+{
+ /* Most custom specifiers expect just one argument. Use the heap
+ for larger argument arrays. */
+ const void *onstack_args[4];
+ const void **args;
+ if (ndata_args <= array_length (onstack_args))
+ args = onstack_args;
+ else
+ {
+ args = calloc (ndata_args, sizeof (*args));
+ if (args == NULL)
+ return -1;
+ }
+
+ for (unsigned int i = 0; i < ndata_args; ++i)
+ args[i] = &args_value[i];
+
+ struct Xprintf (buffer_as_file) s;
+ Xprintf (buffer_as_file_init) (&s, buf);
+
+ /* Call the function. */
+ int done = callback (Xprintf (buffer_as_file_get) (&s), info, args);
+
+ if (!Xprintf (buffer_as_file_terminate) (&s))
+ done = -1;
+
+ if (args != onstack_args)
+ free (args);
+
+ /* Potential error from the callback function. */
+ return done;
+}
diff --git a/stdio-common/printf_function_invoke.c b/stdio-common/printf_function_invoke.c
new file mode 100644
index 0000000..8919b89
--- /dev/null
+++ b/stdio-common/printf_function_invoke.c
@@ -0,0 +1,22 @@
+/* Invoke a printf specifier handler. Multibyte version.
+ Copyright (C) 2022 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <printf.h>
+#include <printf_buffer_as_file.h>
+#include "printf_buffer-char.h"
+#include "Xprintf_function_invoke.c"
diff --git a/stdio-common/wprintf_function_invoke.c b/stdio-common/wprintf_function_invoke.c
new file mode 100644
index 0000000..29a6b4e
--- /dev/null
+++ b/stdio-common/wprintf_function_invoke.c
@@ -0,0 +1,22 @@
+/* Invoke a printf specifier handler. Wide version.
+ Copyright (C) 2022 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <printf.h>
+#include <printf_buffer_as_file.h>
+#include "printf_buffer-wchar_t.h"
+#include "Xprintf_function_invoke.c"