denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This avoids problems when other stdio functions are used (fputs,
fwrite) as writes via Vstr/FD were always unbuffered.
This commit is contained in:
Tobias Brunner
2013-09-24 08:44:00 +02:00
parent c17cbfdb72
commit ed72f2d65e
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/utils/printf_hook.c
+12 -12
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2009 Tobias Brunner * Copyright (C) 2009-2013 Tobias Brunner
* Copyright (C) 2006-2008 Martin Willi * Copyright (C) 2006-2008 Martin Willi
* Hochschule fuer Technik Rapperswil * Hochschule fuer Technik Rapperswil
* *
@@ -22,6 +22,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#include <string.h> #include <string.h>
#include <sys/uio.h>
typedef struct private_printf_hook_t private_printf_hook_t; typedef struct private_printf_hook_t private_printf_hook_t;
typedef struct printf_hook_handler_t printf_hook_handler_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); va_end(args);
return written; 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, const char *format,
va_list args) va_list args)
{ {
int written; struct iovec *iov;
int iovcnt, written = 0;
Vstr_base *s = vstr_make_base(conf); Vstr_base *s = vstr_make_base(conf);
vstr_add_vfmt(s, 0, format, args); vstr_add_vfmt(s, 0, format, args);
written = s->len; if (vstr_export_iovec_ptr_all(s, &iov, &iovcnt))
while (s->len)
{ {
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; written += fwrite(iov->iov_base, 1, iov->iov_len, stream);
break;
} }
iov++;
} }
} }
vstr_free_base(s); vstr_free_base(s);
@@ -327,7 +328,7 @@ int vstr_wrapper_vprintf(const char *format, va_list args)
Vstr_conf *conf = get_vstr_conf(); Vstr_conf *conf = get_vstr_conf();
if (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); 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(); Vstr_conf *conf = get_vstr_conf();
if (conf) if (conf)
{ {
return vstr_wrapper_vprintf_internal(conf, fileno(stream), format, return vstr_wrapper_vprintf_internal(conf, stream, format, args);
args);
} }
return vfprintf(stream, format, args); return vfprintf(stream, format, args);
} }