X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=ccan%2Fopt%2Fusage.c;h=e96298382c3d018f16b55281115ceace40164939;hb=995d2aff223e70ef5c60ac0416645b27ac84d5ff;hp=8ee4ebd03ad5083e2f8a36649319190edb14e7b5;hpb=fbac6a54735b5d153be4675d555e73713186cf69;p=ccan

diff --git a/ccan/opt/usage.c b/ccan/opt/usage.c
index 8ee4ebd0..e9629838 100644
--- a/ccan/opt/usage.c
+++ b/ccan/opt/usage.c
@@ -20,6 +20,9 @@ const char opt_hidden[1];
 #define MIN_DESC_WIDTH 40
 #define MIN_TOTAL_WIDTH 50
 
+/* Maximum length of arg to show in opt_usage */
+#define OPT_SHOW_LEN 80
+
 static unsigned int get_columns(void)
 {
 	int ws_col = 0;
@@ -148,7 +151,7 @@ static char *add_desc(char *base, size_t *len, size_t *max,
 	if (opt->show) {
 		char buf[OPT_SHOW_LEN + sizeof("...")];
 		strcpy(buf + OPT_SHOW_LEN, "...");
-		opt->show(buf, opt->u.arg);
+		opt->show(buf, OPT_SHOW_LEN, opt->u.arg);
 
 		/* If it doesn't fit on this line, indent. */
 		if (off + strlen(" (default: ") + strlen(buf) + strlen(")")
@@ -182,10 +185,10 @@ char *opt_usage(const char *argv0, const char *extra)
 		size_t l;
 		if (opt_table[i].desc == opt_hidden)
 			continue;
-		if (opt_table[i].type == OPT_SUBTABLE)
+		if (opt_table[i].type & OPT_SUBTABLE)
 			continue;
 		l = strlen(opt_table[i].names);
-		if (opt_table[i].type == OPT_HASARG
+		if ((opt_table[i].type & OPT_HASARG)
 		    && !strchr(opt_table[i].names, ' ')
 		    && !strchr(opt_table[i].names, '='))
 			l += strlen(" <arg>");
@@ -221,7 +224,7 @@ 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].type == OPT_SUBTABLE) {
+		if (opt_table[i].type & OPT_SUBTABLE) {
 			ret = add_str(ret, &len, &max, opt_table[i].desc);
 			ret = add_str(ret, &len, &max, ":\n");
 			continue;