- w = snprintf(optstring, sizeof optstring,
- _(" -%c, --%s[=%s]"), opt->val, opt->name,
- pgettext_expr(opt->name, argname));
+ case OPT_LONG_WITH_OPTIONAL_ARG:
+ w = help_do_snprintf(optstring, sizeof optstring,
+ _(" -%s [%s]"), opt->name,
+ pgettext_expr(opt->name, argname));
+ break;
+ case OPT_SHORT_WITH_MANDATORY_ARG:
+ case OPT_LONG_WITH_MANDATORY_ARG:
+ w = help_do_snprintf(optstring, sizeof optstring,
+ _(" -%s %s"), opt->name,
+ pgettext_expr(opt->name, argname));
+ break;
+ case OPT_SHORT_WITHOUT_ARG:
+ case OPT_LONG_WITHOUT_ARG:
+ w = help_do_snprintf(optstring, sizeof optstring,
+ _(" -%s"), opt->name);
+ break;
+#else
+ case OPT_SHORT_WITH_OPTIONAL_ARG:
+ w = help_do_snprintf(optstring, sizeof optstring,
+ _(" -%c, --%s[=%s]"), opt->val, opt->name,
+ pgettext_expr(opt->name, argname));