[BusyBox-cvs] busybox/include usage.h,1.204,1.205

[Erik Andersen]

Update of /var/cvs/busybox/include
In directory nail:/tmp/cvs-serv31773/include

Modified Files:
	usage.h 
Log Message:
Fix incorrect ipcalc usage text


Index: usage.h
===================================================================
RCS file: /var/cvs/busybox/include/usage.h,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -d -r1.204 -r1.205
--- a/usage.h	13 Apr 2004 18:28:46 -0000	1.204
+++ b/usage.h	13 Apr 2004 19:27:20 -0000	1.205
@@ -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 ] }"