From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 23 Sep 2013 15:01:53 +0000 (+0200)
Subject: printf-hook: Write to output stream instead of the FD directly when using Vstr
X-Git-Tag: 5.1.1dr4~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed72f2d65e586a9168b9c461ba7f14d3284ad309;p=thirdparty%2Fstrongswan.git

printf-hook: Write to output stream instead of the FD directly when using Vstr

This avoids problems when other stdio functions are used (fputs,
fwrite) as writes via Vstr/FD were always unbuffered.
---

diff --git a/src/libstrongswan/utils/printf_hook.c b/src/libstrongswan/utils/printf_hook.c
index f030f45c8d..aabfdc53fa 100644
--- a/src/libstrongswan/utils/printf_hook.c
+++ b/src/libstrongswan/utils/printf_hook.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Tobias Brunner
+ * Copyright (C) 2009-2013 Tobias Brunner
  * Copyright (C) 2006-2008 Martin Willi
  * Hochschule fuer Technik Rapperswil
  *
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
+#include <sys/uio.h>
 
 typedef struct private_printf_hook_t private_printf_hook_t;
 typedef struct printf_hook_handler_t printf_hook_handler_t;
@@ -300,23 +301,23 @@ int vstr_wrapper_asprintf(char **str, const char *format, ...)
 	va_end(args);
 	return written;
 }
-static inline int vstr_wrapper_vprintf_internal(Vstr_conf *conf, int fd,
+static inline int vstr_wrapper_vprintf_internal(Vstr_conf *conf, FILE *stream,
 												const char *format,
 												va_list args)
 {
-	int written;
+	struct iovec *iov;
+	int iovcnt, written = 0;
 	Vstr_base *s = vstr_make_base(conf);
 	vstr_add_vfmt(s, 0, format, args);
-	written = s->len;
-	while (s->len)
+	if (vstr_export_iovec_ptr_all(s, &iov, &iovcnt))
 	{
-		if (!vstr_sc_write_fd(s, 1, s->len, fd, NULL))
+		while (iovcnt--)
 		{
-			if (errno != EAGAIN && errno != EINTR)
+			if (iov->iov_base)
 			{
-				written -= s->len;
-				break;
+				written += fwrite(iov->iov_base, 1, iov->iov_len, stream);
 			}
+			iov++;
 		}
 	}
 	vstr_free_base(s);
@@ -327,7 +328,7 @@ int vstr_wrapper_vprintf(const char *format, va_list args)
 	Vstr_conf *conf = get_vstr_conf();
 	if (conf)
 	{
-		return vstr_wrapper_vprintf_internal(conf, STDOUT_FILENO, format, args);
+		return vstr_wrapper_vprintf_internal(conf, stdout, format, args);
 	}
 	return vprintf(format, args);
 }
@@ -336,8 +337,7 @@ int vstr_wrapper_vfprintf(FILE *stream, const char *format, va_list args)
 	Vstr_conf *conf = get_vstr_conf();
 	if (conf)
 	{
-		return vstr_wrapper_vprintf_internal(conf, fileno(stream), format,
-											 args);
+		return vstr_wrapper_vprintf_internal(conf, stream, format, args);
 	}
 	return vfprintf(stream, format, args);
 }