2
0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-22 09:58:09 +00:00

Need bigger log buffer to avoid message truncation

The help message of CRIU has grown in size and is truncated because the
size of the private buffer in log.c is too small.  This patch increases
the size of the buffer.

[ The "bad" message is the --help output one ]

Signed-off-by: Saied Kazemi <saied@google.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Saied Kazemi 2015-07-07 01:42:00 +03:00 committed by Pavel Emelyanov
parent 1fff98f76e
commit 49dc94ad73

6
log.c
View File

@ -25,7 +25,7 @@
static unsigned int current_loglevel = DEFAULT_LOGLEVEL; static unsigned int current_loglevel = DEFAULT_LOGLEVEL;
static char buffer[PAGE_SIZE]; static char buffer[PAGE_SIZE * 2];
static char buf_off = 0; static char buf_off = 0;
static struct timeval start; static struct timeval start;
@ -123,7 +123,7 @@ int log_init_by_pid(void)
reset_buf_off(); reset_buf_off();
if (!opts.log_file_per_pid) { if (!opts.log_file_per_pid) {
buf_off += snprintf(buffer + buf_off, PAGE_SIZE - buf_off, "%6d: ", getpid()); buf_off += snprintf(buffer + buf_off, sizeof buffer - buf_off, "%6d: ", getpid());
return 0; return 0;
} }
@ -169,7 +169,7 @@ static void __print_on_level(unsigned int loglevel, const char *format, va_list
print_ts(); print_ts();
} }
size = vsnprintf(buffer + buf_off, PAGE_SIZE - buf_off, format, params); size = vsnprintf(buffer + buf_off, sizeof buffer - buf_off, format, params);
size += buf_off; size += buf_off;
while (off < size) { while (off < size) {