ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN"

Browse source
This commit is contained in:
Colin Cross 2013-04-06 19:02:01 +00:00 • committed by Gerrit Code Review
commit 6e0b9ecb50
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
toolbox/dmesg.c
View file

@ -5,15 +5,30 @@
#include <sys/klog.h> #include <sys/klog.h>
#include <string.h> #include <string.h>
#define KLOG_BUF_SHIFT 17 /* CONFIG_LOG_BUF_SHIFT from our kernel */ #define FALLBACK_KLOG_BUF_SHIFT 17 /* CONFIG_LOG_BUF_SHIFT from our kernel */
#define KLOG_BUF_LEN (1 << KLOG_BUF_SHIFT) #define FALLBACK_KLOG_BUF_LEN (1 << FALLBACK_KLOG_BUF_SHIFT)
int dmesg_main(int argc, char **argv) int dmesg_main(int argc, char **argv)
{ {
char buffer[KLOG_BUF_LEN + 1]; char *buffer;
char *p = buffer; char *p;
ssize_t ret; ssize_t ret;
int n, op; int n, op, klog_buf_len;
klog_buf_len = klogctl(KLOG_SIZE_BUFFER, 0, 0);
if (klog_buf_len <= 0) {
klog_buf_len = FALLBACK_KLOG_BUF_LEN;
}
buffer = (char *)malloc(klog_buf_len + 1);
if (!buffer) {
perror("malloc");
return EXIT_FAILURE;
}
p = buffer;
if((argc == 2) && (!strcmp(argv[1],"-c"))) { if((argc == 2) && (!strcmp(argv[1],"-c"))) {
op = KLOG_READ_CLEAR; op = KLOG_READ_CLEAR;
@ -21,7 +36,7 @@ int dmesg_main(int argc, char **argv)
op = KLOG_READ_ALL; op = KLOG_READ_ALL;
} }
n = klogctl(op, buffer, KLOG_BUF_LEN); n = klogctl(op, buffer, klog_buf_len);
if (n < 0) { if (n < 0) {
perror("klogctl"); perror("klogctl");
return EXIT_FAILURE; return EXIT_FAILURE;