summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2004-04-13 19:27:20 +0000
committerEric Andersen2004-04-13 19:27:20 +0000
commit3561b017ce5e2b9abeff268c4891440e83c2dd73 (patch)
tree5ca7ff57251794e8e3e9eed9190d6f99e3650eb9
parenta4375047d3da6d4d08f78647f1b5b6b6fc44e5c3 (diff)
downloadbusybox-3561b017ce5e2b9abeff268c4891440e83c2dd73.zip
busybox-3561b017ce5e2b9abeff268c4891440e83c2dd73.tar.gz
Fix incorrect ipcalc usage text
-rw-r--r--include/usage.h26
1 files changed, 10 insertions, 16 deletions
diff --git a/include/usage.h b/include/usage.h
index 15e60d1..462d09e 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -1305,29 +1305,23 @@
"\t\t\t[ label STRING ] [ scope SCOPE-ID ]\n" \
"\t\t\tSCOPE-ID := [ host | link | global | NUMBER ]"
-#ifndef CONFIG_FEATURE_IPCALC_FANCY
-#define ipcalc_trivial_usage \
- "[--broadcast] [--netmask] [--network] ipaddr <netmask>"
-
-#define ipcalc_full_usage \
- "Calculate IP network settings from a IP address\n\n" \
- "Options:\n" \
- "\t-b\t--broadcast\tDisplay calculated broadcast address.\n" \
- "\t-n\t--netmask\tDisplay default netmask for IP.\n" \
- "\t-w\t--network\tDisplay calculated network address."
+#ifdef CONFIG_FEATURE_IPCALC_FANCY
+ #define XUSAGE_IPCALC_FANCY(a) a
#else
+ #define XUSAGE_IPCALC_FANCY(a)
+#endif
#define ipcalc_trivial_usage \
- "[OPTION]... ipaddr <netmask>"
-
+ "[OPTION]... <ADDRESS>[[/]<NETMASK>] [NETMASK]"
#define ipcalc_full_usage \
"Calculate IP network settings from a IP address\n\n" \
"Options:\n" \
"\t-b\t--broadcast\tDisplay calculated broadcast address.\n" \
- "\t-n\t--netmask\tDisplay default netmask for IP.\n" \
- "\t-w\t--network\tDisplay calculated network address.\n" \
+ "\t-n\t--network\tDisplay calculated network address.\n" \
+ "\t-m\t--netmask\tDisplay default netmask for IP." \
+ XUSAGE_IPCALC_FANCY(\
+ "\n\t-p\t--prefix\tDisplay the prefix for IP/NETMASK." \
"\t-h\t--hostname\tDisplay first resolved host name.\n" \
- "\t-s\t--silent\tDon't ever display error messages."
-#endif
+ "\t-s\t--silent\tDon't ever display error messages.")
#define iplink_trivial_usage \
"{ set DEVICE { up | down | arp { on | off } | show [ DEVICE ] }"