diff options
| author | Karel Zak | 2011-08-31 12:28:39 +0200 |
|---|---|---|
| committer | Karel Zak | 2011-08-31 12:36:02 +0200 |
| commit | 22f69825778f992ff98ed100252bf5e00a15d9d1 (patch) | |
| tree | 2dc1b93493a5e09858d35896680fe1cbd3509dcf /sys-utils/dmesg.c | |
| parent | whereis: fix gcc warnings [-Wsign-compare] (diff) | |
| download | kernel-qcow2-util-linux-22f69825778f992ff98ed100252bf5e00a15d9d1.tar.gz kernel-qcow2-util-linux-22f69825778f992ff98ed100252bf5e00a15d9d1.tar.xz kernel-qcow2-util-linux-22f69825778f992ff98ed100252bf5e00a15d9d1.zip | |
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" <gzp@papp.hu>
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'sys-utils/dmesg.c')
| -rw-r--r-- | 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 6090f4e67..8e7bb4b69 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); |