aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlandley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-07-06 16:41:56 +0000
committerlandley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-07-06 16:41:56 +0000
commitc3bf593568743c93414c94966448a7a3e258fd7b (patch)
tree357c41c62678006207da83bbbfd32785fc5458cb
parentb1eeaafcc309934e976155a64919b0e6475e7c54 (diff)
downloadbusybox-w32-c3bf593568743c93414c94966448a7a3e258fd7b.tar.gz
busybox-w32-c3bf593568743c93414c94966448a7a3e258fd7b.tar.bz2
busybox-w32-c3bf593568743c93414c94966448a7a3e258fd7b.zip
Fix three embarassing thinkos in the new dmesg.c:
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...) git-svn-id: svn://busybox.net/trunk/busybox@15656 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--util-linux/dmesg.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index cf3ed6523..de9c3700f 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -15,16 +15,16 @@
15int dmesg_main(int argc, char *argv[]) 15int dmesg_main(int argc, char *argv[])
16{ 16{
17 char *size, *level; 17 char *size, *level;
18 int flags = bb_getopt_ulflags(argc, argv, "c:s:n:", &size, &level); 18 int flags = bb_getopt_ulflags(argc, argv, "cs:n:", &size, &level);
19 19
20 if (flags & 4) { 20 if (flags & 4) {
21 if(klogctl(8, NULL, bb_xgetlarg(size, 10, 0, 10))) 21 if(klogctl(8, NULL, bb_xgetlarg(level, 10, 0, 10)))
22 bb_perror_msg_and_die("klogctl"); 22 bb_perror_msg_and_die("klogctl");
23 } else { 23 } else {
24 int len; 24 int len;
25 char *buf; 25 char *buf;
26 26
27 len = (flags & 2) ? bb_xgetlarg(size, 10, 4096, INT_MAX) : 16384; 27 len = (flags & 2) ? bb_xgetlarg(size, 10, 2, INT_MAX) : 16384;
28 buf = xmalloc(len); 28 buf = xmalloc(len);
29 if (0 > (len = klogctl(3 + (flags & 1), buf, len))) 29 if (0 > (len = klogctl(3 + (flags & 1), buf, len)))
30 bb_perror_msg_and_die("klogctl"); 30 bb_perror_msg_and_die("klogctl");