https://bugs.gentoo.org/385305 From 22f69825778f992ff98ed100252bf5e00a15d9d1 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 31 Aug 2011 12:28:39 +0200 Subject: [PATCH] dmesg: fix for non-CONFIG_PRINTK_TIME kernels * dmesg(1) incorrectly assumes that lines like "<6>\n" are broken. * it's more robust to assume the end of the record is "\n<" * print \n for empty lines Reported-by: "Gabor Z. Papp" Signed-off-by: Karel Zak --- sys-utils/dmesg.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c index 6090f4e..8e7bb4b 100644 --- a/sys-utils/dmesg.c +++ b/sys-utils/dmesg.c @@ -442,12 +442,12 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec) if (!begin) begin = p; - if (*p == '\n') - end = p; if (i + 1 == rec->next_size) { end = p + 1; i++; - } + } else if (*p == '\n' && *(p + 1) == '<') + end = p; + if (begin && !*begin) begin = NULL; /* zero(s) at the end of the buffer? */ if (!begin || !end) @@ -469,9 +469,6 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec) } } - if (end <= begin) - return -1; /* error */ - if (*begin == '[' && (*(begin + 1) == ' ' || isdigit(*(begin + 1)))) { if (ctl->delta || ctl->ctime) { @@ -534,12 +531,15 @@ static void print_buffer(const char *buf, size_t size, } while (get_next_record(ctl, &rec) == 0) { - if (!rec.mesg_size) - continue; if (!accept_record(ctl, &rec)) continue; + if (!rec.mesg_size) { + putchar('\n'); + continue; + } + if (ctl->decode && rec.level >= 0 && rec.facility >= 0) printf("%-6s:%-6s: ", facility_names[rec.facility].name, level_names[rec.level].name); -- 1.7.6.1 From 31c9099a81d3a9c70fdceb198eebed678173d954 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Fri, 2 Sep 2011 14:42:04 +0200 Subject: [PATCH] dmesg: remove extra space only after time stamp Signed-off-by: Karel Zak --- sys-utils/dmesg.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c index 8e7bb4b..b3713a0 100644 --- a/sys-utils/dmesg.c +++ b/sys-utils/dmesg.c @@ -480,11 +480,10 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec) break; } } + if (begin < end && *begin == ' ') + begin++; } - if (begin < end && *begin == ' ') - begin++; - rec->mesg = begin; rec->mesg_size = end - begin; -- 1.7.6.1