log: ensure we don't truncate the final '\0' in the log

[fio.git] / log.c

diff --git a/log.c b/log.c
index d481edf2fd17efb711d454047f625e56b1aebe49..c7856eb74f6266e364951c4320e25ee95688e2c4 100644 (file)
--- a/log.c
+++ b/log.c
@@ -6,96 +6,151 @@
 
 #include "fio.h"
 
-int log_valist(const char *str, va_list args)
-{
-       char buffer[1024];
-       size_t len;
-
-       len = vsnprintf(buffer, sizeof(buffer), str, args);
-       len = min(len, sizeof(buffer) - 1);
+#define LOG_START_SZ           512
 
-       if (log_syslog)
-               syslog(LOG_INFO, "%s", buffer);
-       else
-               len = fwrite(buffer, len, 1, f_out);
+size_t log_info_buf(const char *buf, size_t len)
+{
+       /*
+        * buf could be NULL (not just "").
+        */
+       if (!buf)
+               return 0;
+
+       if (is_backend) {
+               size_t ret = fio_server_text_output(FIO_LOG_INFO, buf, len);
+               if (ret != -1)
+                       return ret;
+       }
 
-       return len;
+       if (log_syslog) {
+               syslog(LOG_INFO, "%s", buf);
+               return len;
+       } else
+               return fwrite(buf, len, 1, f_out);
 }
 
-int log_local_buf(const char *buf, size_t len)
+size_t log_valist(const char *str, va_list args)
 {
-       if (log_syslog)
-               syslog(LOG_INFO, "%s", buf);
-       else
-               len = fwrite(buf, len, 1, f_out);
+       size_t len, cur = LOG_START_SZ;
+       char *buffer;
+
+       do {
+               buffer = calloc(1, cur);
 
-       return len;
+               len = vsnprintf(buffer, cur, str, args);
+               if (len < cur)
+                       break;
+
+               cur = len + 1;
+               free(buffer);
+       } while (1);
+
+       cur = log_info_buf(buffer, len);
+       free(buffer);
+
+       return cur;
 }
 
-int log_local(const char *format, ...)
+size_t log_info(const char *format, ...)
 {
-       char buffer[1024];
+       size_t len, cur = LOG_START_SZ;
+       char *buffer;
        va_list args;
-       size_t len;
 
-       va_start(args, format);
-       len = vsnprintf(buffer, sizeof(buffer), format, args);
-       va_end(args);
-       len = min(len, sizeof(buffer) - 1);
+       do {
+               buffer = calloc(1, cur);
 
-       if (log_syslog)
-               syslog(LOG_INFO, "%s", buffer);
-       else
-               len = fwrite(buffer, len, 1, f_out);
+               va_start(args, format);
+               len = vsnprintf(buffer, cur, format, args);
+               va_end(args);
+
+               if (len < cur)
+                       break;
 
-       return len;
+               cur = len + 1;
+               free(buffer);
+       } while (1);
+
+       cur = log_info_buf(buffer, len);
+       free(buffer);
+
+       return cur;
 }
 
-int log_info(const char *format, ...)
+size_t __log_buf(struct buf_output *buf, const char *format, ...)
 {
-       char buffer[1024];
+       size_t len, cur = LOG_START_SZ;
+       char *buffer;
        va_list args;
-       size_t len;
 
-       va_start(args, format);
-       len = vsnprintf(buffer, sizeof(buffer), format, args);
-       va_end(args);
-       len = min(len, sizeof(buffer) - 1);
+       do {
+               buffer = calloc(1, cur);
 
-       if (is_backend)
-               return fio_server_text_output(FIO_LOG_INFO, buffer, len);
-       else if (log_syslog) {
-               syslog(LOG_INFO, "%s", buffer);
-               return len;
-       } else
-               return fwrite(buffer, len, 1, f_out);
+               va_start(args, format);
+               len = vsnprintf(buffer, cur, format, args);
+               va_end(args);
+
+               if (len < cur)
+                       break;
+
+               cur = len + 1;
+               free(buffer);
+       } while (1);
+
+       cur = buf_output_add(buf, buffer, len);
+       free(buffer);
+
+       return cur;
+}
+
+int log_info_flush(void)
+{
+       if (is_backend || log_syslog)
+               return 0;
+
+       return fflush(f_out);
 }
 
-int log_err(const char *format, ...)
+size_t log_err(const char *format, ...)
 {
-       char buffer[1024];
+       size_t ret, len, cur = LOG_START_SZ;
+       char *buffer;
        va_list args;
-       size_t len;
 
-       va_start(args, format);
-       len = vsnprintf(buffer, sizeof(buffer), format, args);
-       va_end(args);
-       len = min(len, sizeof(buffer) - 1);
+       do {
+               buffer = calloc(1, cur);
 
-       if (is_backend)
-               return fio_server_text_output(FIO_LOG_ERR, buffer, len);
-       else if (log_syslog) {
+               va_start(args, format);
+               len = vsnprintf(buffer, cur, format, args);
+               va_end(args);
+
+               if (len < cur)
+                       break;
+
+               cur = len + 1;
+               free(buffer);
+       } while (1);
+
+
+       if (is_backend) {
+               ret = fio_server_text_output(FIO_LOG_ERR, buffer, len);
+               if (ret != -1)
+                       goto done;
+       }
+
+       if (log_syslog) {
                syslog(LOG_INFO, "%s", buffer);
-               return len;
+               ret = len;
        } else {
-               if (f_err != stderr) {
-                       int fio_unused ret;
-
+               if (f_err != stderr)
                        ret = fwrite(buffer, len, 1, stderr);
-               }
 
-               return fwrite(buffer, len, 1, f_err);
+               ret = fwrite(buffer, len, 1, f_err);
        }
+
+done:
+       free(buffer);
+       return ret;
 }
 
 const char *log_get_level(int level)