emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dmesg,klogd: make code more readable

Browse Source 
libbb: explain why we declare klogctl
libbb: move defs around so that order makes more sense
This commit is contained in:
Denis Vlasenko
2007-11-16 20:18:54 +00:00
parent 7c2db5c198
commit 7e3a5f58bc
3 changed files with 79 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
util-linux/dmesg.c
View File

@ -15,40 +15,48 @@
int dmesg_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int dmesg_main(int argc, char **argv)
{
int len;
char *buf;
char *size, *level;
int flags = getopt32(argv, "cs:n:", &size, &level);
if (flags & 4) {
if (klogctl(8, NULL, xatoul_range(level, 0, 10)))
bb_perror_msg_and_die("klogctl");
} else {
int len;
char *buf;
len = (flags & 2) ? xatoul_range(size, 2, INT_MAX) : 16384;
buf = xmalloc(len);
len = klogctl(3 + (flags & 1), buf, len);
if (len < 0)
bb_perror_msg_and_die("klogctl");
// Skip <#> at the start of lines, and make sure we end with a newline.
if (ENABLE_FEATURE_DMESG_PRETTY) {
int last = '\n';
int in;
for (in = 0; in<len;) {
if (last == '\n' && buf[in] == '<') in += 3;
else bb_putchar(last = buf[in++]);
}
if (last != '\n') bb_putchar('\n');
} else {
write(1,buf,len);
if (len && buf[len-1]!='\n') bb_putchar('\n');
}
if (ENABLE_FEATURE_CLEAN_UP) free(buf);
return EXIT_SUCCESS;
}
return 0;
len = (flags & 2) ? xatoul_range(size, 2, INT_MAX) : 16384;
buf = xmalloc(len);
len = klogctl(3 + (flags & 1), buf, len);
if (len < 0)
bb_perror_msg_and_die("klogctl");
if (len == 0)
return EXIT_SUCCESS;
/* Skip <#> at the start of lines, and make sure we end with a newline. */
if (ENABLE_FEATURE_DMESG_PRETTY) {
int last = '\n';
int in = 0;
do {
if (last == '\n' && buf[in] == '<')
in += 3;
else {
last = buf[in++];
bb_putchar(last);
}
} while (in < len);
if (last != '\n')
bb_putchar('\n');
} else {
full_write(STDOUT_FILENO, buf, len);
if (buf[len-1] != '\n')
bb_putchar('\n');
}
if (ENABLE_FEATURE_CLEAN_UP) free(buf);
return EXIT_SUCCESS;
}