Another update to the way usage messages are done by Evin Robertson

<nitfol@my-deja.com>, which makes things just a little bit smaller, but makes
usage.h more readable/maintainable IMHO.
 -Erik

3 files changed, 881 insertions, 1772 deletions

diff --git a/include/applets.h b/include/applets.h
index cb74456..446906c 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -14,33 +14,33 @@
 #undef APPLET_ODDNAME
 #undef APPLET_NOUSAGE
 
+
 #if defined(PROTOTYPES)
-#define APPLET(a,b,c) \
-	extern int b(int argc, char **argv);
-#define APPLET_ODDNAME(a,b,c,d,e) APPLET(a,b,c)
-#define APPLET_NOUSAGE(a,b,c) \
-	extern int b(int argc, char **argv);
-#elif defined(MAKE_LINKS)
-#define APPLET(a,b,c) LINK c #a
-#define APPLET_ODDNAME(a,b,c,d,e) LINK c a
-#define APPLET_NOUSAGE(a,b,c) LINK c #a
-#elif defined(APPLET_ENUM)
-#define APPLET(a,b,c) a##_applet_number,
-#define APPLET_ODDNAME(a,b,c,d,e) e##_applet_number,
-#define APPLET_NOUSAGE(a,b,c) a##applet_number,
+  #define APPLET(a,b,c) extern int b(int argc, char **argv);
+  #define APPLET_NOUSAGE(a,b,c) extern int b(int argc, char **argv);
+  #define APPLET_ODDNAME(a,b,c,d) extern int b(int argc, char **argv);
+  extern const char usage_messages[];
+#elif defined(MAKE_USAGE)
+  #ifdef BB_FEATURE_TRIVIAL_HELP
+    #define APPLET(a,b,c) a##_trivial_usage "\0"
+    #define APPLET_NOUSAGE(a,b,c) "\0"
+    #define APPLET_ODDNAME(a,b,c,d) d##_trivial_usage "\0"
+  #else
+    #define APPLET(a,b,c) a##_trivial_usage "\n\n" a##_full_usage "\0"
+    #define APPLET_NOUSAGE(a,b,c) "\0"
+    #define APPLET_ODDNAME(a,b,c,d) d##_trivial_usage "\n\n" d##_full_usage "\0"
+  #endif
 #else
