X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fopt%2Fusage.c;fp=ccan%2Fopt%2Fusage.c;h=494b179bfde97ccb93c8969ce066f1b5860b5097;hp=ff0545591ed4050a5153aa5c8d6db2041a1295e4;hb=13b374859ed7564c5945ff9e18c7bc0e98d7532e;hpb=2e26b06e6384c4483dde844cf8991846075e552c

diff --git a/ccan/opt/usage.c b/ccan/opt/usage.c
index ff054559..494b179b 100644
--- a/ccan/opt/usage.c
+++ b/ccan/opt/usage.c
@@ -47,7 +47,7 @@ static size_t consume_words(const char *words, size_t maxlen, size_t *prefix)
 	size_t oldlen, len;
 
 	/* Swallow leading whitespace. */
-	*prefix = strspn(words, " ");
+	*prefix = strspn(words, " \n");
 	words += *prefix;
 
 	/* Use at least one word, even if it takes us over maxlen. */
@@ -55,7 +55,9 @@ static size_t consume_words(const char *words, size_t maxlen, size_t *prefix)
 	while (len <= maxlen) {
 		oldlen = len;
 		len += strspn(words+len, " ");
-		len += strcspn(words+len, " ");
+		if (words[len] == '\n')
+			break;
+		len += strcspn(words+len, " \n");
 		if (len == oldlen)
 			break;
 	}