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

diff --git a/ccan/opt/usage.c b/ccan/opt/usage.c
index 3edc4cf8..353d59bc 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. */
@@ -227,3 +230,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);
+}