summaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorErik Andersen2000-05-10 05:05:45 +0000
committerErik Andersen2000-05-10 05:05:45 +0000
commit59b9e870243c56a9c5ec045a925e4e9b3f1f6c3c (patch)
tree8db9c40b68387c1017007f5265e45c2a66ccfb0d /util-linux
parentac130e1dca289c431c43b6efee4b3d9f2b367c87 (diff)
downloadbusybox-59b9e870243c56a9c5ec045a925e4e9b3f1f6c3c.zip
busybox-59b9e870243c56a9c5ec045a925e4e9b3f1f6c3c.tar.gz
* cp -fa now works as expected for symlinks (it didn't before)
* zcat works again (wasn't working since option parsing was broken) * more doc updates/more support for BB_FEATURE_SIMPLE_HELP -Erik
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/dmesg.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index 2bbf43a..6fa17b5 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -34,7 +34,15 @@ 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";
+static const char dmesg_usage[] = "dmesg [-c] [-n LEVEL] [-s SIZE]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+ "\nPrints or controls the kernel ring buffer\n\n"
+ "Options:\n"
+ "\t-c\t\tClears the ring buffer's contents after printing\n"
+ "\t-n LEVEL\tSets console logging level\n"
+ "\t-s SIZE\t\tUse a buffer of size SIZE\n"
+#endif
+ ;
int dmesg_main(int argc, char **argv)
{