X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=dmesg.c;h=73de6d1ae9ba84bf65f72f34b1f713b97fd208be;hb=04095e58fb4d3a083f77962714080ffe8139b39c;hp=a63fa3d39607525eccce4f8b745c729b6d2eb17f;hpb=cc8ed39b240180b58810784f844e253263594ac3;p=oweals%2Fbusybox.git

diff --git a/dmesg.c b/dmesg.c
index a63fa3d39..73de6d1ae 100644
--- a/dmesg.c
+++ b/dmesg.c
@@ -1,95 +1,95 @@
-#include "internal.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <time.h>
-
+/* 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)
- * from util-linux; adapted for busybox
+ * 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 <misiek@misiek.eu.org>
+ * - added Native Language Support
+ *
+ * from util-linux -- adapted for busybox by 
+ * Erik Andersen <andersee@debian.org>. I ripped out Native Language 
+ * Support, replaced getopt, added some gotos for redundant stuff.
  */
 
-#include <linux/unistd.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <getopt.h>
 
-#define __NR_klog __NR_syslog
-
-#if defined(__GLIBC__)
-#include <sys/klog.h>
-#define klog klogctl
+#if __GNU_LIBRARY__ < 5
+# ifdef __alpha__
+#   define klogctl syslog
+# endif
 #else
-static inline _syscall3(int,klog,int,type,char *,b,int,len)
-#endif /* __GLIBC__ */
+# include <sys/klog.h>
+#endif
 
-const char			dmesg_usage[] = "dmesg";
+#include "busybox.h"
 
-int
-dmesg_main(struct FileInfo * info, int argc, char * * argv)
+int dmesg_main(int argc, char **argv)
 {
+	char *buf;
+	int c;
+	int bufsize = 8196;
+	int i;
+	int n;
+	int level = 0;
+	int lastc;
+	int cmd = 3;
 
-   char buf[4096];
-   int  i;
-   int  n;
-   int  c;
-   int  level = 0;
-   int  lastc;
-   int  cmd = 3;
+	while ((c = getopt(argc, argv, "cn:s:")) != EOF) {
+		switch (c) {
+		case 'c':
+			cmd = 4;
+			break;
+		case 'n':
+			cmd = 8;
+			if (optarg == NULL)
+				show_usage();
+			level = atoi(optarg);
+			break;
+		case 's':
+			if (optarg == NULL)
+				show_usage();
+			bufsize = atoi(optarg);
+			break;
+		default:
+			show_usage();
+		}
+	}			
 
-   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 (optind < argc) {
+		show_usage();
+	}
 
-   if (cmd == 8) {
-      n = klog( cmd, NULL, level );
-      if (n < 0) {
-	 perror( "klog" );
-	 exit( 1 );
-      }
-      exit( 0 );
-   }
+	if (cmd == 8) {
+		if (klogctl(cmd, NULL, level) < 0)
+			perror_msg_and_die("klogctl");
+		return EXIT_SUCCESS;
+	}
 
-   n = klog( cmd, buf, sizeof( buf ) );
-   if (n < 0) {
-      perror( "klog" );
-      exit( 1 );
-   }
+	if (bufsize < 4096)
+		bufsize = 4096;
+	buf = (char *) xmalloc(bufsize);
+	if ((n = klogctl(cmd, buf, bufsize)) < 0)
+		perror_msg_and_die("klogctl");
 
-   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;
+	lastc = '\n';
+	for (i = 0; i < n; i++) {
+		if (lastc == '\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 EXIT_SUCCESS;
 }