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

Fix three embarassing thinkos in the new dmesg.c:

Browse Source 
1) the c argument shouldn't have had a : after that, dunno how that got there.
2) the xgetlarg for level was using size
3) because xgetlarg's error message _SUCKS_ (it does a show_usage() rather than giving any specific info about the range that was violated) I dropped the range down to 2 bytes.  (Which works fine, I dunno why we were nit-picking about that...)
This commit is contained in:
Rob Landley 2006-07-06 16:41:56 +00:00
parent f296f0b77d
commit aa516a61b9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util-linux/dmesg.c
View File

@ -15,16 +15,16 @@
int dmesg_main(int argc, char *argv[]) int dmesg_main(int argc, char *argv[])
{ {
char *size, *level; char *size, *level;
int flags = bb_getopt_ulflags(argc, argv, "c:s:n:", &size, &level); int flags = bb_getopt_ulflags(argc, argv, "cs:n:", &size, &level);
if (flags & 4) { if (flags & 4) {
if(klogctl(8, NULL, bb_xgetlarg(size, 10, 0, 10))) if(klogctl(8, NULL, bb_xgetlarg(level, 10, 0, 10)))
bb_perror_msg_and_die("klogctl"); bb_perror_msg_and_die("klogctl");
} else { } else {
int len; int len;
char *buf; char *buf;
len = (flags & 2) ? bb_xgetlarg(size, 10, 4096, INT_MAX) : 16384; len = (flags & 2) ? bb_xgetlarg(size, 10, 2, INT_MAX) : 16384;
buf = xmalloc(len); buf = xmalloc(len);
if (0 > (len = klogctl(3 + (flags & 1), buf, len))) if (0 > (len = klogctl(3 + (flags & 1), buf, len)))
bb_perror_msg_and_die("klogctl"); bb_perror_msg_and_die("klogctl");