3917fa32d
Peter Korsgaard
2013-01-05
Subject
dmesg: handle multi-char log levels
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
util-linux/dmesg.c+6 -7
| @@ -59,16 +59,15 @@ int dmesg_main(int argc UNUSED_PARAM, char **argv) | |
| int last = '\n'; | |
| int in = 0; | |
| - | /* Skip <#> at the start of lines */ |
| + | /* Skip <[0-9]+> at the start of lines */ |
| while (1) { | |
| if (last == '\n' && buf[in] == '<') { | |
| - | in += 3; |
| - | if (in >= len) |
| - | break; |
| + | while (buf[in++] != '>' && in < len) |
| + | ; |
| + | } else { |
| + | last = buf[in++]; |
| + | putchar(last); |
| } | |
| - | last = buf[in]; |
| - | putchar(last); |
| - | in++; |
| if (in >= len) | |
| break; | |
| } | |