From 9ab517d65bbe24869c2c449a52eb17f572d1ac8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 18 Nov 2018 13:52:53 +0100 Subject: New upstream version 3.24 --- src/opt.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'src/opt.c') diff --git a/src/opt.c b/src/opt.c index d64e521..8efbf52 100644 --- a/src/opt.c +++ b/src/opt.c @@ -304,22 +304,20 @@ static void opt_to_text(const struct HXoption *opt, char *buf, size_t len, buf[i++] = opt->sh; if (!takes_void(opt->type)) i += snprintf(buf + i, len - i, " %s", htyp); + } else if (opt->sh == '\0') { + if (takes_void(opt->type)) + i += snprintf(buf + i, len - i, + "--%s", opt->ln); + else + i += snprintf(buf + i, len - i, + "--%s=%s", opt->ln, htyp); } else { - if (opt->sh == '\0') { - if (takes_void(opt->type)) - i += snprintf(buf + i, len - i, - "--%s", opt->ln); - else - i += snprintf(buf + i, len - i, - "--%s=%s", opt->ln, htyp); - } else { - if (takes_void(opt->type)) - i += snprintf(buf + i, len - i, "-%c%s--%s", - opt->sh, alt, opt->ln); - else - i += snprintf(buf + i, len - i, "-%c%s--%s%c%s", - opt->sh, alt, opt->ln, equ, htyp); - } + if (takes_void(opt->type)) + i += snprintf(buf + i, len - i, "-%c%s--%s", + opt->sh, alt, opt->ln); + else + i += snprintf(buf + i, len - i, "-%c%s--%s%c%s", + opt->sh, alt, opt->ln, equ, htyp); } if (flags & W_BRACKET) -- cgit v1.2.3