From 8e8cd0cf7afeda031618c50ae9e99cc6c3e5388b Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 25 Nov 2014 16:23:15 -0800 Subject: Lose dmesg to toybox. Change-Id: I29a6bf5e628e29e9b635fac2b23106220e36d6a3 --- toolbox/Android.mk | 1 - toolbox/dmesg.c | 58 ------------------------------------------------------ 2 files changed, 59 deletions(-) delete mode 100644 toolbox/dmesg.c (limited to 'toolbox') diff --git a/toolbox/Android.mk b/toolbox/Android.mk index bc15aa8..c31211b 100644 --- a/toolbox/Android.mk +++ b/toolbox/Android.mk @@ -120,7 +120,6 @@ OUR_TOOLS := \ cmp \ date \ df \ - dmesg \ getenforce \ getevent \ getprop \ diff --git a/toolbox/dmesg.c b/toolbox/dmesg.c deleted file mode 100644 index 9c73b00..0000000 --- a/toolbox/dmesg.c +++ /dev/null @@ -1,58 +0,0 @@ -#include -#include -#include -#include -#include -#include - -#define FALLBACK_KLOG_BUF_SHIFT 17 /* CONFIG_LOG_BUF_SHIFT from our kernel */ -#define FALLBACK_KLOG_BUF_LEN (1 << FALLBACK_KLOG_BUF_SHIFT) - -int dmesg_main(int argc, char **argv) -{ - char *buffer; - char *p; - ssize_t ret; - 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"))) { - op = KLOG_READ_CLEAR; - } else { - op = KLOG_READ_ALL; - } - - n = klogctl(op, buffer, klog_buf_len); - if (n < 0) { - perror("klogctl"); - return EXIT_FAILURE; - } - buffer[n] = '\0'; - - while((ret = write(STDOUT_FILENO, p, n))) { - if (ret == -1) { - if (errno == EINTR) - continue; - perror("write"); - return EXIT_FAILURE; - } - p += ret; - n -= ret; - } - - return 0; -} -- cgit v1.1