emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

audit for proper error handling, apply a few size optimizations

Browse Source 
-Erik
This commit is contained in:
Eric Andersen 2003-03-07 17:33:40 +00:00
parent a9c6bc41e9
commit 2afcbe436f
1 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
util-linux/dmesg.c
View File

@ -13,11 +13,15 @@
* from util-linux -- adapted for busybox by * from util-linux -- adapted for busybox by
* Erik Andersen <andersee@debian.org>. I ripped out Native Language * Erik Andersen <andersee@debian.org>. I ripped out Native Language
* Support, replaced getopt, added some gotos for redundant stuff. * Support, replaced getopt, added some gotos for redundant stuff.
*
* Audited and cleaned up on 7 March 2003 to reduce size of
* check error handling by Erik Andersen <andersee@debian.org>
*/ */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <getopt.h> #include <getopt.h>
#include <errno.h>
#if __GNU_LIBRARY__ < 5 #if __GNU_LIBRARY__ < 5
# ifdef __alpha__ # ifdef __alpha__
@ -32,34 +36,31 @@
int dmesg_main(int argc, char **argv) int dmesg_main(int argc, char **argv)
{ {
char *buf; char *buf;
int c;
int bufsize = 8196; int bufsize = 8196;
int i; int i, n;
int n;
int level = 0; int level = 0;
int lastc; int lastc;
int cmd = 3; int cmd = 3;
while ((c = getopt(argc, argv, "cn:s:")) != EOF) { while ((i = getopt(argc, argv, "cn:s:")) != EOF) {
switch (c) { switch (i) {
case 'c': case 'c':
cmd = 4; cmd = 4;
break; break;
case 'n': case 'n':
cmd = 8; cmd = 8;
if (optarg == NULL) level = bb_xgetlarg(optarg, 10, 0, 10);
break;
case 's':
/* I think a 512k max kernel ring buffer is big enough for
* anybody, as the default is 16k... Could be wrong though.
* If so I'm sure I'll hear about it by the enraged masses*/
bufsize = bb_xgetlarg(optarg, 10, 4096, 512*1024);
break;
default:
show_usage(); show_usage();
level = atoi(optarg);
break;
case 's':
if (optarg == NULL)
show_usage();
bufsize = atoi(optarg);
break;
default:
show_usage();
} }
} }
if (optind < argc) { if (optind < argc) {
show_usage(); show_usage();
@ -67,15 +68,13 @@ int dmesg_main(int argc, char **argv)
if (cmd == 8) { if (cmd == 8) {
if (klogctl(cmd, NULL, level) < 0) if (klogctl(cmd, NULL, level) < 0)
perror_msg_and_die("klogctl"); goto die_the_death;
return EXIT_SUCCESS; goto all_done;
} }
if (bufsize < 4096) buf = xmalloc(bufsize);
bufsize = 4096;
buf = (char *) xmalloc(bufsize);
if ((n = klogctl(cmd, buf, bufsize)) < 0) if ((n = klogctl(cmd, buf, bufsize)) < 0)
perror_msg_and_die("klogctl"); goto die_the_death;
lastc = '\n'; lastc = '\n';
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
@ -91,5 +90,13 @@ int dmesg_main(int argc, char **argv)
} }
if (lastc != '\n') if (lastc != '\n')
putchar('\n'); putchar('\n');
all_done:
#ifdef CONFIG_FEATURE_CLEAN_UP
if (buf) {
free(buf);
}
#endif
return EXIT_SUCCESS; return EXIT_SUCCESS;
die_the_death:
perror_msg_and_die("klogctl");
} }