X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Fdmesg.c;h=81ba1c9d14c59870f1e5e65732bd04572be55df4;hb=3917fa32dce8c887d0a87d0d2f4490f1b89b51d0;hp=a32ca79dccfc4815e13bfdb7d7ae133968481240;hpb=3e856ce428cabaf6c8d99a2374a1f9a4a05db5f0;p=oweals%2Fbusybox.git diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c index a32ca79dc..81ba1c9d1 100644 --- a/util-linux/dmesg.c +++ b/util-linux/dmesg.c @@ -1,108 +1,86 @@ /* vi: set sw=4 ts=4: */ -/* dmesg.c -- Print out the contents of the kernel ring buffer - * Created: Sat Oct 9 16:19:47 1993 - * Revised: Thu Oct 28 21:52:17 1993 by faith@cs.unc.edu - * Copyright 1993 Theodore Ts'o (tytso@athena.mit.edu) - * This program comes with ABSOLUTELY NO WARRANTY. - * Modifications by Rick Sladkey (jrs@world.std.com) - * Larger buffersize 3 June 1998 by Nicolai Langfeldt, based on a patch - * by Peeter Joot. This was also suggested by John Hudson. - * 1999-02-22 Arkadiusz Mi¶kiewicz - * - added Native Language Support +/* * - * from util-linux -- adapted for busybox by - * Erik Andersen . I ripped out Native Language - * Support, replaced getopt, added some gotos for redundant stuff. + * dmesg - display/control kernel ring buffer. + * + * Copyright 2006 Rob Landley + * Copyright 2006 Bernhard Reutner-Fischer + * + * Licensed under GPLv2, see file LICENSE in this source tree. */ -#include "busybox.h" -#include -#include - -#if __GNU_LIBRARY__ < 5 - -#ifndef __alpha__ -# define __NR_klogctl __NR_syslog -static inline _syscall3(int, klogctl, int, type, char *, b, int, len); -#else /* __alpha__ */ -#define klogctl syslog -#endif +//usage:#define dmesg_trivial_usage +//usage: "[-c] [-n LEVEL] [-s SIZE]" +//usage:#define dmesg_full_usage "\n\n" +//usage: "Print or control the kernel ring buffer\n" +//usage: "\n -c Clear ring buffer after printing" +//usage: "\n -n LEVEL Set console logging level" +//usage: "\n -s SIZE Buffer size" -#else -# include -#endif +#include +#include "libbb.h" -int dmesg_main(int argc, char **argv) +int dmesg_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int dmesg_main(int argc UNUSED_PARAM, char **argv) { + int len, level; char *buf; - int c; - int bufsize = 8196; - int i; - int n; - int level = 0; - int lastc; - int cmd = 3; + unsigned opts; + enum { + OPT_c = 1 << 0, + OPT_s = 1 << 1, + OPT_n = 1 << 2 + }; - while ((c = getopt(argc, argv, "cn:s:")) != EOF) { - switch (c) { - case 'c': - cmd = 4; - break; - case 'n': - cmd = 8; - if (optarg == NULL) - usage(dmesg_usage); - level = atoi(optarg); - break; - case 's': - if (optarg == NULL) - usage(dmesg_usage); - bufsize = atoi(optarg); - break; - default: - usage(dmesg_usage); - } - } - - if (optind < argc) { - goto end; + opt_complementary = "s+:n+"; /* numeric */ + opts = getopt32(argv, "cs:n:", &len, &level); + if (opts & OPT_n) { + if (klogctl(8, NULL, (long) level)) + bb_perror_msg_and_die("klogctl"); + return EXIT_SUCCESS; } - if (cmd == 8) { - n = klogctl(cmd, NULL, level); - if (n < 0) { - goto klogctl_error; - } + 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); + len = klogctl(3 + (opts & OPT_c), buf, len); /* read ring buffer */ + if (len < 0) + bb_perror_msg_and_die("klogctl"); + if (len == 0) return EXIT_SUCCESS; - } - if (bufsize < 4096) - bufsize = 4096; - buf = (char *) xmalloc(bufsize); - n = klogctl(cmd, buf, bufsize); - if (n < 0) { - goto klogctl_error; - } - lastc = '\n'; - for (i = 0; i < n; i++) { - if ((i == 0 || buf[i - 1] == '\n') && buf[i] == '<') { - i++; - while (buf[i] >= '0' && buf[i] <= '9') - i++; - if (buf[i] == '>') - i++; + if (ENABLE_FEATURE_DMESG_PRETTY) { + int last = '\n'; + int in = 0; + + /* Skip <[0-9]+> at the start of lines */ + while (1) { + if (last == '\n' && buf[in] == '<') { + while (buf[in++] != '>' && in < len) + ; + } else { + last = buf[in++]; + putchar(last); + } + if (in >= len) + break; } - lastc = buf[i]; - putchar(lastc); + /* Make sure we end with a newline */ + if (last != '\n') + bb_putchar('\n'); + } else { + full_write(STDOUT_FILENO, buf, len); + if (buf[len-1] != '\n') + bb_putchar('\n'); } - if (lastc != '\n') - putchar('\n'); + + if (ENABLE_FEATURE_CLEAN_UP) free(buf); + return EXIT_SUCCESS; - end: - usage(dmesg_usage); - return EXIT_FAILURE; - klogctl_error: - perror("klogctl"); - return EXIT_FAILURE; }