* 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);
# include <sys/klog.h>
#endif
-static const char dmesg_usage[] = "dmesg [-c] [-n level] [-s bufsize]\n";
-
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;
- int stopDoingThat;
- argc--;
- argv++;
-
- /* 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;
- }
+ 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 (argc > 1) {
+ if (optind < argc) {
goto end;
}
if (cmd == 8) {
- n = klogctl(cmd, NULL, level);
- if (n < 0) {
- goto klogctl_error;
- }
- exit(TRUE);
+ if (klogctl(cmd, NULL, level) < 0)
+ perror_msg_and_die("klogctl");
+ return EXIT_SUCCESS;
}
if (bufsize < 4096)
bufsize = 4096;
buf = (char *) xmalloc(bufsize);
- n = klogctl(cmd, buf, bufsize);
- if (n < 0) {
- goto klogctl_error;
- }
+ 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] == '<') {
+ if (lastc == '\n' && buf[i] == '<') {
i++;
while (buf[i] >= '0' && buf[i] <= '9')
i++;
}
if (lastc != '\n')
putchar('\n');
- exit(TRUE);
+ return EXIT_SUCCESS;
end:
usage(dmesg_usage);
- exit(FALSE);
- klogctl_error:
- perror("klogctl");
- exit(FALSE);
-
+ return EXIT_FAILURE;
}