genfio: Splitting gen_template in 2 parts

[fio.git] / log.c

diff --git a/log.c b/log.c
index a26dee8775cb751eb786cb562cfafbcf4decdca5..4822c33526d29fd4b7d9c0731f5030c75c982909 100644 (file)
--- a/log.c
+++ b/log.c
@@ -12,6 +12,7 @@ int log_valist(const char *str, va_list args)
        size_t len;
 
        len = vsnprintf(buffer, sizeof(buffer), str, args);
+       len = min(len, sizeof(buffer) - 1);
 
        if (log_syslog)
                syslog(LOG_INFO, "%s", buffer);
@@ -40,6 +41,7 @@ int log_local(const char *format, ...)
        va_start(args, format);
        len = vsnprintf(buffer, sizeof(buffer), format, args);
        va_end(args);
+       len = min(len, sizeof(buffer) - 1);
 
        if (log_syslog)
                syslog(LOG_INFO, "%s", buffer);
@@ -58,6 +60,7 @@ int log_info(const char *format, ...)
        va_start(args, format);
        len = vsnprintf(buffer, sizeof(buffer), format, args);
        va_end(args);
+       len = min(len, sizeof(buffer) - 1);
 
        if (is_backend)
                return fio_server_text_output(FIO_LOG_INFO, buffer, len);
@@ -68,6 +71,14 @@ int log_info(const char *format, ...)
                return fwrite(buffer, len, 1, f_out);
 }
 
+int log_info_flush(void)
+{
+       if (is_backend || log_syslog)
+               return 0;
+
+       return fflush(f_out);
+}
+
 int log_err(const char *format, ...)
 {
        char buffer[1024];
@@ -77,6 +88,7 @@ int log_err(const char *format, ...)
        va_start(args, format);
        len = vsnprintf(buffer, sizeof(buffer), format, args);
        va_end(args);
+       len = min(len, sizeof(buffer) - 1);
 
        if (is_backend)
                return fio_server_text_output(FIO_LOG_ERR, buffer, len);