X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fopt%2Fusage.c;h=12f44a48752e0e0d4e0d722c74b7513561334733;hb=HEAD;hp=3edc4cf87ade8c8158eed5f01f9500944ae7c264;hpb=8071ba125bb6893b88c02353638eeac220cb99c1;p=ccan

diff --git a/ccan/opt/usage.c b/ccan/opt/usage.c
index 3edc4cf8..568e4661 100644
--- a/ccan/opt/usage.c
+++ b/ccan/opt/usage.c
@@ -1,14 +1,17 @@
-/* Licensed under GPLv3+ - see LICENSE file for details */
+/* Licensed under GPLv2+ - see LICENSE file for details */
 #include <ccan/opt/opt.h>
 #if HAVE_SYS_TERMIOS_H
 #include <sys/ioctl.h>
 #include <sys/termios.h> /* Required on Solaris for struct winsize */
 #endif
+#if HAVE_SYS_UNISTD_H
 #include <sys/unistd.h> /* Required on Solaris for ioctl */
+#endif
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdint.h>
+#include <stdarg.h>
 #include "private.h"
 
 /* We only use this for pointer comparisons. */
@@ -17,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;
@@ -69,7 +75,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;
 }
 
@@ -107,7 +114,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>");
@@ -144,20 +151,20 @@ 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);
+		if (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(")")
+			    > width) {
+				base = add_indent(base, len, max, indent);
+			} else {
+				/* Remove \n. */
+				(*len)--;
+			}
 
-		/* If it doesn't fit on this line, indent. */
-		if (off + strlen(" (default: ") + strlen(buf) + strlen(")")
-		    > width) {
-			base = add_indent(base, len, max, indent);
-		} else {
-			/* Remove \n. */
-			(*len)--;
+			base = add_str(base, len, max, " (default: ");
+			base = add_str(base, len, max, buf);
+			base = add_str(base, len, max, ")\n");
 		}
-
-		base = add_str(base, len, max, " (default: ");
-		base = add_str(base, len, max, buf);
-		base = add_str(base, len, max, ")\n");
 	}
 	return base;
 }
@@ -178,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>");
@@ -217,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;
@@ -227,3 +234,17 @@ char *opt_usage(const char *argv0, const char *extra)
 	ret[len] = '\0';
 	return ret;
 }
+
+void opt_usage_exit_fail(const char *msg, ...)
+{
+	va_list ap;
+
+	if (opt_argv0)
+		fprintf(stderr, "%s: ", opt_argv0);
+	va_start(ap, msg);
+	vfprintf(stderr, msg, ap);
+	va_end(ap);
+	fprintf(stderr, "\n%s",
+		opt_usage(opt_argv0 ? opt_argv0 : "<program>", NULL));
+	exit(1);
+}