diff options
author | Elliott Hughes <enh@google.com> | 2014-11-27 12:01:22 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-27 12:01:22 +0000 |
commit | 330d89278262c9fac0bf9be82dc03621daa9faa6 (patch) | |
tree | 60c0fca76608c06cdac923b38037794516156ce7 /toolbox | |
parent | be7bb9004c8663d145b998b6a6a349cb136dd6ae (diff) | |
parent | b553a18a02cd90298716c88d9167f877b63a36b6 (diff) | |
download | system_core-330d89278262c9fac0bf9be82dc03621daa9faa6.zip system_core-330d89278262c9fac0bf9be82dc03621daa9faa6.tar.gz system_core-330d89278262c9fac0bf9be82dc03621daa9faa6.tar.bz2 |
am b553a18a: Merge "Lose dmesg to toybox."
* commit 'b553a18a02cd90298716c88d9167f877b63a36b6':
Lose dmesg to toybox.
Diffstat (limited to 'toolbox')
-rw-r--r-- | toolbox/Android.mk | 1 | ||||
-rw-r--r-- | toolbox/dmesg.c | 58 |
2 files changed, 0 insertions, 59 deletions
diff --git a/toolbox/Android.mk b/toolbox/Android.mk index 5bfa7ee..7401fbf 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 <stdlib.h> -#include <unistd.h> -#include <stdio.h> -#include <errno.h> -#include <sys/klog.h> -#include <string.h> - -#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; -} |