am 330d8927: am b553a18a: Merge "Lose dmesg to toybox."

* commit '330d89278262c9fac0bf9be82dc03621daa9faa6':
  Lose dmesg to toybox.
This commit is contained in:
Elliott Hughes 2014-11-27 12:08:28 +00:00 committed by Android Git Automerger
commit f5b3875c98
2 changed files with 0 additions and 59 deletions

View File

@ -120,7 +120,6 @@ OUR_TOOLS := \
cmp \
date \
df \
dmesg \
getenforce \
getevent \
getprop \

View File

@ -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;
}