-#define USAGE_ENUM
-#include "usage.h"
-const struct BB_applet applets[] = {
-#define APPLET(a,b,c) {#a,b,c,a##_usage_index},
-#define APPLET_ODDNAME(a,b,c,d,e) {a,b,c,d},
-#define APPLET_NOUSAGE(a,b,c) {#a,b,c,-1},
-#define zcat_usage_index gunzip_usage_index
-#define sh_usage_index shell_usage_index
+  const struct BB_applet applets[] = {
+  #define APPLET(a,b,c) {#a,b,c},
+  #define APPLET_NOUSAGE(a,b,c) {a,b,c},
+  #define APPLET_ODDNAME(a,b,c,d) {a,b,c},
 #endif
 
+
+
 #ifdef BB_TEST
-	APPLET_ODDNAME("[", test_main, _BB_DIR_USR_BIN, test_usage_index, open_bracket)
+	APPLET_NOUSAGE("[", test_main, _BB_DIR_USR_BIN)
 #endif
 #ifdef BB_AR
 	APPLET(ar, ar_main, _BB_DIR_USR_BIN)
@@ -48,7 +48,7 @@ const struct BB_applet applets[] = {
 #ifdef BB_BASENAME
 	APPLET(basename, basename_main, _BB_DIR_USR_BIN)
 #endif
-	APPLET_NOUSAGE(busybox, busybox_main, _BB_DIR_BIN)
+	APPLET_NOUSAGE("busybox", busybox_main, _BB_DIR_BIN)
 #ifdef BB_CAT
 	APPLET(cat, cat_main, _BB_DIR_BIN)
 #endif
@@ -107,7 +107,7 @@ const struct BB_applet applets[] = {
 	APPLET(dpkg, dpkg_main, _BB_DIR_USR_BIN)
 #endif
 #ifdef BB_DPKG_DEB
-	APPLET_ODDNAME("dpkg-deb", dpkg_deb_main, _BB_DIR_USR_BIN, dpkg_deb_usage_index, dpkg_deb)
+	APPLET_ODDNAME("dpkg-deb", dpkg_deb_main, _BB_DIR_USR_BIN, dpkg_deb)
 #endif
 #ifdef BB_DU
 	APPLET(du, du_main, _BB_DIR_USR_BIN)
@@ -128,7 +128,7 @@ const struct BB_applet applets[] = {
 	APPLET(false, false_main, _BB_DIR_BIN)
 #endif
 #ifdef BB_FBSET
-	APPLET_NOUSAGE(fbset, fbset_main, _BB_DIR_USR_SBIN)
+	APPLET_NOUSAGE("fbset", fbset_main, _BB_DIR_USR_SBIN)
 #endif
 #ifdef BB_FDFLUSH
 	APPLET(fdflush, fdflush_main, _BB_DIR_BIN)
@@ -143,7 +143,7 @@ const struct BB_applet applets[] = {
 	APPLET(freeramdisk, freeramdisk_main, _BB_DIR_SBIN)
 #endif
 #ifdef BB_FSCK_MINIX
-	APPLET_ODDNAME("fsck.minix", fsck_minix_main, _BB_DIR_SBIN, fsck_minix_usage_index, fsck_minix)
+	APPLET_ODDNAME("fsck.minix", fsck_minix_main, _BB_DIR_SBIN, fsck_minix)
 #endif
 #ifdef BB_GETOPT
 	APPLET(getopt, getopt_main, _BB_DIR_BIN)
@@ -191,7 +191,7 @@ const struct BB_applet applets[] = {
 	APPLET(length, length_main, _BB_DIR_USR_BIN)
 #endif
 #ifdef BB_LINUXRC
-	APPLET_NOUSAGE(linuxrc, init_main, _BB_DIR_ROOT)
+	APPLET_NOUSAGE("linuxrc", init_main, _BB_DIR_ROOT)
 #endif
 #ifdef BB_LN
 	APPLET(ln, ln_main, _BB_DIR_BIN)
@@ -230,7 +230,7 @@ const struct BB_applet applets[] = {
 	APPLET(mkfifo, mkfifo_main, _BB_DIR_USR_BIN)
 #endif
 #ifdef BB_MKFS_MINIX
-	APPLET_ODDNAME("mkfs.minix", mkfs_minix_main, _BB_DIR_SBIN, mkfs_minix_usage_index, mkfs_minix)
+	APPLET_ODDNAME("mkfs.minix", mkfs_minix_main, _BB_DIR_SBIN, mkfs_minix)
 #endif
 #ifdef BB_MKNOD
 	APPLET(mknod, mknod_main, _BB_DIR_BIN)
@@ -416,8 +416,8 @@ const struct BB_applet applets[] = {
 	APPLET(zcat, gunzip_main, _BB_DIR_BIN)
 #endif
 
-#if !defined(PROTOTYPES) && !defined(MAKE_LINKS) && !defined(APPLET_ENUM)
-	{ 0,NULL,0,-1}
+#if !defined(PROTOTYPES) && !defined(MAKE_USAGE)
+	{ 0,NULL,0 }
 };
 
 /* The -1 arises because of the {0,NULL,0,-1} entry above. */
diff --git a/include/busybox.h b/include/busybox.h
index aef537b..692a908 100644
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -72,7 +72,6 @@ struct BB_applet {
 	const	char*	name;
 	int	(*main)(int argc, char** argv);
 	enum	Location	location;
-	int	usage_index;
 };
 /* From busybox.c */
 extern const struct BB_applet applets[];
@@ -87,12 +86,6 @@ extern const struct BB_applet applets[];
 #include "applets.h"
 #undef PROTOTYPES
 
-#define APPLET_ENUM
-enum APPLET_INDEX_NUMBERS {
-#include "applets.h"
-};
-#undef APPLET_ENUM
-
 extern const char *applet_name;
 
 extern void show_usage(void) __attribute__ ((noreturn));
diff --git a/include/usage.h b/include/usage.h
index 7c73185..b39fec9 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -1,2049 +1,1165 @@
-#include "Config.h"
-
-extern const char usage_messages[];
-
-#if defined USAGE_ENUM
-enum
-#elif defined USAGE_MESSAGES
-const char usage_messages[] =
-#endif
-
-#if defined USAGE_ENUM || defined USAGE_MESSAGES
-{
-#endif
-
-#if defined USAGE_ENUM
-#define DO_COMMA ,
-#elif defined USAGE_MESSAGES
-#define DO_COMMA "\0"
-#else
-#define DO_COMMA 
-#endif
-
-
-#if defined BB_AR
-#if defined USAGE_ENUM
-ar_usage_index
-#elif defined USAGE_MESSAGES
+#define ar_trivial_usage \
 	"-[ovR]{ptx} archive filenames"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nExtract or list files from an ar archive.\n\n"
-	"Options:\n"
-	"\t-o\t\tpreserve original dates\n"
-	"\t-p\t\textract to stdout\n"
-	"\t-t\t\tlist\n"
-	"\t-x\t\textract\n"
-	"\t-v\t\tverbosely list files processed\n"
+#define ar_full_usage \
+	"Extract or list files from an ar archive.\n\n" \
+	"Options:\n" \
+	"\t-o\t\tpreserve original dates\n" \
+	"\t-p\t\textract to stdout\n" \
+	"\t-t\t\tlist\n" \
+	"\t-x\t\textract\n" \
+	"\t-v\t\tverbosely list files processed\n" \
 	"\t-R\t\trecursive action"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_BASENAME
-#if defined USAGE_ENUM
-basename_usage_index
-#elif defined USAGE_MESSAGES
+#define basename_trivial_usage \
 	"FILE [SUFFIX]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nStrips directory path and suffixes from FILE.\n"
+#define basename_full_usage \
+	"Strips directory path and suffixes from FILE.\n" \
 	"If specified, also removes any trailing SUFFIX."
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_CAT
-#if defined USAGE_ENUM
-cat_usage_index
-#elif defined USAGE_MESSAGES
+#define cat_trivial_usage \
 	"[FILE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nConcatenates FILE(s) and prints them to stdout."
-#endif
-#endif
-DO_COMMA
-#endif
+#define cat_full_usage \
+	"Concatenates FILE(s) and prints them to stdout."
 
-#if defined BB_CHMOD_CHOWN_CHGRP
-#if defined USAGE_ENUM
-chgrp_usage_index
-#elif defined USAGE_MESSAGES
+#define chgrp_trivial_usage \
 	"[OPTION]... GROUP FILE..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nChange the group membership of each FILE to GROUP.\n"
+#define chgrp_full_usage \
+	"Change the group membership of each FILE to GROUP.\n" \
 	"\nOptions:\n\t-R\tChanges files and directories recursively."
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_CHMOD_CHOWN_CHGRP
-#if defined USAGE_ENUM
-chmod_usage_index
-#elif defined USAGE_MESSAGES
+#define chmod_trivial_usage \
 	"[-R] MODE[,MODE]... FILE..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nEach MODE is one or more of the letters ugoa, one of the symbols +-= and\n"
-	"one or more of the letters rwxst.\n\n"
+#define chmod_full_usage \
+	"Each MODE is one or more of the letters ugoa, one of the symbols +-= and\n" \
+	"one or more of the letters rwxst.\n\n" \
 	"Options:\n\t-R\tChanges files and directories recursively."
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_CHMOD_CHOWN_CHGRP
-#if defined USAGE_ENUM
-chown_usage_index
-#elif defined USAGE_MESSAGES
+#define chown_trivial_usage \
 	"[OPTION]...  OWNER[<.|:>[GROUP] FILE..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nChange the owner and/or group of each FILE to OWNER and/or GROUP.\n"
+#define chown_full_usage \
+	"Change the owner and/or group of each FILE to OWNER and/or GROUP.\n" \
 	"\nOptions:\n\t-R\tChanges files and directories recursively."
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_CHROOT
-#if defined USAGE_ENUM
-chroot_usage_index
-#elif defined USAGE_MESSAGES
+#define chroot_trivial_usage \
 	"NEWROOT [COMMAND...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nRun COMMAND with root directory set to NEWROOT."
-#endif
-#endif
-DO_COMMA
-#endif
+#define chroot_full_usage \
+	"Run COMMAND with root directory set to NEWROOT."
 
-#if defined BB_CHVT
-#if defined USAGE_ENUM
-chvt_usage_index
-#elif defined USAGE_MESSAGES
+#define chvt_trivial_usage \
 	"N"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nChanges the foreground virtual terminal to /dev/ttyN"
-#endif
-#endif
-DO_COMMA
-#endif
+#define chvt_full_usage \
+	"Changes the foreground virtual terminal to /dev/ttyN"
 
-#if defined BB_CLEAR
-#if defined USAGE_ENUM
-clear_usage_index
-#elif defined USAGE_MESSAGES
+#define clear_trivial_usage \
 	""
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nClear screen."
-#endif
-#endif
-DO_COMMA
-#endif
+#define clear_full_usage \
+	"Clear screen."
 
-#if defined BB_CMP
-#if defined USAGE_ENUM
-cmp_usage_index
-#elif defined USAGE_MESSAGES
+#define cmp_trivial_usage \
 	"FILE1 [FILE2]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nCompare files."
-#endif
-#endif
-DO_COMMA
-#endif
+#define cmp_full_usage \
+	"Compare files."
 
-#if defined BB_CP_MV
-#if defined USAGE_ENUM
-cp_usage_index
-#elif defined USAGE_MESSAGES
+#define cp_trivial_usage \
 	"[OPTION]... SOURCE DEST\n"
-	"   or: cp [OPTION]... SOURCE... DIRECTORY"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nCopies SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
-	"\n"
-	"\t-a\tSame as -dpR\n"
-	"\t-d\tPreserves links\n"
-	"\t-p\tPreserves file attributes if possible\n"
-	"\t-f\tforce (implied; ignored) - always set\n"
+#define cp_full_usage \
+	"Copies SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" \
+	"\n" \
+	"\t-a\tSame as -dpR\n" \
+	"\t-d\tPreserves links\n" \
+	"\t-p\tPreserves file attributes if possible\n" \
+	"\t-f\tforce (implied; ignored) - always set\n" \
 	"\t-R\tCopies directories recursively"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_CUT
-#if defined USAGE_ENUM
-cut_usage_index
-#elif defined USAGE_MESSAGES
+#define cut_trivial_usage \
 	"[OPTION]... [FILE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nPrints selected fields from each input FILE to standard output.\n\n"
-	"Options:\n"
-	"\t-b LIST\tOutput only bytes from LIST\n"
-	"\t-c LIST\tOutput only characters from LIST\n"
-	"\t-d CHAR\tUse CHAR instead of tab as the field delimiter\n"
-	"\t-s\tOutput only the lines containing delimiter\n"
-	"\t-f N\tPrint only these fields\n"
+#define cut_full_usage \
+	"Prints selected fields from each input FILE to standard output.\n\n" \
+	"Options:\n" \
+	"\t-b LIST\tOutput only bytes from LIST\n" \
+	"\t-c LIST\tOutput only characters from LIST\n" \
+	"\t-d CHAR\tUse CHAR instead of tab as the field delimiter\n" \
+	"\t-s\tOutput only the lines containing delimiter\n" \
+	"\t-f N\tPrint only these fields\n" \
 	"\t-n\tIgnored"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_DATE
-#if defined USAGE_ENUM
-date_usage_index
-#elif defined USAGE_MESSAGES
+#define date_trivial_usage \
 	"[OPTION]... [+FORMAT]\n"
-	"  or:  date [OPTION] [MMDDhhmm[[CC]YY][.ss]]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nDisplays the current time in the given FORMAT, or sets the system date.\n"
-	"\nOptions:\n\t-R\t\tOutputs RFC-822 compliant date string\n"
-	"\t-d STRING\tdisplay time described by STRING, not `now'\n"
-	"\t-s\t\tSets time described by STRING\n"
+#define date_full_usage \
+	"Displays the current time in the given FORMAT, or sets the system date.\n" \
+	"\nOptions:\n\t-R\t\tOutputs RFC-822 compliant date string\n" \
+	"\t-d STRING\tdisplay time described by STRING, not `now'\n" \
+	"\t-s\t\tSets time described by STRING\n" \
 	"\t-u\t\tPrints or sets Coordinated Universal Time"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_DC
-#if defined USAGE_ENUM
-dc_usage_index
-#elif defined USAGE_MESSAGES
+#define dc_trivial_usage \
 	"expression ..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nThis is a Tiny RPN calculator that understands the\n"
-	"following operations: +, -, /, *, and, or, not, eor.\n"
+#define dc_full_usage \
+	"This is a Tiny RPN calculator that understands the\n" \
+	"following operations: +, -, /, *, and, or, not, eor.\n" \
 	"i.e. 'dc 2 2 add' -> 4, and 'dc 8 8 \\* 2 2 + /' -> 16"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_DD
-#if defined USAGE_ENUM
-dd_usage_index
-#elif defined USAGE_MESSAGES
-	"[if=FILE] [of=FILE] [bs=N] [count=N] [skip=N] [seek=N]\n"
-	"\t  [conv=notrunc|sync]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nCopy a file, converting and formatting according to options\n\n"
-	"\tif=FILE\t\tread from FILE instead of stdin\n"
-	"\tof=FILE\t\twrite to FILE instead of stdout\n"
-	"\tbs=N\t\tread and write N bytes at a time\n"
-	"\tcount=N\t\tcopy only N input blocks\n"
-	"\tskip=N\t\tskip N input blocks\n"
-	"\tseek=N\t\tskip N output blocks\n"
-	"\tconv=notrunc\tdon't truncate output file\n"
-	"\tconv=sync\tpad blocks with zeros\n"
-	"\n"
-	"Numbers may be suffixed by c (x1), w (x2), b (x512), kD (x1000), k (x1024),\n"
+#define dd_trivial_usage \
+	"[if=FILE] [of=FILE] [bs=N] [count=N] [skip=N] [seek=N] [conv=notrunc|sync]"
+#define dd_full_usage \
+	"Copy a file, converting and formatting according to options\n\n" \
+	"\tif=FILE\tread from FILE instead of stdin\n" \
+	"\tof=FILE\twrite to FILE instead of stdout\n" \
+	"\tbs=N\tread and write N bytes at a time\n" \
+	"\tcount=N\tcopy only N input blocks\n" \
+	"\tskip=N\tskip N input blocks\n" \
+	"\tseek=N\tskip N output blocks\n" \
+	"\tconv=notrunc\tdon't truncate output file\n" \
+	"\tconv=sync\tpad blocks with zeros\n" \
+	"\n" \
+	"Numbers may be suffixed by c (x1), w (x2), b (x512), kD (x1000), k (x1024),\n" \
 	"MD (x1000000), M (x1048576), GD (x1000000000) or G (x1073741824)."
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_DEALLOCVT
-#if defined USAGE_ENUM
-deallocvt_usage_index
-#elif defined USAGE_MESSAGES
+#define deallocvt_trivial_usage \
 	"N"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	 "\n\nDeallocate unused virtual terminal /dev/ttyN"
-#endif
-#endif
-DO_COMMA
-#endif
+#define deallocvt_full_usage \
+	 "Deallocate unused virtual terminal /dev/ttyN"
+
 
-#if defined BB_DF
-#if defined USAGE_ENUM
-df_usage_index
-#elif defined USAGE_MESSAGES
-	"[-"
-#ifdef BB_FEATURE_HUMAN_READABLE
-	"hm"
-#endif
-	"k] [filesystem ...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nPrint the filesystem space used and space available\n\n"
-	"Options:\n"
 #ifdef BB_FEATURE_HUMAN_READABLE
-	"\n\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G)\n"
-	"\t-m\tprint sizes in megabytes\n"
-	"\t-k\tprint sizes in kilobytes(default)"
+  #define USAGE_HUMAN_READABLE(a,b) a
 #else
-	"\n\t-k\tprint sizes in kilobytes(compatability)"
-#endif
-#endif
-#endif
-DO_COMMA
-#endif
-
-#if defined BB_DIRNAME
-#if defined USAGE_ENUM
-dirname_usage_index
-#elif defined USAGE_MESSAGES
+  #define USAGE_HUMAN_READABLE(a,b) b
+#endif
+#define df_trivial_usage \
+	"[-" \
+	USAGE_HUMAN_READABLE("hm", "") \
+	"k] [filesystem ...]\n"
+#define df_full_usage \
+	"Print the filesystem space used and space available.\n\n" \
+	"Options:\n" \
+USAGE_HUMAN_READABLE( \
+	"\n\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
+	"\t-m\tprint sizes in megabytes\n" \
+	"\t-k\tprint sizes in kilobytes(default)", \
+	"\n\t-k\tprint sizes in kilobytes(compatability)")
+
+#define dirname_trivial_usage \
 	"[FILENAME ...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nStrips non-directory suffix from FILENAME"
-#endif
-#endif
-DO_COMMA
-#endif
+#define dirname_full_usage \
+	"Strips non-directory suffix from FILENAME"
 
-#if defined BB_DMESG
-#if defined USAGE_ENUM
-dmesg_usage_index
-#elif defined USAGE_MESSAGES
+#define dmesg_trivial_usage \
 	"[-c] [-n LEVEL] [-s SIZE]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\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"
+#define dmesg_full_usage \
+	"Prints 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"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_DOS2UNIX
-#if defined USAGE_ENUM
-dos2unix_usage_index
-#elif defined USAGE_MESSAGES
+#define dos2unix_trivial_usage \
 	"< dosfile > unixfile"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nConverts a text file from dos format to unix format."
-#endif
-#endif
-DO_COMMA
-#endif
+#define dos2unix_full_usage \
+	"Converts a text file from dos format to unix format."
 
-#if defined BB_DPKG
-#if defined USAGE_ENUM
-dpkg_usage_index
-#elif defined USAGE_MESSAGES
-	"<-i|-r|--unpack|--configure> my.deb\n"
+#define dpkg_trivial_usage \
+	"[-i|-r|--unpack|--configure] my.deb"
+#define dpkg_full_usage \
 	"WORK IN PROGRESS, only usefull for debian-installer"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_DPKG_DEB
-#if defined USAGE_ENUM
-dpkg_deb_usage_index
-#elif defined USAGE_MESSAGES
+#define dpkg_deb_trivial_usage \
 	"[-cexX] file directory"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nPerform actions on debian packages (.debs)\n\n"
-	"Options:\n"
-	"\t-c\tList contents of filesystem tree (verbose)\n"
-	"\t-l\tList contents of filesystem tree (.list format)\n"
-	"\t-e\tExtract control files to directory\n"	
-	"\t-x\tExctract packages filesystem tree to directory\n"
+#define dpkg_deb_full_usage \
+	"Perform actions on debian packages (.debs)\n\n" \
+	"Options:\n" \
+	"\t-c\tList contents of filesystem tree (verbose)\n" \
+	"\t-l\tList contents of filesystem tree (.list format)\n" \
+	"\t-e\tExtract control files to directory\n" \
+	"\t-x\tExctract packages filesystem tree to directory\n" \
 	"\t-X\tVerbose extract"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_DU
-#if defined USAGE_ENUM
-du_usage_index
-#elif defined USAGE_MESSAGES
-	"[-ls"
-#ifdef BB_FEATURE_HUMAN_READABLE
-	"hm"
-#endif
-	"k] [FILE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nSummarizes disk space used for each FILE and/or directory.\n"
-	"Disk space is printed in units of 1024 bytes.\n\n"
-	"Options:\n"
-	"\t-l\tcount sizes many times if hard linked\n"
-	"\t-s\tdisplay only a total for each argument"
-#ifdef BB_FEATURE_HUMAN_READABLE
-	"\n\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G)\n"
-	"\t-m\tprint sizes in megabytes\n"
-	"\t-k\tprint sizes in kilobytes(default)"
-#else
-	"\n\t-k\tprint sizes in kilobytes(compatability)"
-#endif
-#endif
-#endif
-DO_COMMA
-#endif
-
-#if defined BB_DUMPKMAP
-#if defined USAGE_ENUM
-dumpkmap_usage_index
-#elif defined USAGE_MESSAGES
+#define du_trivial_usage \
+	"[-ls" USAGE_HUMAN_READABLE("hm", "") "k] [FILE]..."
+#define du_full_usage \
+	"Summarizes disk space used for each FILE and/or directory.\n" \
+	"Disk space is printed in units of 1024 bytes.\n\n" \
+	"Options:\n" \
+	"\t-l\tcount sizes many times if hard linked\n" \
+	"\t-s\tdisplay only a total for each argument" \
+USAGE_HUMAN_READABLE( \
+	"\n\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
+	"\t-m\tprint sizes in megabytes\n" \
+	"\t-k\tprint sizes in kilobytes(default)" \
+	, \
+	"\n\t-k\tprint sizes in kilobytes(compatability)" \
+	)
+
+#define dumpkmap_trivial_usage \
 	"> keymap"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nPrints out a binary keyboard translation table to standard output"
-#endif
-#endif
-DO_COMMA
-#endif
+#define dumpkmap_full_usage \
+	"Prints out a binary keyboard translation table to standard output."
 
-#if defined BB_DUTMP
-#if defined USAGE_ENUM
-dutmp_usage_index
-#elif defined USAGE_MESSAGES
+#define dutmp_trivial_usage \
 	"[FILE]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nDump utmp file format (pipe delimited) from FILE\n"
+#define dutmp_full_usage \
+	"Dump utmp file format (pipe delimited) from FILE\n" \
 	"or stdin to stdout.  (i.e. 'dutmp /var/run/utmp')"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_ECHO
-#if defined USAGE_ENUM
-echo_usage_index
-#elif defined USAGE_MESSAGES
+#define echo_trivial_usage \
 	"[-neE] [ARG ...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nPrints the specified ARGs to stdout\n\n"
-	"Options:\n"
-	"\t-n\tsuppress trailing newline\n"
-	"\t-e\tinterpret backslash-escaped characters (i.e. \\t=tab etc)\n"
+#define echo_full_usage \
+	"Prints the specified ARGs to stdout\n\n" \
+	"Options:\n" \
+	"\t-n\tsuppress trailing newline\n" \
+	"\t-e\tinterpret backslash-escaped characters (i.e. \\t=tab etc)\n" \
 	"\t-E\tdisable interpretation of backslash-escaped characters"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_EXPR
-#if defined USAGE_ENUM
-expr_usage_index
-#elif defined USAGE_MESSAGES
+#define expr_trivial_usage \
 	"EXPRESSION"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-"\n\nPrints the value of EXPRESSION to standard output.\n\n"
-"EXPRESSION may be:\n"
-"ARG1 |  ARG2	ARG1 if it is neither null nor 0, otherwise ARG2\n"
-"ARG1 &  ARG2	ARG1 if neither argument is null or 0, otherwise 0\n"
-"ARG1 <  ARG2	ARG1 is less than ARG2\n"
-"ARG1 <= ARG2	ARG1 is less than or equal to ARG2\n"
-"ARG1 =  ARG2	ARG1 is equal to ARG2\n"
-"ARG1 != ARG2	ARG1 is unequal to ARG2\n"
-"ARG1 >= ARG2	ARG1 is greater than or equal to ARG2\n"
-"ARG1 >  ARG2	ARG1 is greater than ARG2\n"
-"ARG1 +  ARG2	arithmetic sum of ARG1 and ARG2\n"
-"ARG1 -  ARG2	arithmetic difference of ARG1 and ARG2\n"
-"ARG1 *  ARG2	arithmetic product of ARG1 and ARG2\n"
-"ARG1 /  ARG2	arithmetic quotient of ARG1 divided by ARG2\n"
-"ARG1 %  ARG2	arithmetic remainder of ARG1 divided by ARG2\n"
-"STRING : REGEXP		    anchored pattern match of REGEXP in STRING\n"
-"match STRING REGEXP	    same as STRING : REGEXP\n"
-"substr STRING POS LENGTH    substring of STRING, POS counted from 1\n"
-"index STRING CHARS	    index in STRING where any CHARS is found, or 0\n"
-"length STRING		    length of STRING\n"
-"quote TOKEN		    interpret TOKEN as a string, even if it is a \n"
-"				keyword like `match' or an operator like `/'\n"
-"( EXPRESSION )		    value of EXPRESSION\n\n"
-"Beware that many operators need to be escaped or quoted for shells.\n"
-"Comparisons are arithmetic if both ARGs are numbers, else\n"
-"lexicographical.  Pattern matches return the string matched between \n"
-"\\( and \\) or null; if \\( and \\) are not used, they return the number \n"
-"of characters matched or 0."
-
-#endif
-#endif
-DO_COMMA
-#endif
-
-
-#if defined BB_TRUE_FALSE
-#if defined USAGE_ENUM
-false_usage_index
-#elif defined USAGE_MESSAGES
+#define expr_full_usage \
+	"Prints the value of EXPRESSION to standard output.\n\n" \
+	"EXPRESSION may be:\n" \
+	"ARG1 |  ARG2	ARG1 if it is neither null nor 0, otherwise ARG2\n" \
+	"ARG1 &  ARG2	ARG1 if neither argument is null or 0, otherwise 0\n" \
+	"ARG1 <  ARG2	ARG1 is less than ARG2\n" \
+	"ARG1 <= ARG2	ARG1 is less than or equal to ARG2\n" \
+	"ARG1 =  ARG2	ARG1 is equal to ARG2\n" \
+	"ARG1 != ARG2	ARG1 is unequal to ARG2\n" \
+	"ARG1 >= ARG2	ARG1 is greater than or equal to ARG2\n" \
+	"ARG1 >  ARG2	ARG1 is greater than ARG2\n" \
+	"ARG1 +  ARG2	arithmetic sum of ARG1 and ARG2\n" \
+	"ARG1 -  ARG2	arithmetic difference of ARG1 and ARG2\n" \
+	"ARG1 *  ARG2	arithmetic product of ARG1 and ARG2\n" \
+	"ARG1 /  ARG2	arithmetic quotient of ARG1 divided by ARG2\n" \
+	"ARG1 %  ARG2	arithmetic remainder of ARG1 divided by ARG2\n" \
+	"STRING : REGEXP		anchored pattern match of REGEXP in STRING\n" \
+	"match STRING REGEXP		same as STRING : REGEXP\n" \
+	"substr STRING POS LENGTH	substring of STRING, POS counted from 1\n" \
+	"index STRING CHARS		index in STRING where any CHARS is found, or 0\n" \
+	"length STRING			length of STRING\n" \
+	"quote TOKEN			interpret TOKEN as a string, even if it is a \n" \
+	"				keyword like `match' or an operator like `/'\n" \
+	"( EXPRESSION )			value of EXPRESSION\n\n" \
+	"Beware that many operators need to be escaped or quoted for shells.\n" \
+	"Comparisons are arithmetic if both ARGs are numbers, else\n" \
+	"lexicographical.  Pattern matches return the string matched between \n" \
+	"\\( and \\) or null; if \\( and \\) are not used, they return the number \n" \
+	"of characters matched or 0."
+
+#define false_trivial_usage \
 	""
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nReturn an exit code of FALSE (1)."
-#endif
-#endif
-DO_COMMA
-#endif
+#define false_full_usage \
+	"Return an exit code of FALSE (1)."
 
-#if defined BB_FBSET
-#if defined USAGE_ENUM
-fbset_usage_index
-#elif defined USAGE_MESSAGES
-	"fbset [options] [mode]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nShows and modifies frame buffer device settings"
-#endif
-#endif
-DO_COMMA
-#endif
-
-#if defined BB_FDFLUSH
-#if defined USAGE_ENUM
-fdflush_usage_index
-#elif defined USAGE_MESSAGES
+#define fdflush_trivial_usage \
 	"DEVICE"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nForces floppy disk drive to detect disk change"
-#endif
-#endif
-DO_COMMA
-#endif
+#define fdflush_full_usage \
+	"Forces floppy disk drive to detect disk change"
 
-#if defined BB_FIND
-#if defined USAGE_ENUM
-find_usage_index
-#elif defined USAGE_MESSAGES
-	"[PATH...] [EXPRESSION]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nSearch for files in a directory hierarchy.  The default PATH is\n"
-	"the current directory; default EXPRESSION is '-print'\n\n"
-	"\nEXPRESSION may consist of:\n"
-	"\t-follow\t\tDereference symbolic links.\n"
-	"\t-name PATTERN\tFile name (leading directories removed) matches PATTERN."
 #ifdef BB_FEATURE_FIND_TYPE
-	"\n\t-type X\t\tFiletype matches X (where X is one of: f,d,l,b,c,...)"
+  #define USAGE_FIND_TYPE(a) a
+#else
+  #define USAGE_FIND_TYPE(a)
 #endif
 #ifdef BB_FEATURE_FIND_PERM
-	"\n\t-perm PERMS\tPermissions match any of (+NNN); all of (-NNN);\n\t\t\tor exactly (NNN)"
+  #define USAGE_FIND_PERM(a) a
+#else
+  #define USAGE_FIND_PERM(a)
 #endif
 #ifdef BB_FEATURE_FIND_MTIME
-	"\n\t-mtime TIME\tModified time is greater than (+N); less than (-N);\n\t\t\tor exactly (N) days"
-#endif
-#endif
-#endif
-DO_COMMA
+  #define USAGE_FIND_MTIME(a) a
+#else
+  #define USAGE_FIND_MTIME(a)
 #endif
 
-#if defined BB_FREE
-#if defined USAGE_ENUM
-free_usage_index
-#elif defined USAGE_MESSAGES
+#define find_trivial_usage \
+	"[PATH...] [EXPRESSION]"
+#define find_full_usage \
+	"Search for files in a directory hierarchy.  The default PATH is\n" \
+	"the current directory; default EXPRESSION is '-print'\n\n" \
+	"\nEXPRESSION may consist of:\n" \
+	"\t-follow\t\tDereference symbolic links.\n" \
+	"\t-name PATTERN\tFile name (leading directories removed) matches PATTERN." \
+USAGE_FIND_TYPE( \
+	"\n\t-type X\t\tFiletype matches X (where X is one of: f,d,l,b,c,...)" \
+) USAGE_FIND_PERM( \
+	"\n\t-perm PERMS\tPermissions match any of (+NNN); all of (-NNN);\n\t\t\tor exactly (NNN)" \
+) USAGE_FIND_MTIME( \
+	"\n\t-mtime TIME\tModified time is greater than (+N); less than (-N);\n\t\t\tor exactly (N) days")
+
+#define free_trivial_usage \
 	""
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nDisplays the amount of free and used system memory"
-#endif
-#endif
-DO_COMMA
-#endif
+#define free_full_usage \
+	"Displays the amount of free and used system memory"
 
-#if defined BB_FREERAMDISK
-#if defined USAGE_ENUM
-freeramdisk_usage_index
-#elif defined USAGE_MESSAGES
+#define freeramdisk_trivial_usage \
 	"DEVICE"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nFrees all memory used by the specified ramdisk."
-#endif
-#endif
-DO_COMMA
-#endif
+#define freeramdisk_full_usage \
+	"Frees all memory used by the specified ramdisk."
 
-#if defined BB_FSCK_MINIX
-#if defined USAGE_ENUM
-fsck_minix_usage_index
-#elif defined USAGE_MESSAGES
+#define fsck_minix_trivial_usage \
 	"[-larvsmf] /dev/name"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nPerforms a consistency check for MINIX filesystems.\n\n"
-	"Options:\n"
-	"\t-l\tLists all filenames\n"
-	"\t-r\tPerform interactive repairs\n"
-	"\t-a\tPerform automatic repairs\n"
-	"\t-v\tverbose\n"
-	"\t-s\tOutputs super-block information\n"
-	"\t-m\tActivates MINIX-like \"mode not cleared\" warnings\n"
+#define fsck_minix_full_usage \
+	"Performs a consistency check for MINIX filesystems.\n\n" \
+	"Options:\n" \
+	"\t-l\tLists all filenames\n" \
+	"\t-r\tPerform interactive repairs\n" \
+	"\t-a\tPerform automatic repairs\n" \
+	"\t-v\tverbose\n" \
+	"\t-s\tOutputs super-block information\n" \
+	"\t-m\tActivates MINIX-like \"mode not cleared\" warnings\n" \
 	"\t-f\tForce file system check."
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_GETOPT
-#if defined USAGE_ENUM
-getopt_usage_index
-#elif defined USAGE_MESSAGES
+#define getopt_trivial_usage \
 	"[OPTIONS]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nParse command options\n"
-	"  -a, --alternative            Allow long options starting with single -\n"
-	"  -l, --longoptions=longopts   Long options to be recognized\n"
-	"  -n, --name=progname          The name under which errors are reported\n"
-	"  -o, --options=optstring      Short options to be recognized\n"
-	"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-	"  -Q, --quiet-output           No normal output\n"
-	"  -s, --shell=shell            Set shell quoting conventions\n"
-	"  -T, --test                   Test for getopt(1) version\n"
-	"  -u, --unqote                 Do not quote the output"
-#endif
-#endif
-DO_COMMA
-#endif
-
-#if defined BB_GREP
-#if defined USAGE_ENUM
-grep_usage_index
-#elif defined USAGE_MESSAGES
+#define getopt_full_usage \
+	"\nParse command options\n" \
+	"\t-a, --alternative		Allow long options starting with single -\n" \
+	"\t-l, --longoptions=longopts	Long options to be recognized\n" \
+	"\t-n, --name=progname		The name under which errors are reported\n" \
+	"\t-o, --options=optstring	Short options to be recognized\n" \
+	"\t-q, --quiet			Disable error reporting by getopt(3)\n" \
+	"\t-Q, --quiet-output		No normal output\n" \
+	"\t-s, --shell=shell		Set shell quoting conventions\n" \
+	"\t-T, --test			Test for getopt(1) version\n" \
+	"\t-u, --unqote			Do not quote the output"
+
+#define grep_trivial_usage \
 	"[-ihHnqvs] pattern [files...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nSearch for PATTERN in each FILE or standard input.\n\n"
-	"Options:\n"
-	"\t-H\tprefix output lines with filename where match was found\n"
-	"\t-h\tsuppress the prefixing filename on output\n"
-	"\t-i\tignore case distinctions\n"
-	"\t-n\tprint line number with output lines\n"
-	"\t-q\tbe quiet. Returns 0 if result was found, 1 otherwise\n"
-	"\t-v\tselect non-matching lines\n"
+#define grep_full_usage \
+	"Search for PATTERN in each FILE or standard input.\n\n" \
+	"Options:\n" \
+	"\t-H\tprefix output lines with filename where match was found\n" \
+	"\t-h\tsuppress the prefixing filename on output\n" \
+	"\t-i\tignore case distinctions\n" \
+	"\t-n\tprint line number with output lines\n" \
+	"\t-q\tbe quiet. Returns 0 if result was found, 1 otherwise\n" \
+	"\t-v\tselect non-matching lines\n" \
 	"\t-s\tsuppress file open/read error messages"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_GUNZIP
-#if defined USAGE_ENUM
-gunzip_usage_index
-#elif defined USAGE_MESSAGES
+#define gunzip_trivial_usage \
 	"[OPTION]... FILE"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nUncompress FILE (or standard input if FILE is '-').\n\n"
-	"Options:\n"
-	"\t-c\tWrite output to standard output\n"
+#define gunzip_full_usage \
+	"Uncompress FILE (or standard input if FILE is '-').\n\n" \
+	"Options:\n" \
+	"\t-c\tWrite output to standard output\n" \
 	"\t-t\tTest compressed file integrity"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_GZIP
-#if defined USAGE_ENUM
-gzip_usage_index
-#elif defined USAGE_MESSAGES
+#define gzip_trivial_usage \
 	"[OPTION]... FILE"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nCompress FILE with maximum compression.\n"
-	"When FILE is '-', reads standard input.  Implies -c.\n\n"
-	"Options:\n"
-	"\t-c\tWrite output to standard output instead of FILE.gz\n"
+#define gzip_full_usage \
+	"Compress FILE with maximum compression.\n" \
+	"When FILE is '-', reads standard input.  Implies -c.\n\n" \
+	"Options:\n" \
+	"\t-c\tWrite output to standard output instead of FILE.gz\n" \
 	"\t-d\tdecompress"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_HALT
-#if defined USAGE_ENUM
-halt_usage_index
-#elif defined USAGE_MESSAGES
+#define halt_trivial_usage \
 	""
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nHalt the system."
-#endif
-#endif
-DO_COMMA
-#endif
+#define halt_full_usage \
+	"Halt the system."
 
-#if defined BB_HEAD
-#if defined USAGE_ENUM
-head_usage_index
-#elif defined USAGE_MESSAGES
+#define head_trivial_usage \
 	"[OPTION] [FILE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nPrint first 10 lines of each FILE to standard output.\n"
-	"With more than one FILE, precede each with a header giving the\n"
-	"file name. With no FILE, or when FILE is -, read standard input.\n\n"
-
+#define head_full_usage \
+	"Print first 10 lines of each FILE to standard output.\n" \
+	"With more than one FILE, precede each with a header giving the\n" \
+	"file name. With no FILE, or when FILE is -, read standard input.\n\n" \
 	"Options:\n" "\t-n NUM\t\tPrint first NUM lines instead of first 10"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_HOSTID
-#if defined USAGE_ENUM
-hostid_usage_index
-#elif defined USAGE_MESSAGES
+#define hostid_trivial_usage \
 	""
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nPrint out a unique 32-bit identifier for the machine."
-#endif
-#endif
-DO_COMMA
-#endif
+#define hostid_full_usage \
+	"Print out a unique 32-bit identifier for the machine."
 
-#if defined BB_HOSTNAME
-#if defined USAGE_ENUM
-hostname_usage_index
-#elif defined USAGE_MESSAGES
+#define hostname_trivial_usage \
 	"[OPTION] {hostname | -F file}"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nGet or set the hostname or DNS domain name. If a hostname is given\n"
-	"(or a file with the -F parameter), the host name will be set.\n\n"
-
-	"Options:\n"
-	"\t-s\t\tShort\n"
-	"\t-i\t\tAddresses for the hostname\n"
-	"\t-d\t\tDNS domain name\n"
+#define hostname_full_usage \
+	"Get or set the hostname or DNS domain name. If a hostname is given\n" \
+	"(or a file with the -F parameter), the host name will be set.\n\n" \
+	"Options:\n" \
+	"\t-s\t\tShort\n" \
+	"\t-i\t\tAddresses for the hostname\n" \
+	"\t-d\t\tDNS domain name\n" \
 	"\t-F, --file FILE\tUse the contents of FILE to specify the hostname"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_ID
-#if defined USAGE_ENUM
-id_usage_index
-#elif defined USAGE_MESSAGES
+#define id_trivial_usage \
 	"[OPTIONS]... [USERNAME]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nPrint information for USERNAME or the current user\n\n"
-	"Options:\n"
-	"\t-g\tprints only the group ID\n"
-	"\t-u\tprints only the user ID\n"
-	"\t-n\tprint a name instead of a number (with for -ug)\n"
+#define id_full_usage \
+	"Print information for USERNAME or the current user\n\n" \
+	"Options:\n" \
+	"\t-g\tprints only the group ID\n" \
+	"\t-u\tprints only the user ID\n" \
+	"\t-n\tprint a name instead of a number (with for -ug)\n" \
 	"\t-r\tprints the real user ID instead of the effective ID (with -ug)"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_IFCONFIG
-#if defined USAGE_ENUM
-ifconfig_usage_index
-#elif defined USAGE_MESSAGES
-	"[-a] [-i] [-v] <interface> [<address>]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nconfigure a network interface\n\n"
-	"Options:\n"
-	"  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
-	"  [netmask <address>]  [dstaddr <address>]  [tunnel <adress>]\n"
 #ifdef SIOCSKEEPALIVE
-	"  [outfill <NN>] [keepalive <NN>]\n"
-#endif
-	"  [hw ether <address>]  [metric <NN>]  [mtu <NN>]\n"
-	"  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-	"  [multicast]  [[-]promisc]\n"
-	"  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
-	"  [up|down] ..."
-#endif
-#endif
-DO_COMMA
+  #define USAGE_SIOCSKEEPALIVE(a) a
+#else
+  #define USAGE_SIOCSKEEPALIVE(a)
 #endif
-
-#if defined BB_INIT
-#if defined USAGE_ENUM
-init_usage_index
-#elif defined USAGE_MESSAGES
+#define ifconfig_trivial_usage \
+	"[-a] [-i] [-v] <interface> [<address>]"
+#define ifconfig_full_usage \
+	"configure a network interface\n\n" \
+	"Options:\n" \
+	"\t[[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n" \
+	"\t[netmask <address>]  [dstaddr <address>]  [tunnel <adress>]\n" \
+USAGE_SIOCSKEEPALIVE("\t[outfill <NN>] [keepalive <NN>]\n") \
+	"\t[hw ether <address>]  [metric <NN>]  [mtu <NN>]\n" \
+	"\t[[-]trailers]  [[-]arp]  [[-]allmulti]\n" \
+	"\t[multicast]  [[-]promisc]\n" \
+	"\t[mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n" \
+	"\t[up|down] ..."
+
+#define init_trivial_usage \
 	""
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nInit is the parent of all processes.\n\n"
+#define init_full_usage \
+	"Init is the parent of all processes.\n\n" \
 	"This version of init is designed to be run only by the kernel."
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_INSMOD
-#if defined USAGE_ENUM
-insmod_usage_index
-#elif defined USAGE_MESSAGES
+#define insmod_trivial_usage \
 	"[OPTION]... MODULE [symbol=value]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nLoads the specified kernel modules into the kernel.\n\n"
-	"Options:\n"
-	"\t-f\tForce module to load into the wrong kernel version.\n"
-	"\t-k\tMake module autoclean-able.\n"
-	"\t-v\tverbose output\n" 
-	"\t-L\tLock to prevent simultaneous loads of a module\n"
+#define insmod_full_usage \
+	"Loads the specified kernel modules into the kernel.\n\n" \
+	"Options:\n" \
+	"\t-f\tForce module to load into the wrong kernel version.\n" \
+	"\t-k\tMake module autoclean-able.\n" \
+	"\t-v\tverbose output\n"  \
+	"\t-L\tLock to prevent simultaneous loads of a module\n" \
 	"\t-x\tdo not export externs"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_KILL
-#if defined USAGE_ENUM
-kill_usage_index
-#elif defined USAGE_MESSAGES
+#define kill_trivial_usage \
 	"[-signal] process-id [process-id ...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nSend a signal (default is SIGTERM) to the specified process(es).\n\n"
+#define kill_full_usage \
+	"Send a signal (default is SIGTERM) to the specified process(es).\n\n"\
 	"Options:\n" "\t-l\tList all signal names and numbers."
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_KILLALL
-#if defined USAGE_ENUM
-killall_usage_index
-#elif defined USAGE_MESSAGES
+#define killall_trivial_usage \
 	"[-signal] process-name [process-name ...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nSend a signal (default is SIGTERM) to the specified process(es).\n\n"
+#define killall_full_usage \
+	"Send a signal (default is SIGTERM) to the specified process(es).\n\n"\
 	"Options:\n" "\t-l\tList all signal names and numbers."
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_LENGTH
-#if defined USAGE_ENUM
-length_usage_index
-#elif defined USAGE_MESSAGES
+#define length_trivial_usage \
 	"STRING"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nPrints out the length of the specified STRING."
-#endif
-#endif
-DO_COMMA
-#endif
+#define length_full_usage \
+	"Prints out the length of the specified STRING."
 
-#if defined BB_LN
-#if defined USAGE_ENUM
-ln_usage_index
-#elif defined USAGE_MESSAGES
+#define ln_trivial_usage \
 	"[OPTION] TARGET... LINK_NAME|DIRECTORY"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nCreate a link named LINK_NAME or DIRECTORY to the specified TARGET\n"
-	"\nYou may use '--' to indicate that all following arguments are non-options.\n\n"
-	"Options:\n"
-	"\t-s\tmake symbolic links instead of hard links\n"
-	"\t-f\tremove existing destination files\n"
+#define ln_full_usage \
+	"Create a link named LINK_NAME or DIRECTORY to the specified TARGET\n"\
+	"\nYou may use '--' to indicate that all following arguments are non-options.\n\n" \
+	"Options:\n" \
+	"\t-s\tmake symbolic links instead of hard links\n" \
+	"\t-f\tremove existing destination files\n" \
 	"\t-n\tno dereference symlinks - treat like normal file"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_LOADACM
-#if defined USAGE_ENUM
-loadacm_usage_index
-#elif defined USAGE_MESSAGES
+#define loadacm_trivial_usage \
 	"< mapfile"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nLoads an acm from standard input."
-#endif
-#endif
-DO_COMMA
-#endif
+#define loadacm_full_usage \
+	"Loads an acm from standard input."
 
-#if defined BB_LOADFONT
-#if defined USAGE_ENUM
-loadfont_usage_index
-#elif defined USAGE_MESSAGES
+#define loadfont_trivial_usage \
 	"< font"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nLoads a console font from standard input."
-#endif
-#endif
-DO_COMMA
-#endif
+#define loadfont_full_usage \
+	"Loads a console font from standard input."
 
-#if defined BB_LOADKMAP
-#if defined USAGE_ENUM
-loadkmap_usage_index
-#elif defined USAGE_MESSAGES
+#define loadkmap_trivial_usage \
 	"< keymap"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nLoads a binary keyboard translation table from standard input."
-#endif
-#endif
-DO_COMMA
-#endif
+#define loadkmap_full_usage \
+	"Loads a binary keyboard translation table from standard input."
 
-#if defined BB_LOGGER
-#if defined USAGE_ENUM
-logger_usage_index
-#elif defined USAGE_MESSAGES
+#define logger_trivial_usage \
 	"[OPTION]... [MESSAGE]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nWrite MESSAGE to the system log.  If MESSAGE is omitted, log stdin.\n\n"
-	"Options:\n"
-	"\t-s\tLog to stderr as well as the system log.\n"
-	"\t-t\tLog using the specified tag (defaults to user name).\n"
-	"\t-p\tEnter the message with the specified priority.\n"
+#define logger_full_usage \
+	"Write MESSAGE to the system log.  If MESSAGE is omitted, log stdin.\n\n" \
+	"Options:\n" \
+	"\t-s\tLog to stderr as well as the system log.\n" \
+	"\t-t\tLog using the specified tag (defaults to user name).\n" \
+	"\t-p\tEnter the message with the specified priority.\n" \
 	"\t\tThis may be numerical or a ``facility.level'' pair."
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_LOGNAME
-#if defined USAGE_ENUM
-logname_usage_index
-#elif defined USAGE_MESSAGES
+#define logname_trivial_usage \
 	""
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nPrint the name of the current user."
-#endif
-#endif
-DO_COMMA
-#endif
+#define logname_full_usage \
+	"Print the name of the current user."
 
-#if defined BB_LS
-#if defined USAGE_ENUM
-ls_usage_index
-#elif defined USAGE_MESSAGES
-	"[-1Aa"
-#ifdef BB_FEATURE_LS_TIMESTAMPS
-	"c"
-#endif
-	"Cd"
 #ifdef BB_FEATURE_LS_TIMESTAMPS
-	"e"
-#endif
-#ifdef BB_FEATURE_LS_FILETYPES
-	"F"
-#endif
-	"iln"
-#ifdef BB_FEATURE_LS_FILETYPES
-	"p"
-#endif
-#ifdef BB_FEATURE_LS_FOLLOWLINKS
-    "L"
-#endif
-#ifdef BB_FEATURE_LS_RECURSIVE
-	"R"
-#endif
-#ifdef BB_FEATURE_LS_SORTFILES
-	"rS"
-#endif
-	"s"
-#ifdef BB_FEATURE_AUTOWIDTH
-	"T"
-#endif
-#ifdef BB_FEATURE_LS_TIMESTAMPS
-	"tu"
-#endif
-#ifdef BB_FEATURE_LS_SORTFILES
-	"v"
-#endif
-#ifdef BB_FEATURE_AUTOWIDTH
-	"w"
-#endif
-	"x"
-#ifdef BB_FEATURE_LS_SORTFILES
-	"X"
-#endif
-#ifdef BB_FEATURE_HUMAN_READABLE
-	"h"
-#endif
-	"k] [filenames...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nList directory contents\n\n"
-	"Options:\n"
-	"\t-1\tlist files in a single column\n"
-	"\t-A\tdo not list implied . and ..\n"
-	"\t-a\tdo not hide entries starting with .\n"
-	"\t-C\tlist entries by columns\n"
-#ifdef BB_FEATURE_LS_TIMESTAMPS
-	"\t-c\twith -l: show ctime (the time of last\n"
-	"\t\tmodification of file status information)\n"
-#endif
-	"\t-d\tlist directory entries instead of contents\n"
-#ifdef BB_FEATURE_LS_TIMESTAMPS
-	"\t-e\tlist both full date and full time\n"
-#endif
-#ifdef BB_FEATURE_LS_FILETYPES
-	"\t-F\tappend indicator (one of */=@|) to entries\n"
+  #define USAGE_LS_TIMESTAMPS(a) a
+#else
+  #define USAGE_LS_TIMESTAMPS(a)
 #endif
-	"\t-i\tlist the i-node for each file\n"
-	"\t-l\tuse a long listing format\n"
-	"\t-n\tlist numeric UIDs and GIDs instead of names\n"
 #ifdef BB_FEATURE_LS_FILETYPES
-	"\t-p\tappend indicator (one of /=@|) to entries\n"
+  #define USAGE_LS_FILETYPES(a) a
+#else
+  #define USAGE_LS_FILETYPES(a)
 #endif
 #ifdef BB_FEATURE_LS_FOLLOWLINKS
-	"\t-L\tlist entries pointed to by symbolic links\n"
+  #define USAGE_LS_FOLLOWLINKS(a) a
+#else
+  #define USAGE_LS_FOLLOWLINKS(a)
 #endif
 #ifdef BB_FEATURE_LS_RECURSIVE
-	"\t-R\tlist subdirectories recursively\n"
-#endif
-#ifdef BB_FEATURE_LS_SORTFILES
-	"\t-r\tsort the listing in reverse order\n"
-	"\t-S\tsort the listing by file size\n"
-#endif
-	"\t-s\tlist the size of each file, in blocks\n"
-#ifdef BB_FEATURE_AUTOWIDTH
-	"\t-T NUM\tassume Tabstop every NUM columns\n"
-#endif
-#ifdef BB_FEATURE_LS_TIMESTAMPS
-	"\t-t\twith -l: show modification time (the time of last\n"
-	"\t\tchange of the file)\n"
-	"\t-u\twith -l: show access time (the time of last\n"
-	"\t\taccess of the file)\n"
+  #define USAGE_LS_RECURSIVE(a) a
+#else
+  #define USAGE_LS_RECURSIVE(a)
 #endif
 #ifdef BB_FEATURE_LS_SORTFILES
-	"\t-v\tsort the listing by version\n"
+  #define USAGE_LS_SORTFILES(a) a
+#else
+  #define USAGE_LS_SORTFILES(a)
 #endif
 #ifdef BB_FEATURE_AUTOWIDTH
-	"\t-w NUM\tassume the terminal is NUM columns wide\n"
-#endif
-	"\t-x\tlist entries by lines instead of by columns\n"
-#ifdef BB_FEATURE_LS_SORTFILES
-	"\t-X\tsort the listing by extension\n"
-#endif
-
-#ifdef BB_FEATURE_HUMAN_READABLE
-	"\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G)\n"
-	"\t-k\tprint sizes in kilobytes(default)"
+  #define USAGE_AUTOWIDTH(a) a
 #else
-	"\t-k\tprint sizes in kilobytes(compatability)"
-#endif
-
-#endif /*  BB_FEATURE_TRIVIAL_HELP */
-#endif
-DO_COMMA
-#endif /* BB_LS */
-
-#if defined BB_LSMOD
-#if defined USAGE_ENUM
-lsmod_usage_index
-#elif defined USAGE_MESSAGES
+  #define USAGE_AUTOWIDTH(a)
+#endif
+#define ls_trivial_usage \
+	"[-1Aa" USAGE_LS_TIMESTAMPS("c") \
+	"Cd" USAGE_LS_TIMESTAMPS("e") USAGE_LS_FILETYPES("F") "iln" \
+	USAGE_LS_FILETYPES("p") USAGE_LS_FOLLOWLINKS("L") \
+	USAGE_LS_RECURSIVE("R") USAGE_LS_SORTFILES("rS") \
+	"s" USAGE_AUTOWIDTH("T") USAGE_LS_TIMESTAMPS("tu") \
+	USAGE_LS_SORTFILES("v") USAGE_AUTOWIDTH("w") "x" \
+	USAGE_LS_SORTFILES("X") USAGE_HUMAN_READABLE("h", "") \
+	"k] [filenames...]"
+#define ls_full_usage \
+	"List directory contents\n\n" \
+	"Options:\n" \
+	"\t-1\tlist files in a single column\n" \
+	"\t-A\tdo not list implied . and ..\n" \
+	"\t-a\tdo not hide entries starting with .\n" \
+	"\t-C\tlist entries by columns\n" \
+USAGE_LS_TIMESTAMPS( \
+	"\t-c\twith -l: show ctime (the time of last\n" \
+	"\t\tmodification of file status information)\n" \
+	) \
+	"\t-d\tlist directory entries instead of contents\n" \
+USAGE_LS_TIMESTAMPS( \
+	"\t-e\tlist both full date and full time\n" \
+	) \
+USAGE_LS_FILETYPES( \
+	"\t-F\tappend indicator (one of */=@|) to entries\n" \
+	) \
+	"\t-i\tlist the i-node for each file\n" \
+	"\t-l\tuse a long listing format\n" \
+	"\t-n\tlist numeric UIDs and GIDs instead of names\n" \
+USAGE_LS_FILETYPES( \
+	"\t-p\tappend indicator (one of /=@|) to entries\n" \
+	) \
+USAGE_LS_FOLLOWLINKS( \
+	"\t-L\tlist entries pointed to by symbolic links\n" \
+	) \
+USAGE_LS_RECURSIVE( \
+	"\t-R\tlist subdirectories recursively\n" \
+	) \
+USAGE_LS_SORTFILES( \
+	"\t-r\tsort the listing in reverse order\n" \
+	"\t-S\tsort the listing by file size\n" \
+	) \
+	"\t-s\tlist the size of each file, in blocks\n" \
+USAGE_AUTOWIDTH( \
+	"\t-T NUM\tassume Tabstop every NUM columns\n" \
+	) \
+USAGE_LS_TIMESTAMPS( \
+	"\t-t\twith -l: show modification time (the time of last\n" \
+	"\t\tchange of the file)\n" \
+	"\t-u\twith -l: show access time (the time of last\n" \
+	"\t\taccess of the file)\n" \
+	) \
+USAGE_LS_SORTFILES( \
+	"\t-v\tsort the listing by version\n" \
+	) \
+USAGE_AUTOWIDTH( \
+	"\t-w NUM\tassume the terminal is NUM columns wide\n" \
+	) \
+	"\t-x\tlist entries by lines instead of by columns\n" \
+USAGE_LS_SORTFILES( \
+	"\t-X\tsort the listing by extension\n" \
+	) \
+USAGE_HUMAN_READABLE( \
+	"\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
+	"\t-k\tprint sizes in kilobytes(default)" \
+	, \
+	"\t-k\tprint sizes in kilobytes(compatability)" \
+	) \
+
+#define lsmod_trivial_usage \
 	""
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nList the currently loaded kernel modules."
-#endif
-#endif
-DO_COMMA
-#endif
+#define lsmod_full_usage \
+	"List the currently loaded kernel modules."
 
-#if defined BB_MAKEDEVS
-#if defined USAGE_ENUM
-makedevs_usage_index
-#elif defined USAGE_MESSAGES
+#define makedevs_trivial_usage \
 	"NAME TYPE MAJOR MINOR FIRST LAST [s]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nCreates a range of block or character special files\n\n"
-	"TYPEs include:\n"
-	"\tb:\tMake a block (buffered) device.\n"
-	"\tc or u:\tMake a character (un-buffered) device.\n"
-	"\tp:\tMake a named pipe. MAJOR and MINOR are ignored for named pipes.\n\n"
-	"FIRST specifies the number appended to NAME to create the first device.\n"
-	"LAST specifies the number of the last item that should be created.\n"
-	"If 's' is the last argument, the base device is created as well.\n\n"
-	"For example:\n"
-	"\tmakedevs /dev/ttyS c 4 66 2 63   ->  ttyS2-ttyS63\n"
+#define makedevs_full_usage \
+	"Creates a range of block or character special files\n\n" \
+	"TYPEs include:\n" \
+	"\tb:\tMake a block (buffered) device.\n" \
+	"\tc or u:\tMake a character (un-buffered) device.\n" \
+	"\tp:\tMake a named pipe. MAJOR and MINOR are ignored for named pipes.\n\n" \
+	"FIRST specifies the number appended to NAME to create the first device.\n" \
+	"LAST specifies the number of the last item that should be created.\n" \
+	"If 's' is the last argument, the base device is created as well.\n\n" \
+	"For example:\n" \
+	"\tmakedevs /dev/ttyS c 4 66 2 63   ->  ttyS2-ttyS63\n" \
 	"\tmakedevs /dev/hda b 3 0 0 8 s    ->  hda,hda1-hda8"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_MD5SUM
-#if defined USAGE_ENUM
-md5sum_usage_index
-#elif defined USAGE_MESSAGES
-	"[OPTION] [FILE]...\n"
-	"or:    md5sum [OPTION] -c [FILE]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nPrint or check MD5 checksums.\n\n"
-	"Options:\n"
-	"With no FILE, or when FILE is -, read standard input.\n\n"
-	"\t-b\tread files in binary mode\n"
-	"\t-c\tcheck MD5 sums against given list\n"
-	"\t-t\tread files in text mode (default)\n"
-	"\t-g\tread a string\n"
-	"\nThe following two options are useful only when verifying checksums:\n"
-	"\t-s,\tdon't output anything, status code shows success\n"
+#define md5sum_trivial_usage \
+	"[OPTION] [FILE]...\nor:    md5sum [OPTION] -c [FILE]"
+#define md5sum_full_usage \
+	"Print or check MD5 checksums.\n\n" \
+	"Options:\n" \
+	"With no FILE, or when FILE is -, read standard input.\n\n" \
+	"\t-b\tread files in binary mode\n" \
+	"\t-c\tcheck MD5 sums against given list\n" \
+	"\t-t\tread files in text mode (default)\n" \
+	"\t-g\tread a string\n" \
+	"\nThe following two options are useful only when verifying checksums:\n" \
+	"\t-s,\tdon't output anything, status code shows success\n" \
 	"\t-w,\twarn about improperly formated MD5 checksum lines"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_MKDIR
-#if defined USAGE_ENUM
-mkdir_usage_index
-#elif defined USAGE_MESSAGES
+#define mkdir_trivial_usage \
 	"[OPTION] DIRECTORY..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nCreate the DIRECTORY(ies), if they do not already exist\n\n"
-	
-	"Options:\n"
-	"\t-m\tset permission mode (as in chmod), not rwxrwxrwx - umask\n"
+#define mkdir_full_usage \
+	"Create the DIRECTORY(ies), if they do not already exist\n\n" \
+	"Options:\n" \
+	"\t-m\tset permission mode (as in chmod), not rwxrwxrwx - umask\n" \
 	"\t-p\tno error if existing, make parent directories as needed"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_MKFIFO
-#if defined USAGE_ENUM
-mkfifo_usage_index
-#elif defined USAGE_MESSAGES
+#define mkfifo_trivial_usage \
 	"[OPTIONS] name"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nCreates a named pipe (identical to 'mknod name p')\n\n"
-	"Options:\n"
+#define mkfifo_full_usage \
+	"Creates a named pipe (identical to 'mknod name p')\n\n" \
+	"Options:\n" \
 	"\t-m\tcreate the pipe using the specified mode (default a=rw)"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_MKFS_MINIX
-#if defined USAGE_ENUM
-mkfs_minix_usage_index
-#elif defined USAGE_MESSAGES
+#define mkfs_minix_trivial_usage \
 	"[-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nMake a MINIX filesystem.\n\n"
-	"Options:\n"
-	"\t-c\t\tCheck the device for bad blocks\n"
-	"\t-n [14|30]\tSpecify the maximum length of filenames\n"
-	"\t-i INODES\tSpecify the number of inodes for the filesystem\n"
-	"\t-l FILENAME\tRead the bad blocks list from FILENAME\n"
+#define mkfs_minix_full_usage \
+	"Make a MINIX filesystem.\n\n" \
+	"Options:\n" \
+	"\t-c\t\tCheck the device for bad blocks\n" \
+	"\t-n [14|30]\tSpecify the maximum length of filenames\n" \
+	"\t-i INODES\tSpecify the number of inodes for the filesystem\n" \
+	"\t-l FILENAME\tRead the bad blocks list from FILENAME\n" \
 	"\t-v\t\tMake a Minix version 2 filesystem"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_MKNOD
-#if defined USAGE_ENUM
-mknod_usage_index
-#elif defined USAGE_MESSAGES
+#define mknod_trivial_usage \
 	"[OPTIONS] NAME TYPE MAJOR MINOR"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nCreate a special file (block, character, or pipe).\n\n"
-	"Options:\n"
-	"\t-m\tcreate the special file using the specified mode (default a=rw)\n\n"
-	"TYPEs include:\n"
-	"\tb:\tMake a block (buffered) device.\n"
-	"\tc or u:\tMake a character (un-buffered) device.\n"
+#define mknod_full_usage \
+	"Create a special file (block, character, or pipe).\n\n" \
+	"Options:\n" \
+	"\t-m\tcreate the special file using the specified mode (default a=rw)\n\n" \
+	"TYPEs include:\n" \
+	"\tb:\tMake a block (buffered) device.\n" \
+	"\tc or u:\tMake a character (un-buffered) device.\n" \
 	"\tp:\tMake a named pipe. MAJOR and MINOR are ignored for named pipes."
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_MKSWAP
-#if defined USAGE_ENUM
-mkswap_usage_index
-#elif defined USAGE_MESSAGES
+#define mkswap_trivial_usage \
 	"[-c] [-v0|-v1] device [block-count]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nPrepare a disk partition to be used as a swap partition.\n\n"
-	"Options:\n" "\t-c\t\tCheck for read-ability.\n"
-	"\t-v0\t\tMake version 0 swap [max 128 Megs].\n"
-	"\t-v1\t\tMake version 1 swap [big!] (default for kernels >\n"
-	"\t\t\t2.1.117).\n"
+#define mkswap_full_usage \
+	"Prepare a disk partition to be used as a swap partition.\n\n" \
+	"Options:\n" "\t-c\t\tCheck for read-ability.\n" \
+	"\t-v0\t\tMake version 0 swap [max 128 Megs].\n" \
+	"\t-v1\t\tMake version 1 swap [big!] (default for kernels > 2.1.117).\n" \
 	"\tblock-count\tNumber of block to use (default is entire partition)."
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_MKTEMP
-#if defined USAGE_ENUM
-mktemp_usage_index
-#elif defined USAGE_MESSAGES
+#define mktemp_trivial_usage \
 	"[-q] TEMPLATE"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nCreates a temporary file with its name based on TEMPLATE.\n"
+#define mktemp_full_usage \
+	"Creates a temporary file with its name based on TEMPLATE.\n" \
 	"TEMPLATE is any name with six `Xs' (i.e. /tmp/temp.XXXXXX)."
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_MORE
-#if defined USAGE_ENUM
-more_usage_index
-#elif defined USAGE_MESSAGES
+#define more_trivial_usage \
 	"[FILE ...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nMore is a filter for viewing FILE one screenful at a time."
-#endif
-#endif
-DO_COMMA
-#endif
+#define more_full_usage \
+	"More is a filter for viewing FILE one screenful at a time."
 
-#if defined BB_MOUNT
-#if defined USAGE_ENUM
-mount_usage_index
-#elif defined USAGE_MESSAGES
-	"[flags] device directory [-o options,more-options]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nMount a filesystem\n\n"
-	"Flags:\n" 
-	"\t-a:\t\tMount all filesystems in fstab.\n"
-#ifdef BB_MTAB
-	"\t-f:\t\t\"Fake\" Add entry to mount table but don't mount it.\n"
-	"\t-n:\t\tDon't write a mount table entry.\n"
+#ifdef BB_FEATURE_MOUNT_LOOP
+  #define USAGE_MOUNT_LOOP(a) a
+#else
+  #define USAGE_MOUNT_LOOP(a)
 #endif
-	"\t-o option:\tOne of many filesystem options, listed below.\n"
-	"\t-r:\t\tMount the filesystem read-only.\n"
-	"\t-t fs-type:\tSpecify the filesystem type.\n"
-	"\t-w:\t\tMount for reading and writing (default).\n"
-	"\n"
-	"Options for use with the \"-o\" flag:\n"
-	"\tasync/sync:\tWrites are asynchronous / synchronous.\n"
-	"\tatime/noatime:\tEnable / disable updates to inode access times.\n"
-	"\tdev/nodev:\tAllow use of special device files / disallow them.\n"
-	"\texec/noexec:\tAllow use of executable files / disallow them.\n"
-#if defined BB_FEATURE_MOUNT_LOOP
-	"\tloop:\t\tMounts a file via loop device.\n"
+#ifdef BB_MTAB
+  #define USAGE_MTAB(a) a
+#else
+  #define USAGE_MTAB(a)
 #endif
-	"\tsuid/nosuid:\tAllow set-user-id-root programs / disallow them.\n"
-	"\tremount:\tRe-mount a mounted filesystem, changing its flags.\n"
-	"\tro/rw:\t\tMount for read-only / read-write.\n"
-	"\nThere are EVEN MORE flags that are specific to each filesystem.\n"
+#define mount_trivial_usage \
+	"[flags] device directory [-o options,more-options]"
+#define mount_full_usage \
+	"Mount a filesystem\n\n" \
+	"Flags:\n"  \
+	"\t-a:\t\tMount all filesystems in fstab.\n" \
+USAGE_MTAB( \
+	"\t-f:\t\t\"Fake\" mount. Add entry to mount table but don't mount it.\n" \
+	"\t-n:\t\tDon't write a mount table entry.\n" \
+	) \
+	"\t-o option:\tOne of many filesystem options, listed below.\n" \
+	"\t-r:\t\tMount the filesystem read-only.\n" \
+	"\t-t fs-type:\tSpecify the filesystem type.\n" \
+	"\t-w:\t\tMount for reading and writing (default).\n" \
+	"\n" \
+	"Options for use with the \"-o\" flag:\n" \
+	"\tasync/sync:\tWrites are asynchronous / synchronous.\n" \
+	"\tatime/noatime:\tEnable / disable updates to inode access times.\n" \
+	"\tdev/nodev:\tAllow use of special device files / disallow them.\n" \
+	"\texec/noexec:\tAllow use of executable files / disallow them.\n" \
+USAGE_MOUNT_LOOP( \
+	"\tloop:\t\tMounts a file via loop device.\n" \
+	) \
+	"\tsuid/nosuid:\tAllow set-user-id-root programs / disallow them.\n" \
+	"\tremount:\tRe-mount a currently-mounted filesystem, changing its flags.\n" \
+	"\tro/rw:\t\tMount for read-only / read-write.\n" \
+	"\nThere are EVEN MORE flags that are specific to each filesystem.\n" \
 	"You'll have to see the written documentation for those."
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_MT
-#if defined USAGE_ENUM
-mt_usage_index
-#elif defined USAGE_MESSAGES
+#define mt_trivial_usage \
 	"[-f device] opcode value"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nControl magnetic tape drive operation\n"
-	"\nAvailable Opcodes:\n\n"
-	"bsf bsfm bsr bss datacompression drvbuffer eof eom erase\n"
-	"fsf fsfm fsr fss load lock mkpart nop offline ras1 ras2\n"
-	"ras3 reset retension rew rewoffline seek setblk setdensity\n"
+#define mt_full_usage \
+	"Control magnetic tape drive operation\n" \
+	"\nAvailable Opcodes:\n\n" \
+	"bsf bsfm bsr bss datacompression drvbuffer eof eom erase\n" \
+	"fsf fsfm fsr fss load lock mkpart nop offline ras1 ras2\n" \
+	"ras3 reset retension rew rewoffline seek setblk setdensity\n" \
 	"setpart tell unload unlock weof wset"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_CP_MV
-#if defined USAGE_ENUM
-mv_usage_index
-#elif defined USAGE_MESSAGES
-	"SOURCE DEST\n"
-	"   or: mv SOURCE... DIRECTORY"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nRename SOURCE to DEST, or move SOURCE(s) to DIRECTORY."
-#endif
-#endif
-DO_COMMA
-#endif
+#define mv_trivial_usage \
+	"SOURCE DEST\n   or: mv SOURCE... DIRECTORY"
+#define mv_full_usage \
+	"Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY."
 
-#if defined BB_NC
-#if defined USAGE_ENUM
-nc_usage_index
-#elif defined USAGE_MESSAGES
+#define nc_trivial_usage \
 	"[IP] [port]" 
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nNetcat opens a pipe to IP:port"
-#endif
-#endif
-DO_COMMA
-#endif
+#define nc_full_usage \
+	"Netcat opens a pipe to IP:port"
 
-#if defined BB_NSLOOKUP
-#if defined USAGE_ENUM
-nslookup_usage_index
-#elif defined USAGE_MESSAGES
+#define nslookup_trivial_usage \
 	"[HOST]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nQueries the nameserver for the IP address of the given HOST"
-#endif
-#endif
-DO_COMMA
-#endif
+#define nslookup_full_usage \
+	"Queries the nameserver for the IP address of the given HOST"
 
-#if defined BB_PING
-#if defined BB_FEATURE_SIMPLE_PING
-#if defined USAGE_ENUM
-ping_usage_index
-#elif defined USAGE_MESSAGES
-	"host"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nSend ICMP ECHO_REQUEST packets to network hosts"
-#endif
-#endif
-DO_COMMA
-#else /* ! defined BB_FEATURE_SIMPLE_PING */
-#if defined USAGE_ENUM
-ping_usage_index
-#elif defined USAGE_MESSAGES
+#ifdef BB_FEATURE_SIMPLE_PING
+#define ping_trivial_usage "host"
+#define ping_full_usage    "Send ICMP ECHO_REQUEST packets to network hosts"
+#else
+#define ping_trivial_usage \
 	"[OPTION]... host"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nSend ICMP ECHO_REQUEST packets to network hosts.\n\n"
-	"Options:\n"
-	"\t-c COUNT\tSend only COUNT pings.\n"
-	"\t-s SIZE\t\tSend SIZE data bytes in packets (default=56).\n"
-	"\t-q\t\tQuiet mode, only displays output at start\n"
+#define ping_full_usage \
+	"Send ICMP ECHO_REQUEST packets to network hosts.\n\n" \
+	"Options:\n" \
+	"\t-c COUNT\tSend only COUNT pings.\n" \
+	"\t-s SIZE\t\tSend SIZE data bytes in packets (default=56).\n" \
+	"\t-q\t\tQuiet mode, only displays output at start\n" \
 	"\t\t\tand when finished."
 #endif
-#endif
-DO_COMMA
-#endif
-#endif
 
-#if defined BB_PIVOT_ROOT
-#if defined USAGE_ENUM
-pivot_root_usage_index
-#elif defined USAGE_MESSAGES
+#define pivot_root_trivial_usage \
 	"new_root put_old"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nMove the current root file system to put_old and make new_root\n"
+#define pivot_root_full_usage \
+	"Move the current root file system to put_old and make new_root\n" \
 	"the new root file system."
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_POWEROFF
-#if defined USAGE_ENUM
-poweroff_usage_index
-#elif defined USAGE_MESSAGES
+#define poweroff_trivial_usage \
 	""
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nHalt the system and request that the kernel shut off the power."
-#endif
-#endif
-DO_COMMA
-#endif
+#define poweroff_full_usage \
+	"Halt the system and request that the kernel shut off the power."
 
-#if defined BB_PRINTF
-#if defined USAGE_ENUM
-printf_usage_index
-#elif defined USAGE_MESSAGES
+#define printf_trivial_usage \
 	"FORMAT [ARGUMENT...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nFormats and prints ARGUMENT(s) according to FORMAT,\n"
+#define printf_full_usage \
+	"Formats and prints ARGUMENT(s) according to FORMAT,\n" \
 	"Where FORMAT controls the output exactly as in C printf."
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_PS
-#if defined USAGE_ENUM
-ps_usage_index
-#elif defined USAGE_MESSAGES
+#define ps_trivial_usage \
 	""
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nReport process status\n"
+#define ps_full_usage \
+	"Report process status\n" \
 	"\nThis version of ps accepts no options."
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_PWD
-#if defined USAGE_ENUM
-pwd_usage_index
-#elif defined USAGE_MESSAGES
+#define pwd_trivial_usage \
 	""
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nPrint the full filename of the current working directory."
-#endif
-#endif
-DO_COMMA
-#endif
+#define pwd_full_usage \
+	"Print the full filename of the current working directory."
 
-#if defined BB_RDATE
-#if defined USAGE_ENUM
-rdate_usage_index
-#elif defined USAGE_MESSAGES
+#define rdate_trivial_usage \
 	"[OPTION] HOST"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nGet and possibly set the system date and time from a remote HOST.\n"
-	"Options:\n"
-	"\t-s\tSet the system date and time (default).\n"
+#define rdate_full_usage \
+	"Get and possibly set the system date and time from a remote HOST.\n" \
+	"Options:\n" \
+	"\t-s\tSet the system date and time (default).\n" \
 	"\t-p\tPrint the date and time."
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_READLINK
-#if defined USAGE_ENUM
-readlink_usage_index
-#elif defined USAGE_MESSAGES
+#define readlink_trivial_usage \
 	""
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nRead a symbolic link."
-#endif
-#endif
-DO_COMMA
-#endif
+#define readlink_full_usage \
+	"Read a symbolic link."
 
-#if defined BB_REBOOT
-#if defined USAGE_ENUM
-reboot_usage_index
-#elif defined USAGE_MESSAGES
+#define reboot_trivial_usage \
 	""
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nReboot the system."
-#endif
-#endif
-DO_COMMA
-#endif
-	
-#if defined BB_RENICE
-#if defined USAGE_ENUM
-renice_usage_index
-#elif defined USAGE_MESSAGES
+#define reboot_full_usage \
+	"Reboot the system."
+
+#define renice_trivial_usage \
 	"priority pid [pid ...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nChanges priority of running processes. Allowed priorities range\n"
-	"from 20 (the process runs only when nothing else is running) to 0\n"
+#define renice_full_usage \
+	"Changes priority of running processes. Allowed priorities range\n" \
+	"from 20 (the process runs only when nothing else is running) to 0\n" \
 	"(default priority) to -20 (almost nothing else ever gets to run)."
-#endif
-#endif
-DO_COMMA
-#endif
-
 
-#if defined BB_RESET
-#if defined USAGE_ENUM
-reset_usage_index
-#elif defined USAGE_MESSAGES
+#define reset_trivial_usage \
 	""
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nResets the screen."
-#endif
-#endif
-DO_COMMA
-#endif
+#define reset_full_usage \
+	"Resets the screen."
 
-#if defined BB_RM
-#if defined USAGE_ENUM
-rm_usage_index
-#elif defined USAGE_MESSAGES
+#define rm_trivial_usage \
 	"[OPTION]... FILE..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nRemove (unlink) the FILE(s).  You may use '--' to\n"
-	"indicate that all following arguments are non-options.\n\n"
-	"Options:\n"
-	"\t-f\t\tremove existing destinations, never prompt\n"
+#define rm_full_usage \
+	"Remove (unlink) the FILE(s).  You may use '--' to\n" \
+	"indicate that all following arguments are non-options.\n\n" \
+	"Options:\n" \
+	"\t-f\t\tremove existing destinations, never prompt\n" \
 	"\t-r or -R\tremove the contents of directories recursively"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_RMDIR
-#if defined USAGE_ENUM
-rmdir_usage_index
-#elif defined USAGE_MESSAGES
+#define rmdir_trivial_usage \
 	"[OPTION]... DIRECTORY..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nRemove the DIRECTORY(ies), if they are empty."
-#endif
-#endif
-DO_COMMA
-#endif
+#define rmdir_full_usage \
+	"Remove the DIRECTORY(ies), if they are empty."
 
-#if defined BB_RMMOD
-#if defined USAGE_ENUM
-rmmod_usage_index
-#elif defined USAGE_MESSAGES
+#define rmmod_trivial_usage \
 	"[OPTION]... [MODULE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nUnloads the specified kernel modules from the kernel.\n\n"
-	"Options:\n" 
+#define rmmod_full_usage \
+	"Unloads the specified kernel modules from the kernel.\n\n" \
+	"Options:\n" \
 	"\t-a\tTry to remove all unused kernel modules."
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_ROUTE
-#if defined USAGE_ENUM
-route_usage_index
-#elif defined USAGE_MESSAGES
+#define route_trivial_usage \
 	"[{add|del|flush}]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nEdit the kernel's routing tables"
-#endif
-#endif
-DO_COMMA
-#endif
+#define route_full_usage \
+	"Edit the kernel's routing tables"
 
-#if defined BB_RPMUNPACK
-#if defined USAGE_ENUM
-rpmunpack_usage_index
-#elif defined USAGE_MESSAGES
+#define rpmunpack_trivial_usage \
 	"< package.rpm | gunzip | cpio -idmuv"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nExtracts an rpm archive."
-#endif
-#endif
-DO_COMMA
-#endif
+#define rpmunpack_full_usage \
+	"Extracts an rpm archive."
 
-#if defined BB_SED
-#if defined USAGE_ENUM
-sed_usage_index
-#elif defined USAGE_MESSAGES
+#define sed_trivial_usage \
 	"[-Vhnef] pattern [files...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\n"
-	"-n\t\tsuppress automatic printing of pattern space\n"
-	"-e script\tadd the script to the commands to be executed\n"
-	"-f scriptfile\tadd the contents of script-file to the commands to be executed\n"
-	"\n"
-	"If no -e or -f is given, the first non-option argument is taken as the\n"
-	"sed script to interpret. All remaining arguments are names of input\n"
+#define sed_full_usage \
+	"-n\t\tsuppress automatic printing of pattern space\n" \
+	"-e script\tadd the script to the commands to be executed\n" \
+	"-f scriptfile\tadd the contents of script-file to the commands to be executed\n" \
+	"-h\t\tdisplay this help message\n" \
+	"\n" \
+	"If no -e or -f is given, the first non-option argument is taken as the\n" \
+	"sed script to interpret. All remaining arguments are names of input\n" \
 	"files; if no input files are specified, then the standard input is read."
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_SETKEYCODES
-#if defined USAGE_ENUM
-setkeycodes_usage_index
-#elif defined USAGE_MESSAGES
+#define setkeycodes_trivial_usage \
 	"SCANCODE KEYCODE ..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nSet entries into the kernel's scancode-to-keycode map,\n"
-	"allowing unusual keyboards to generate usable keycodes.\n\n" 
-	"SCANCODE may be either xx or e0xx (hexadecimal),\n"
+#define setkeycodes_full_usage \
+	"Set entries into the kernel's scancode-to-keycode map,\n" \
+	"allowing unusual keyboards to generate usable keycodes.\n\n" \
+	"SCANCODE may be either xx or e0xx (hexadecimal),\n" \
 	"and KEYCODE is given in decimal"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_SH
-#if defined USAGE_ENUM
-shell_usage_index
-#elif defined USAGE_MESSAGES
-	"[FILE]...\n"
-	"   or: sh -c command [args]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nlash: The BusyBox command interpreter (shell)."
-#endif
-#endif
-DO_COMMA
-#endif
+#define sh_trivial_usage \
+	"[FILE]...\n   or: sh -c command [args]..."
+#define sh_full_usage \
+	"lash: The BusyBox command interpreter (shell)."
 
-#if defined BB_SLEEP
-#if defined USAGE_ENUM
-sleep_usage_index
-#elif defined USAGE_MESSAGES
-	"N" 
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nPause for N seconds."
-#endif
-#endif
-DO_COMMA
-#endif
+#define sleep_trivial_usage \
+	"N"
+#define sleep_full_usage \
+	"Pause for N seconds."
 
-#if defined BB_SORT
-#if defined USAGE_ENUM
-sort_usage_index
-#elif defined USAGE_MESSAGES
-	"[-n]"
-#ifdef BB_FEATURE_SORT_REVERSE
-	" [-r]"
-#endif
-	" [FILE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nSorts lines of text in the specified files"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_STTY
-#if defined USAGE_ENUM
-stty_usage_index
-#elif defined USAGE_MESSAGES
-	"stty [-a|g] [-F device] [SETTING]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nWithout arguments, prints baud rate, line discipline,"
-	"\nand deviations from stty sane."
-	"\n -F device  open and use the specified device instead of stdin"
-	"\n -a         print all current settings in human-readable form. Or"
-	"\n -g         print in a stty-readable form"
+#ifdef BB_FEATURE_SORT_REVERSE
+  #define USAGE_SORT_REVERSE(a) a
+#else
+  #define USAGE_SORT_REVERSE(a)
+#endif
+#define sort_trivial_usage \
+	"[-n]" USAGE_SORT_REVERSE(" [-r]") " [FILE]..."
+#define sort_full_usage \
+	"Sorts lines of text in the specified files"
+
+#define stty_trivial_usage \
+	"[-a|g] [-F device] [SETTING]..."
+#define stty_full_usage \
+	"Without arguments, prints baud rate, line discipline," \
+	"\nand deviations from stty sane." \
+	"\n -F device  open and use the specified device instead of stdin" \
+	"\n -a	  print all current settings in human-readable form. Or" \
+	"\n -g	  print in a stty-readable form" \
 	"\n [SETTING]  see in documentation"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_SWAPONOFF
-#if defined USAGE_ENUM
-swapoff_usage_index
-#elif defined USAGE_MESSAGES
+#define swapoff_trivial_usage \
 	"[OPTION] [device]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nStop swapping virtual memory pages on the given device.\n\n"
-	"Options:\n"
+#define swapoff_full_usage \
+	"Stop swapping virtual memory pages on the given device.\n\n" \
+	"Options:\n" \
 	"\t-a\tStop swapping on all swap devices"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_SWAPONOFF
-#if defined USAGE_ENUM
-swapon_usage_index
-#elif defined USAGE_MESSAGES
+#define swapon_trivial_usage \
 	"[OPTION] [device]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nStart swapping virtual memory pages on the given device.\n\n"
-	"Options:\n"
+#define swapon_full_usage \
+	"Start swapping virtual memory pages on the given device.\n\n" \
+	"Options:\n" \
 	"\t-a\tStart swapping on all swap devices"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_SYNC
-#if defined USAGE_ENUM
-sync_usage_index
-#elif defined USAGE_MESSAGES
+#define sync_trivial_usage \
 	""
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nWrite all buffered filesystem blocks to disk."
-#endif
-#endif
-DO_COMMA
-#endif
+#define sync_full_usage \
+	"Write all buffered filesystem blocks to disk."
+
 
-#if defined BB_SYSLOGD
-#if defined USAGE_ENUM
-syslogd_usage_index
-#elif defined USAGE_MESSAGES
-	"[OPTION]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nLinux system and kernel (provides klogd) logging utility.\n"
-	"Note that this version of syslogd/klogd ignores /etc/syslog.conf.\n\n"
-	"Options:\n"
-	"\t-m NUM\t\tInterval between MARK lines (default=20min, 0=off)\n"
-	"\t-n\t\tRun as a foreground process\n"
 #ifdef BB_FEATURE_KLOGD
-	"\t-K\t\tDo not start up the klogd process\n"
+  #define USAGE_KLOGD(a) a
+#else
+  #define USAGE_KLOGD(a)
 #endif
-	"\t-O FILE\t\tUse an alternate log file (default=/var/log/messages)"
 #ifdef BB_FEATURE_REMOTE_LOG
-	"\n\t-R HOST[:PORT]\t\tLog remotely to IP or hostname on PORT (default PORT=514/UDP)\n"
-	"\t-L\t\tLog locally as well as network logging (default is network only)"
-#endif
-#endif
+  #define USAGE_REMOTE_LOG(a) a
+#else
+  #define USAGE_REMOTE_LOG(a)
 #endif
-DO_COMMA
+#define syslogd_trivial_usage \
+	"[OPTION]..."
+#define syslogd_full_usage \
+	"Linux system and kernel (provides klogd) logging utility.\n" \
+	"Note that this version of syslogd/klogd ignores /etc/syslog.conf.\n\n" \
+	"Options:\n" \
+	"\t-m NUM\t\tInterval between MARK lines (default=20min, 0=off)\n" \
+	"\t-n\t\tRun as a foreground process\n" \
+USAGE_KLOGD("\t-K\t\tDo not start up the klogd process\n") \
+	"\t-O FILE\t\tUse an alternate log file (default=/var/log/messages)" \
+USAGE_REMOTE_LOG( \
+	"\n\t-R HOST[:PORT]\t\tLog remotely to IP or hostname on PORT (default PORT=514/UDP)\n" \
+	"\t-L\t\tLog locally as well as network logging (default is network only)")
+
+
+#ifdef BB_FEATURE_SIMPLE_TAIL
+  #define USAGE_UNSIMPLE_TAIL(a)
+#else
+  #define USAGE_UNSIMPLE_TAIL(a) a
 #endif
-
-#if defined BB_TAIL
-#if defined USAGE_ENUM
-tail_usage_index
-#elif defined USAGE_MESSAGES
+#define tail_trivial_usage \
 	"[OPTION]... [FILE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nPrint last 10 lines of each FILE to standard output.\n"
-	"With more than one FILE, precede each with a header giving the\n"
-	"file name. With no FILE, or when FILE is -, read standard input.\n\n"
-	"Options:\n"
-#ifndef BB_FEATURE_SIMPLE_TAIL
-	"\t-c N[kbm]\toutput the last N bytes\n"
-#endif
-	"\t-n N[kbm]\tprint last N lines instead of last 10\n"
-	"\t-f\t\toutput data as the file grows"
-#ifndef BB_FEATURE_SIMPLE_TAIL
-	"\n\t-q\t\tnever output headers giving file names\n"
-	"\t-s SEC\t\twait SEC seconds between reads with -f\n"
-	"\t-v\t\talways output headers giving file names\n\n"
-	"If the first character of N (bytes or lines) is a `+', output begins with \n"
-	"the Nth item from the start of each file, otherwise, print the last N items\n"
-	"in the file. N bytes may be suffixed by k (x1024), b (x512), or m (1024^2)."
-//#else
-//	"\nIf the first character of N (bytes or lines) is a `+', output begins with \n"
-//	"the Nth item from the start of each file."
-#endif
-#endif
-#endif
-DO_COMMA
-#endif
+#define tail_full_usage \
+	"Print last 10 lines of each FILE to standard output.\n" \
+	"With more than one FILE, precede each with a header giving the\n" \
+	"file name. With no FILE, or when FILE is -, read standard input.\n\n" \
+	"Options:\n" \
+USAGE_UNSIMPLE_TAIL("\t-c N[kbm]\toutput the last N bytes\n") \
+	"\t-n N[kbm]\tprint last N lines instead of last 10\n" \
+	"\t-f\t\toutput data as the file grows" \
+USAGE_UNSIMPLE_TAIL( \
+	"\n\t-q\t\tnever output headers giving file names\n" \
+	"\t-s SEC\t\twait SEC seconds between reads with -f\n" \
+	"\t-v\t\talways output headers giving file names\n\n" \
+	"If the first character of N (bytes or lines) is a `+', output begins with \n" \
+	"the Nth item from the start of each file, otherwise, print the last N items\n" \
+	"in the file. N bytes may be suffixed by k (x1024), b (x512), or m (1024^2)." \
+	)
 
-#if defined BB_TAR
-#if defined USAGE_ENUM
-tar_usage_index
-#elif defined USAGE_MESSAGES
 #ifdef BB_FEATURE_TAR_CREATE
-	"-[cxtvO] "
+  #define USAGE_TAR_CREATE(a) a
 #else
-	"-[xtvO] "
+  #define USAGE_TAR_CREATE(a)
 #endif
-#if defined BB_FEATURE_TAR_EXCLUDE
-	"[--exclude File] "
-        "[-X File]"
+#ifdef BB_FEATURE_TAR_EXCLUDE
+  #define USAGE_TAR_EXCLUDE(a) a
+#else
+  #define USAGE_TAR_EXCLUDE(a)
 #endif
+#define tar_trivial_usage \
+	"-[" USAGE_TAR_CREATE("c") "xtvO] " \
+	USAGE_TAR_EXCLUDE("[--exclude File] [-X File]") \
 	"[-f tarFile] [FILE(s)] ..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nCreate, extract, or list files from a tar file.\n\n"
-	"Main operation mode:\n"
-#ifdef BB_FEATURE_TAR_CREATE
-	"\tc\t\tcreate\n"
-#endif
-	"\tx\t\textract\n"
-	"\tt\t\tlist\n"
-	"\nFile selection:\n"
-	"\tf\t\tname of tarfile or \"-\" for stdin\n"
-	"\tO\t\textract to stdout\n"
-#if defined BB_FEATURE_TAR_EXCLUDE
-	"\texclude\t\tfile to exclude\n"
-        "\tX\t\tfile with names to exclude\n"
-#endif
-	"\nInformative output:\n"
+#define tar_full_usage \
+	"Create, extract, or list files from a tar file.\n\n" \
+	"Main operation mode:\n" \
+USAGE_TAR_CREATE("\tc\t\tcreate\n") \
+	"\tx\t\textract\n" \
+	"\tt\t\tlist\n" \
+	"\nFile selection:\n" \
+	"\tf\t\tname of tarfile or \"-\" for stdin\n" \
+	"\tO\t\textract to stdout\n" \
+USAGE_TAR_EXCLUDE( \
+	"\texclude\t\tfile to exclude\n" \
+	 "\tX\t\tfile with names to exclude\n" \
+	) \
+	"\nInformative output:\n" \
 	"\tv\t\tverbosely list files processed"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_TEE
-#if defined USAGE_ENUM
-tee_usage_index
-#elif defined USAGE_MESSAGES
+#define tee_trivial_usage \
 	"[OPTION]... [FILE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nCopy standard input to each FILE, and also to standard output.\n\n"
+#define tee_full_usage \
+	"Copy standard input to each FILE, and also to standard output.\n\n" \
 	"Options:\n" "\t-a\tappend to the given FILEs, do not overwrite"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_TELNET
-#if defined USAGE_ENUM
-telnet_usage_index
-#elif defined USAGE_MESSAGES
+#define telnet_trivial_usage \
 	"host [port]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nTelnet is used to establish interactive communication with another\n"
+#define telnet_full_usage \
+	"Telnet is used to establish interactive communication with another\n"\
 	"computer over a network using the TELNET protocol."
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_TEST
-#if defined USAGE_ENUM
-test_usage_index
-#elif defined USAGE_MESSAGES
-	"\ntest EXPRESSION\n"
-	"or   [ EXPRESSION ]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nChecks file types and compares values returning an exit\n"
+#define test_trivial_usage \
+	"EXPRESSION\n  or   [ EXPRESSION ]"
+#define test_full_usage \
+	"Checks file types and compares values returning an exit\n" \
 	"code determined by the value of EXPRESSION."
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_TOUCH
-#if defined USAGE_ENUM
-touch_usage_index
-#elif defined USAGE_MESSAGES
+#define touch_trivial_usage \
 	"[-c] file [file ...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nUpdate the last-modified date on the given file[s].\n\n"
-	"Options:\n"
+#define touch_full_usage \
+	"Update the last-modified date on the given file[s].\n\n" \
+	"Options:\n" \
 	"\t-c\tDo not create any files"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_TR
-#if defined USAGE_ENUM
-tr_usage_index
-#elif defined USAGE_MESSAGES
+#define tr_trivial_usage \
 	"[-cds] STRING1 [STRING2]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nTranslate, squeeze, and/or delete characters from\n"
-	"standard input, writing to standard output.\n\n"
-	"Options:\n"
-	"\t-c\ttake complement of STRING1\n"
-	"\t-d\tdelete input characters coded STRING1\n"
+#define tr_full_usage \
+	"Translate, squeeze, and/or delete characters from\n" \
+	"standard input, writing to standard output.\n\n" \
+	"Options:\n" \
+	"\t-c\ttake complement of STRING1\n" \
+	"\t-d\tdelete input characters coded STRING1\n" \
 	"\t-s\tsqueeze multiple output characters of STRING2 into one character"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_TRUE_FALSE
-#if defined USAGE_ENUM
-true_usage_index
-#elif defined USAGE_MESSAGES
+#define true_trivial_usage \
 	""
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nReturn an exit code of TRUE (0)."
-#endif
-#endif
-DO_COMMA
-#endif
+#define true_full_usage \
+	"Return an exit code of TRUE (0)."
 
-#if defined BB_TTY
-#if defined USAGE_ENUM
-tty_usage_index
-#elif defined USAGE_MESSAGES
+#define tty_trivial_usage \
 	""
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nPrint the file name of the terminal connected to standard input.\n\n"
-	"Options:\n"
+#define tty_full_usage \
+	"Print the file name of the terminal connected to standard input.\n\n"\
+	"Options:\n" \
 	"\t-s\tprint nothing, only return an exit status"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_UMOUNT
-#if defined USAGE_ENUM
-umount_usage_index
-#elif defined USAGE_MESSAGES
-	"[flags] filesystem|directory"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nUnmount file systems\n"
-	"\nFlags:\n" "\t-a:\tUnmount all file systems"
-#ifdef BB_MTAB
-	" in /etc/mtab\n\t-n:\tDon't erase /etc/mtab entries\n"
+#ifdef BB_FEATURE_MOUNT_FORCE
+  #define USAGE_MOUNT_FORCE(a) a
 #else
-	"\n"
-#endif
-	"\t-r:\tTry to remount devices as read-only if mount is busy"
-#if defined BB_FEATURE_MOUNT_FORCE
-	"\n\t-f:\tForce filesystem umount (i.e. unreachable NFS server)"
-#endif
-#if defined BB_FEATURE_MOUNT_LOOP
-	"\n\t-l:\tDo not free loop device (if a loop device has been used)"
+  #define USAGE_MOUNT_FORCE(a)
 #endif
-#endif
-#endif
-DO_COMMA
-#endif
-
-#if defined BB_UNAME
-#if defined USAGE_ENUM
-uname_usage_index
-#elif defined USAGE_MESSAGES
+#define umount_trivial_usage \
+	"[flags] filesystem|directory"
+#define umount_full_usage \
+	"Unmount file systems\n" \
+	"\nFlags:\n" "\t-a:\tUnmount all file systems" \
+USAGE_MTAB(" in /etc/mtab\n\t-n:\tDon't erase /etc/mtab entries") \
+	"\n\t-r:\tTry to remount devices as read-only if mount is busy" \
+USAGE_MOUNT_FORCE("\n\t-f:\tForce filesystem umount (i.e. unreachable NFS server)") \
+USAGE_MOUNT_LOOP("\n\t-l:\tDo not free loop device (if a loop device has been used)" \
+	)
+
+#define uname_trivial_usage \
 	"[OPTION]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nPrint certain system information.  With no OPTION, same as -s.\n\n"
-	"Options:\n"
-	"\t-a\tprint all information\n"
-	"\t-m\tthe machine (hardware) type\n"
-	"\t-n\tprint the machine's network node hostname\n"
-	"\t-r\tprint the operating system release\n"
-	"\t-s\tprint the operating system name\n"
-
-	"\t-p\tprint the host processor type\n"
+#define uname_full_usage \
+	"Print certain system information.  With no OPTION, same as -s.\n\n" \
+	"Options:\n" \
+	"\t-a\tprint all information\n" \
+	"\t-m\tthe machine (hardware) type\n" \
+	"\t-n\tprint the machine's network node hostname\n" \
+	"\t-r\tprint the operating system release\n" \
+	"\t-s\tprint the operating system name\n" \
+	"\t-p\tprint the host processor type\n" \
 	"\t-v\tprint the operating system version"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_UNIQ
-#if defined USAGE_ENUM
-uniq_usage_index
-#elif defined USAGE_MESSAGES
+#define uniq_trivial_usage \
 	"[OPTION]... [INPUT [OUTPUT]]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nDiscard all but one of successive identical lines from INPUT\n"
-	"(or standard input), writing to OUTPUT (or standard output).\n"
-	"Options:\n"
-	"\t-c\tprefix lines by the number of occurrences\n"
-	"\t-d\tonly print duplicate lines\n"
+#define uniq_full_usage \
+	"Discard all but one of successive identical lines from INPUT\n" \
+	"(or standard input), writing to OUTPUT (or standard output).\n" \
+	"Options:\n" \
+	"\t-c\tprefix lines by the number of occurrences\n" \
+	"\t-d\tonly print duplicate lines\n" \
 	"\t-u\tonly print unique lines"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_UNIX2DOS
-#if defined USAGE_ENUM
-unix2dos_usage_index
-#elif defined USAGE_MESSAGES
+#define unix2dos_trivial_usage \
 	"< unixfile > dosfile"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nConverts a text file from unix format to dos format."
-#endif
-#endif
-DO_COMMA
-#endif
+#define unix2dos_full_usage \
+	"Converts a text file from unix format to dos format."
 
-#if defined BB_UPDATE
-#if defined USAGE_ENUM
-update_usage_index
-#elif defined USAGE_MESSAGES
+#define update_trivial_usage \
 	"[options]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nPeriodically flushes filesystem buffers.\n\n"
-	"Options:\n"
-	"\t-S\tforce use of sync(2) instead of flushing\n"
-	"\t-s SECS\tcall sync this often (default 30)\n"
+#define update_full_usage \
+	"Periodically flushes filesystem buffers.\n\n" \
+	"Options:\n" \
+	"\t-S\tforce use of sync(2) instead of flushing\n" \
+	"\t-s SECS\tcall sync this often (default 30)\n" \
 	"\t-f SECS\tflush some buffers this often (default 5)"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_UPTIME
-#if defined USAGE_ENUM
-uptime_usage_index
-#elif defined USAGE_MESSAGES
+#define uptime_trivial_usage \
 	""
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nDisplay the time since the last boot."
-#endif
-#endif
-DO_COMMA
-#endif
+#define uptime_full_usage \
+	"Display the time since the last boot."
 
-#if defined BB_USLEEP
-#if defined USAGE_ENUM
-usleep_usage_index
-#elif defined USAGE_MESSAGES
+#define usleep_trivial_usage \
 	"N" 
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nPause for N microseconds."
-#endif
-#endif
-DO_COMMA
-#endif
+#define usleep_full_usage \
+	"Pause for N microseconds."
 
-#if defined BB_UUDECODE
-#if defined USAGE_ENUM
-uudecode_usage_index
-#elif defined USAGE_MESSAGES
+#define uudecode_trivial_usage \
 	"[FILE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nUudecode a file that is uuencoded.\n\n"
-	"Options:\n"
-	"\t-o FILE\tdirect output to FILE"
-#endif
-#endif
-DO_COMMA
-#endif
+#define uudecode_full_usage \
+	"Uudecode a file that is uuencoded.\n\n" \
+	"Options:\n" \
+	"\t-o FILE\tdirect output to FILE" \
 
-#if defined BB_UUENCODE
-#if defined USAGE_ENUM
-uuencode_usage_index
-#elif defined USAGE_MESSAGES
+#define uuencode_trivial_usage \
 	"[OPTION] [INFILE] REMOTEFILE"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nUuencode a file.\n\n"
-	"Options:\n"
+#define uuencode_full_usage \
+	"Uuencode a file.\n\n" \
+	"Options:\n" \
 	"\t-m\tuse base64 encoding as of RFC1521"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_WATCHDOG
-#if defined USAGE_ENUM
-watchdog_usage_index
-#elif defined USAGE_MESSAGES
+#define watchdog_trivial_usage \
 	"dev"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nPeriodically write to watchdog device \"dev\""
-#endif
-#endif
-DO_COMMA
-#endif
+#define watchdog_full_usage \
+	"Periodically write to watchdog device \"dev\""
 
-#if defined BB_WC
-#if defined USAGE_ENUM
-wc_usage_index
-#elif defined USAGE_MESSAGES
+#define wc_trivial_usage \
 	"[OPTION]... [FILE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nPrint line, word, and byte counts for each FILE, and a total line if\n"
-	"more than one FILE is specified.  With no FILE, read standard input.\n\n"
-	"Options:\n"
-	"\t-c\tprint the byte counts\n"
-	"\t-l\tprint the newline counts\n"
-
-	"\t-L\tprint the length of the longest line\n"
+#define wc_full_usage \
+	"Print line, word, and byte counts for each FILE, and a total line if\n" \
+	"more than one FILE is specified.  With no FILE, read standard input.\n\n" \
+	"Options:\n" \
+	"\t-c\tprint the byte counts\n" \
+	"\t-l\tprint the newline counts\n" \
+	"\t-L\tprint the length of the longest line\n" \
 	"\t-w\tprint the word counts"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_WGET
-#if defined USAGE_ENUM
-wget_usage_index
-#elif defined USAGE_MESSAGES
- "[-c] [-O file] url"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nwget retrieves files via HTTP\n\n"
-	"Options:\n"
-	"\t-c\tcontinue retrieval of aborted transfers\n"
+#define wget_trivial_usage \
+	"[-c] [-O file] url"
+#define wget_full_usage \
+	"wget retrieves files via HTTP\n\n" \
+	"Options:\n" \
+	"\t-c\tcontinue retrieval of aborted transfers\n" \
 	"\t-O\tsave to filename ('-' for stdout)"
-#endif
-#endif
-DO_COMMA
-#endif
 
-#if defined BB_WHICH
-#if defined USAGE_ENUM
-which_usage_index
-#elif defined USAGE_MESSAGES
+#define which_trivial_usage \
 	"[COMMAND ...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nLocates a COMMAND."
-#endif
-#endif
-DO_COMMA
-#endif
+#define which_full_usage \
+	"Locates a COMMAND."
 
-#if defined BB_WHOAMI
-#if defined USAGE_ENUM
-whoami_usage_index
-#elif defined USAGE_MESSAGES
+#define whoami_trivial_usage \
 	""
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nPrints the user name associated with the current effective user id."
-#endif
-#endif
-DO_COMMA
-#endif
+#define whoami_full_usage \
+	"Prints the user name associated with the current effective user id."
 
-#if defined BB_XARGS
-#if defined USAGE_ENUM
-xargs_usage_index
-#elif defined USAGE_MESSAGES
- "[COMMAND] [ARGS...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nExecutes COMMAND on every item given by standard input." 
-#endif
-#endif
-DO_COMMA
-#endif
+#define xargs_trivial_usage \
+	"[COMMAND] [ARGS...]"
+#define xargs_full_usage \
+	"Executes COMMAND on every item given by standard input."
 
-#if defined BB_YES
-#if defined USAGE_ENUM
-yes_usage_index
-#elif defined USAGE_MESSAGES
+#define yes_trivial_usage \
 	"[OPTION]... [STRING]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n\nRepeatedly outputs a line with all specified STRING(s), or `y'."
-#endif
-#endif
-DO_COMMA
-#endif
-
-#if defined USAGE_ENUM || defined USAGE_MESSAGES
-};
-#endif
-
-#undef DOCOMMA
-#undef USAGE_ENUM
-#undef USAGE_MESSAGES
+#define yes_full_usage \
+	"Repeatedly outputs a line with all specified STRING(s), or `y'."
 
+#define zcat_trivial_usage \
+	"FILE"
+#define zcat_full_usage \
+	"Uncompress to stdout."