* Support, replaced getopt, added some gotos for redundant stuff.
*/
-#include "busybox.h"
#include <stdio.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
# include <sys/klog.h>
#endif
+#include "busybox.h"
int dmesg_main(int argc, char **argv)
{
case 'n':
cmd = 8;
if (optarg == NULL)
- usage(dmesg_usage);
+ show_usage();
level = atoi(optarg);
break;
case 's':
if (optarg == NULL)
- usage(dmesg_usage);
+ show_usage();
bufsize = atoi(optarg);
break;
default:
- usage(dmesg_usage);
+ show_usage();
}
}
if (optind < argc) {
- goto end;
+ show_usage();
}
if (cmd == 8) {
- n = klogctl(cmd, NULL, level);
- if (n < 0) {
- goto klogctl_error;
- }
+ 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 (lastc != '\n')
putchar('\n');
return EXIT_SUCCESS;
- end:
- usage(dmesg_usage);
- return EXIT_FAILURE;
- klogctl_error:
- perror("klogctl");
- return EXIT_FAILURE;
}