-/* 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. */
/* Return number of chars of words to put on this line.
* Prefix is set to number to skip at start, maxlen is max width, returns
- * length (after prefix) to put on this line. */
-static size_t consume_words(const char *words, size_t maxlen, size_t *prefix)
+ * length (after prefix) to put on this line.
+ * start is set if we start a new line in the source description. */
+static size_t consume_words(const char *words, size_t maxlen, size_t *prefix,
+ bool *start)
{
size_t oldlen, len;
- /* Swallow leading whitespace. */
- *prefix = strspn(words, " ");
+ /* Always swollow leading whitespace. */
+ *prefix = strspn(words, " \n");
words += *prefix;
- /* Use at least one word, even if it takes us over maxlen. */
- oldlen = len = strcspn(words, " ");
- while (len <= maxlen) {
- oldlen = len;
- len += strspn(words+len, " ");
- len += strcspn(words+len, " ");
- if (len == oldlen)
- break;
+ /* Leading whitespace at start of line means literal. */
+ if (*start && *prefix) {
+ oldlen = strcspn(words, "\n");
+ } else {
+ /* Use at least one word, even if it takes us over maxlen. */
+ oldlen = len = strcspn(words, " ");
+ while (len <= maxlen) {
+ oldlen = len;
+ len += strspn(words+len, " ");
+ if (words[len] == '\n')
+ break;
+ len += strcspn(words+len, " \n");
+ if (len == oldlen)
+ break;
+ }
}
+ *start = (words[oldlen - 1] == '\n');
return oldlen;
}
{
size_t off, prefix, l;
const char *p;
- bool same_line = false;
+ bool same_line = false, start = true;
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>");
/* Indent description. */
p = opt->desc;
- while ((l = consume_words(p, width - indent, &prefix)) != 0) {
+ while ((l = consume_words(p, width - indent, &prefix, &start)) != 0) {
if (!same_line)
base = add_indent(base, len, max, indent);
p += prefix;
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);
+}