X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Fdmesg.c;h=6505da54bcf2c972ef8a553d8ab244024d05e3df;hb=66426760beef7e87c4735f433d123daf911b5b4a;hp=a63fa3d39607525eccce4f8b745c729b6d2eb17f;hpb=cc8ed39b240180b58810784f844e253263594ac3;p=oweals%2Fbusybox.git

diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index a63fa3d39..6505da54b 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -1,95 +1,87 @@
-#include "internal.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <time.h>
-
-/* 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)
- * from util-linux; adapted for busybox
+/* vi: set sw=4 ts=4: */
+/*
+ *
+ * dmesg - display/control kernel ring buffer.
+ *
+ * Copyright 2006 Rob Landley <rob@landley.net>
+ * Copyright 2006 Bernhard Reutner-Fischer <rep.nop@aon.at>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
-#include <linux/unistd.h>
-#include <stdio.h>
-#include <getopt.h>
-
-#define __NR_klog __NR_syslog
+//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"
 
-#if defined(__GLIBC__)
 #include <sys/klog.h>
-#define klog klogctl
-#else
-static inline _syscall3(int,klog,int,type,char *,b,int,len)
-#endif /* __GLIBC__ */
-
-const char			dmesg_usage[] = "dmesg";
+#include "libbb.h"
 
-int
-dmesg_main(struct FileInfo * info, 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;
+	unsigned opts;
+	enum {
+		OPT_c = 1 << 0,
+		OPT_s = 1 << 1,
+		OPT_n = 1 << 2
+	};
+
+	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 (!(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;
 
-   char buf[4096];
-   int  i;
-   int  n;
-   int  c;
-   int  level = 0;
-   int  lastc;
-   int  cmd = 3;
 
-   while ((c = getopt( argc, argv, "cn:" )) != EOF) {
-      switch (c) {
-      case 'c':
-	 cmd = 4;
-	 break;
-      case 'n':
-	 cmd = 8;
-	 level = atoi(optarg);
-	 break;
-      case '?':
-      default:
-	 usage(dmesg_usage);
-	 exit(1);
-      }
-   }
-   argc -= optind;
-   argv += optind;
-   
-   if (argc > 1) {
-      usage(dmesg_usage);
-      exit(1);
-   }
+	if (ENABLE_FEATURE_DMESG_PRETTY) {
+		int last = '\n';
+		int in = 0;
 
-   if (cmd == 8) {
-      n = klog( cmd, NULL, level );
-      if (n < 0) {
-	 perror( "klog" );
-	 exit( 1 );
-      }
-      exit( 0 );
-   }
+		/* Skip <#> at the start of lines */
+		while (1) {
+			if (last == '\n' && buf[in] == '<') {
+				in += 3;
+				if (in >= len)
+					break;
+			}
+			last = buf[in];
+			putchar(last);
+			in++;
+			if (in >= len)
+				break;
+		}
+		/* 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');
+	}
 
-   n = klog( cmd, buf, sizeof( buf ) );
-   if (n < 0) {
-      perror( "klog" );
-      exit( 1 );
-   }
+	if (ENABLE_FEATURE_CLEAN_UP) free(buf);
 
-   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++;
-      }
-      lastc = buf[i];
-      putchar( lastc );
-   }
-   if (lastc != '\n')
-      putchar( '\n' );
-   return 0;
+	return EXIT_SUCCESS;
 }