Imported Upstream version 5.0.1

1 files changed, 27 insertions, 15 deletions

diff --git a/src/libstrongswan/printf_hook.c b/src/libstrongswan/printf_hook.c
index c3b5191fd..6e51aa4c3 100644
--- a/src/libstrongswan/printf_hook.c
+++ b/src/libstrongswan/printf_hook.c
@@ -86,21 +86,18 @@ static printf_hook_handler_t *printf_hooks[NUM_HANDLERS];
 static int custom_print(FILE *stream, const struct printf_info *info,
 						const void *const *args)
 {
-	int written;
-	char buf[PRINTF_BUF_LEN];
 	printf_hook_spec_t spec;
 	printf_hook_handler_t *handler = printf_hooks[SPEC_TO_INDEX(info->spec)];
+	printf_hook_data_t data = {
+		.stream = stream,
+	};
 
 	spec.hash = info->alt;
+	spec.plus = info->showsign;
 	spec.minus = info->left;
 	spec.width = info->width;
 
-	written = handler->hook(buf, sizeof(buf), &spec, args);
-	if (written > 0)
-	{
-		ignore_result(fwrite(buf, 1, written, stream));
-	}
-	return written;
+	return handler->hook(&data, &spec, args);
 }
 
 /**
@@ -145,11 +142,14 @@ static int custom_arginfo(const struct printf_info *info, size_t n, int *argtype
  */
 static int custom_fmt_cb(Vstr_base *base, size_t pos, Vstr_fmt_spec *fmt_spec)
 {
-	int i, written;
-	char buf[PRINTF_BUF_LEN];
+	int i;
 	const void *args[ARGS_MAX];
 	printf_hook_spec_t spec;
 	printf_hook_handler_t *handler = printf_hooks[SPEC_TO_INDEX(fmt_spec->name[0])];
+	printf_hook_data_t data = {
+		.base = base,
+		.pos = pos,
+	};
 
 	for (i = 0; i < handler->numargs; i++)
 	{
@@ -165,14 +165,11 @@ static int custom_fmt_cb(Vstr_base *base, size_t pos, Vstr_fmt_spec *fmt_spec)
 	}
 
 	spec.hash = fmt_spec->fmt_hash;
+	spec.plus = fmt_spec->fmt_plus;
 	spec.minus = fmt_spec->fmt_minus;
 	spec.width = fmt_spec->fmt_field_width;
 
-	written = handler->hook(buf, sizeof(buf), &spec, args);
-	if (written > 0)
-	{
-		vstr_add_buf(base, pos, buf, written);
-	}
+	handler->hook(&data, &spec, args);
 	return 1;
 }
 
@@ -241,6 +238,21 @@ static inline Vstr_conf *get_vstr_conf()
 }
 
 /**
+ * Described in header
+ */
+size_t vstr_print_in_hook(struct Vstr_base *base, size_t pos, const char *fmt,
+						  ...)
+{
+	va_list args;
+	int written;
+
+	va_start(args, fmt);
+	written = vstr_add_vfmt(base, pos, fmt, args);
+	va_end(args);
+	return written;
+}
+
+/**
  * Wrapper functions for printf and alike
  */
 int vstr_wrapper_printf(const char *format, ...)