X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fopt%2Fusage.c;h=eedaae7eb821d0dab8114de49222b14496887aa0;hp=cbe1231a484fedf27e826a3485a1a333dd7314dd;hb=cdc32f6d35066fe264a228fe20aa75729e41726e;hpb=d89e5744f30b584ac4909ce1164af1289c41359b

diff --git a/ccan/opt/usage.c b/ccan/opt/usage.c
index cbe1231a..eedaae7e 100644
--- a/ccan/opt/usage.c
+++ b/ccan/opt/usage.c
@@ -28,6 +28,17 @@ char *opt_usage(const char *argv0, const char *extra)
 	unsigned int i, num, len;
 	char *ret, *p;
 
+	if (!extra) {
+		extra = "";
+		for (i = 0; i < opt_count; i++) {
+			if (opt_table[i].cb == (void *)opt_usage_and_exit
+			    && opt_table[i].arg) {
+				extra = opt_table[i].arg;
+				break;
+			}
+		}
+	}
+
 	/* An overestimate of our length. */
 	len = strlen("Usage: %s ") + strlen(argv0)
 		+ strlen("[-%.*s]") + opt_num_short + 1
@@ -35,15 +46,13 @@ char *opt_usage(const char *argv0, const char *extra)
 		+ strlen("\n");
 
 	for (i = 0; i < opt_count; i++) {
-		if (opt_table[i].flags == OPT_SUBTABLE) {
+		if (opt_table[i].type == OPT_SUBTABLE) {
 			len += strlen("\n") + strlen(opt_table[i].desc)
 				+ strlen(":\n");
 		} else if (opt_table[i].desc != opt_hidden) {
 			len += strlen(opt_table[i].names) + strlen(" <arg>");
-			if (opt_table[i].desc) {
-				len += strlen(OPT_SPACE_PAD)
-					+ strlen(opt_table[i].desc) + 1;
-			}
+			len += strlen(OPT_SPACE_PAD)
+				+ strlen(opt_table[i].desc) + 1;
 			if (opt_table[i].show) {
 				len += strlen("(default: %s)")
 					+ OPT_SHOW_LEN + sizeof("...");
@@ -73,27 +82,26 @@ char *opt_usage(const char *argv0, const char *extra)
 	for (i = 0; i < opt_count; i++) {
 		if (opt_table[i].desc == opt_hidden)
 			continue;
-		if (opt_table[i].flags == OPT_SUBTABLE) {
+		if (opt_table[i].type == OPT_SUBTABLE) {
 			p += sprintf(p, "%s:\n", opt_table[i].desc);
 			continue;
 		}
 		len = sprintf(p, "%s", opt_table[i].names);
-		if (opt_table[i].flags == OPT_HASARG)
+		if (opt_table[i].type == OPT_HASARG
+		    && !strchr(opt_table[i].names, ' ')
+		    && !strchr(opt_table[i].names, '='))
 			len += sprintf(p + len, " <arg>");
-		if (opt_table[i].desc || opt_table[i].show)
-			len += sprintf(p + len, "%.*s",
-				       len < strlen(OPT_SPACE_PAD)
-				       ? strlen(OPT_SPACE_PAD) - len : 1,
-				       OPT_SPACE_PAD);
+		len += sprintf(p + len, "%.*s",
+			       len < strlen(OPT_SPACE_PAD)
+			       ? strlen(OPT_SPACE_PAD) - len : 1,
+			       OPT_SPACE_PAD);
 
-		if (opt_table[i].desc)
-			len += sprintf(p + len, "%s", opt_table[i].desc);
+		len += sprintf(p + len, "%s", opt_table[i].desc);
 		if (opt_table[i].show) {
 			char buf[OPT_SHOW_LEN + sizeof("...")];
 			strcpy(buf + OPT_SHOW_LEN, "...");
 			opt_table[i].show(buf, opt_table[i].arg);
-			len += sprintf(p + len, "%s(default: %s)",
-				       opt_table[i].desc ? " " : "", buf);
+			len += sprintf(p + len, " (default: %s)", buf);
 		}
 		p += len;
 		p += sprintf(p, "\n");