vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Don't write \0 after timestamp and skip line ending on partial lines

Browse source 
Signed-off-by: Antonia Murdaca <runcom@redhat.com>
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
This commit is contained in:
Mrunal Patel 2017-04-07 10:51:04 -07:00
parent eb39b4a13c
commit cbbf9aea0a
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
conmon/conmon.c
View file

@ -151,7 +151,8 @@ int write_with_timestamps(int logfd, const char *buf, ssize_t buflen)
if (rc < 0) { if (rc < 0) {
nwarn("failed to set timestamp"); nwarn("failed to set timestamp");
} else { } else {
if (write(logfd, tsbuf, TSBUFLEN) != TSBUFLEN) { /* Exclude the \0 while writing */
if (write(logfd, tsbuf, TSBUFLEN - 1) != (TSBUFLEN - 1)) {
nwarn("partial/failed write ts (logFd)"); nwarn("partial/failed write ts (logFd)");
} }
} }
@ -164,9 +165,11 @@ int write_with_timestamps(int logfd, const char *buf, ssize_t buflen)
return -1; return -1;
} }
/* Write the line ending */ /* Write the line ending */
if (write(logfd, "\n", 1) != 1) { if ((i < num_lines - 1) || (i == (num_lines - 1) && buf[buflen - 1] == '\n')) {
nwarn("failed to write line ending"); if (write(logfd, "\n", 1) != 1) {
return -1; nwarn("failed to write line ending");
return -1;
}
} }
} }