Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-06-29 20:29:47 +00:00
Code Issues Projects Releases Wiki Activity

dmesg: try to detect buffer size

Browse Source 
function                                             old     new   delta
dmesg_main                                           214     246     +32

Signed-off-by: Randy Robertson <rmrobert@vmware.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-07-10 14:14:14 +02:00
parent ae68f1133f
commit 874201fee5
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
util-linux/dmesg.c
View File

@ -8,38 +8,44 @@
* *
* Licensed under GPLv2, see file LICENSE in this tarball for details. * Licensed under GPLv2, see file LICENSE in this tarball for details.
*/ */
#include <sys/klog.h> #include <sys/klog.h>
#include "libbb.h" #include "libbb.h"
int dmesg_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int dmesg_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int dmesg_main(int argc UNUSED_PARAM, char **argv) int dmesg_main(int argc UNUSED_PARAM, char **argv)
{ {
int len; int len, level;
char *buf; char *buf;
char *size, *level; unsigned opts;
unsigned flags = getopt32(argv, "cs:n:", &size, &level);
enum { enum {
OPT_c = 1<<0, OPT_c = 1 << 0,
OPT_s = 1<<1, OPT_s = 1 << 1,
OPT_n = 1<<2 OPT_n = 1 << 2
}; };
if (flags & OPT_n) { opt_complementary = "s+:n+"; /* numeric */
if (klogctl(8, NULL, xatoul_range(level, 0, 10))) opts = getopt32(argv, "cs:n:", &len, &level);
if (opts & OPT_n) {
if (klogctl(8, NULL, (long) level))
bb_perror_msg_and_die("klogctl"); bb_perror_msg_and_die("klogctl");
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
len = (flags & OPT_s) ? xatoul_range(size, 2, INT_MAX) : 16384; if (!(opts & OPT_s))
len = klogctl(10, NULL, 0); /* read ring buffer size */
if (len < 16*1024)
len = 16*1024;
if (len > 16*1024*1024)
len = 16*1024*1024;
buf = xmalloc(len); buf = xmalloc(len);
len = klogctl(3 + (flags & OPT_c), buf, len); len = klogctl(3 + (opts & OPT_c), buf, len); /* read ring buffer */
if (len < 0) if (len < 0)
bb_perror_msg_and_die("klogctl"); bb_perror_msg_and_die("klogctl");
if (len == 0) if (len == 0)
return EXIT_SUCCESS; return EXIT_SUCCESS;
/* Skip <#> at the start of lines, and make sure we end with a newline. */ /* Skip <#> at the start of lines, and make sure we end with a newline */
if (ENABLE_FEATURE_DMESG_PRETTY) { if (ENABLE_FEATURE_DMESG_PRETTY) {
int last = '\n'; int last = '\n';