X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=dmesg.c;h=47f9f4474a245235009685db4e8b3a5aa4ab63c7;hb=ca0f458adaa46e447b809d96895761adb5ae660f;hp=e38fd55551cebfb6a87c862b0f84d73dc5e914ba;hpb=1266a13e1f687d34052ae7e2469048d035633e58;p=oweals%2Fbusybox.git

diff --git a/dmesg.c b/dmesg.c
index e38fd5555..47f9f4474 100644
--- a/dmesg.c
+++ b/dmesg.c
@@ -1,3 +1,4 @@
+/* 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
@@ -14,18 +15,18 @@
  * Support, replaced getopt, added some gotos for redundant stuff.
  */
 
-#include "internal.h"
-#include <linux/unistd.h>
+#include "busybox.h"
 #include <stdio.h>
-#include <getopt.h>
 #include <stdlib.h>
+#include <getopt.h>
 
 #if __GNU_LIBRARY__ < 5
-
+#include <sys/syscall.h>
+#include <linux/unistd.h>
 #ifndef __alpha__
 # define __NR_klogctl __NR_syslog
-  static inline _syscall3(int, klogctl, int, type, char *, b, int, len);
-#else /* __alpha__ */
+static inline _syscall3(int, klogctl, int, type, char *, b, int, len);
+#else							/* __alpha__ */
 #define klogctl syslog
 #endif
 
@@ -33,92 +34,67 @@
 # include <sys/klog.h>
 #endif
 
-static const char dmesg_usage[] = "dmesg [-c] [-n level] [-s bufsize]\n";
-
-int dmesg_main( int argc, char** argv )
+int dmesg_main(int argc, char **argv)
 {
-   char *buf;
-   int	bufsize=8196;
-   int  i;
-   int  n;
-   int  level = 0;
-   int  lastc;
-   int  cmd = 3;
-   int stopDoingThat;
+	char *buf;
+	int c;
+	int bufsize = 8196;
+	int i;
+	int n;
+	int level = 0;
+	int lastc;
+	int cmd = 3;
 
-   argc--;
-   argv++;
+	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();
+		}
+	}			
 
-    /* Parse any options */
-    while (argc && **argv == '-') {
-	stopDoingThat = FALSE;
-	while (stopDoingThat == FALSE && *++(*argv)) {
-	    switch (**argv) {
-	    case 'c':
-		cmd = 4;
-		break;
-	    case 'n':
-		cmd = 8;
-		if (--argc == 0)
-		    goto end;
-		level = atoi (*(++argv));
-		if (--argc > 0)
-		    ++argv;
-		stopDoingThat = TRUE;
-		break;
-	    case 's':
-		if (--argc == 0)
-		    goto end;
-		bufsize = atoi (*(++argv));
-		if (--argc > 0)
-		    ++argv;
-		stopDoingThat = TRUE;
-		break;
-	    default:
-		goto end;
-	    }
+	if (optind < argc) {
+		show_usage();
 	}
-    }
-   
-   if (argc > 1) {
-	goto end;
-   }
-
-   if (cmd == 8) {
-      n = klogctl( cmd, NULL, level );
-      if (n < 0) {
-	  goto klogctl_error;
-      }
-      exit( TRUE );
-   }
 
-   if (bufsize < 4096) bufsize = 4096;
-   buf = (char*)malloc(bufsize);
-   n = klogctl( cmd, buf, bufsize );
-   if (n < 0) {
-       goto klogctl_error;
-   }
+	if (cmd == 8) {
+		if (klogctl(cmd, NULL, level) < 0)
+			perror_msg_and_die("klogctl");
+		return EXIT_SUCCESS;
+	}
 
-   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' );
-   exit( TRUE);
-end:
-    usage( dmesg_usage);
-    exit (FALSE);
-klogctl_error:
-    perror( "klogctl" );
-    exit( FALSE );
+	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 (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;
 }