Imported Upstream version 5.0.1

1 files changed, 108 insertions, 18 deletions

diff --git a/src/libstrongswan/printf_hook.h b/src/libstrongswan/printf_hook.h
index 11fd66ce9..7d3f23bce 100644
--- a/src/libstrongswan/printf_hook.h
+++ b/src/libstrongswan/printf_hook.h
@@ -24,9 +24,17 @@
 
 typedef struct printf_hook_t printf_hook_t;
 typedef struct printf_hook_spec_t printf_hook_spec_t;
+typedef struct printf_hook_data_t printf_hook_data_t;
 typedef enum printf_hook_argtype_t printf_hook_argtype_t;
 
 #if !defined(USE_VSTR) && \
+	!defined(HAVE_PRINTF_FUNCTION) && \
+	!defined(HAVE_PRINTF_SPECIFIER)
+/* assume newer glibc register_printf_specifier if none given */
+#define HAVE_PRINTF_SPECIFIER
+#endif
+
+#if !defined(USE_VSTR) && \
 	(defined(HAVE_PRINTF_FUNCTION) || defined(HAVE_PRINTF_SPECIFIER))
 
 #include <stdio.h>
@@ -38,6 +46,29 @@ enum printf_hook_argtype_t {
 	PRINTF_HOOK_ARGTYPE_POINTER = PA_POINTER,
 };
 
+/**
+ * Data to pass to a printf hook.
+ */
+struct printf_hook_data_t {
+
+	/**
+	 * Output FILE stream
+	 */
+	FILE *stream;;
+};
+
+/**
+ * Helper macro to be used in printf hook callbacks.
+ */
+#define print_in_hook(data, fmt, ...) ({\
+	ssize_t _written = fprintf(data->stream, fmt, ##__VA_ARGS__);\
+	if (_written < 0)\
+	{\
+		_written = 0;\
+	}\
+	_written;\
+})
+
 #else
 
 #include <vstr.h>
@@ -66,6 +97,37 @@ int vstr_wrapper_vsprintf(char *str, const char *format, va_list ap);
 int vstr_wrapper_vsnprintf(char *str, size_t size, const char *format, va_list ap);
 int vstr_wrapper_vasprintf(char **str, const char *format, va_list ap);
 
+#ifdef printf
+#undef printf
+#endif
+#ifdef fprintf
+#undef fprintf
+#endif
+#ifdef sprintf
+#undef sprintf
+#endif
+#ifdef snprintf
+#undef snprintf
+#endif
+#ifdef asprintf
+#undef asprintf
+#endif
+#ifdef vprintf
+#undef vprintf
+#endif
+#ifdef vfprintf
+#undef vfprintf
+#endif
+#ifdef vsprintf
+#undef vsprintf
+#endif
+#ifdef vsnprintf
+#undef vsnprintf
+#endif
+#ifdef vasprintf
+#undef vasprintf
+#endif
+
 #define printf vstr_wrapper_printf
 #define fprintf vstr_wrapper_fprintf
 #define sprintf vstr_wrapper_sprintf
@@ -78,36 +140,59 @@ int vstr_wrapper_vasprintf(char **str, const char *format, va_list ap);
 #define vsnprintf vstr_wrapper_vsnprintf
 #define vasprintf vstr_wrapper_vasprintf
 
-#endif
+/**
+ * Data to pass to a printf hook.
+ */
+struct printf_hook_data_t {
+
+	/**
+	 * Base to append printf to
+	 */
+	Vstr_base *base;
+
+	/**
+	 * Position in base to write to
+	 */
+	size_t pos;
+};
 
 /**
- * Callback function type for printf hooks.
+ * Wrapper around vstr_add_vfmt(), avoids having to link all users of
+ * print_in_hook() against libvstr.
  *
- * @param dst		destination buffer
- * @param len		length of the buffer
- * @param spec		format specifier
- * @param args		arguments array
+ * @param base		Vstr_string to add string to
+ * @param pos		position to write to
+ * @param fmt		format string
+ * @param ...		arguments
  * @return			number of characters written
  */
-typedef int (*printf_hook_function_t)(char *dst, size_t len,
-									  printf_hook_spec_t *spec,
-									  const void *const *args);
+size_t vstr_print_in_hook(struct Vstr_base *base, size_t pos, const char *fmt,
+						  ...);
 
 /**
  * Helper macro to be used in printf hook callbacks.
- * buf and buflen get modified.
  */
-#define print_in_hook(buf, buflen, fmt, ...) ({\
-	int _written = snprintf(buf, buflen, fmt, ##__VA_ARGS__);\
-	if (_written < 0 || _written >= buflen)\
-	{\
-		_written = buflen - 1;\
-	}\
-	buf += _written;\
-	buflen -= _written;\
+#define print_in_hook(data, fmt, ...) ({\
+	size_t _written; \
+	_written = vstr_print_in_hook(data->base, data->pos, fmt, ##__VA_ARGS__);\
+	data->pos += _written;\
 	_written;\
 })
 
+#endif
+
+/**
+ * Callback function type for printf hooks.
+ *
+ * @param data		hook data, to pass to print_in_hook()
+ * @param spec		format specifier
+ * @param args		arguments array
+ * @return			number of characters written
+ */
+typedef int (*printf_hook_function_t)(printf_hook_data_t *data,
+									  printf_hook_spec_t *spec,
+									  const void *const *args);
+
 /**
  * Properties of the format specifier
  */
@@ -123,6 +208,11 @@ struct printf_hook_spec_t {
 	int minus;
 
 	/**
+	 * TRUE if a '+' was used in the format specifier
+	 */
+	int plus;
+
+	/**
 	 * The width as given in the format specifier.
 	 */
 	int width;