X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fopt%2Fusage.c;h=8ee4ebd03ad5083e2f8a36649319190edb14e7b5;hb=272b81be35908402abc92222ebfa2b845c240319;hp=353d59bc48542d8423ddc3c437ed36146488ec37;hpb=6ac981db899685916603fd2e12dcbbd760a2b294;p=ccan

diff --git a/ccan/opt/usage.c b/ccan/opt/usage.c
index 353d59bc..8ee4ebd0 100644
--- a/ccan/opt/usage.c
+++ b/ccan/opt/usage.c
@@ -72,7 +72,8 @@ static size_t consume_words(const char *words, size_t maxlen, size_t *prefix,
 		}
 	}
 
-	*start = (words[oldlen - 1] == '\n');
+	if (oldlen != 0)
+		*start = (words[oldlen - 1] == '\n');
 	return oldlen;
 }
 
@@ -110,7 +111,7 @@ static char *add_desc(char *base, size_t *len, size_t *max,
 
 	base = add_str(base, len, max, opt->names);
 	off = strlen(opt->names);
-	if (opt->type == OPT_HASARG
+	if ((opt->type & OPT_HASARG)
 	    && !strchr(opt->names, ' ')
 	    && !strchr(opt->names, '=')) {
 		base = add_str(base, len, max, " <arg>");