msgstr ""
"Project-Id-Version: cdecl99 0.1\n"
"Report-Msgid-Bugs-To: nbowler@draconx.ca\n"
-"POT-Creation-Date: 2020-06-29 22:52-0400\n"
+"POT-Creation-Date: 2021-02-26 00:33-0500\n"
"PO-Revision-Date: 2011-09-13 21:54-0400\n"
"Last-Translator: Nick Bowler <nbowler@draconx.ca>\n"
"Language-Team: English\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/getopt.c:547 lib/getopt.c:576
+#: lib/getopt.c:278
#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous\n"
msgstr ""
-#: lib/getopt.c:624 lib/getopt.c:628
+#: lib/getopt.c:284
#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
msgstr ""
-#: lib/getopt.c:637 lib/getopt.c:642
+#: lib/getopt.c:319
#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: unrecognized option '%s%s'\n"
msgstr ""
-#: lib/getopt.c:685 lib/getopt.c:704
+#: lib/getopt.c:345
#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
msgstr ""
-#: lib/getopt.c:742 lib/getopt.c:745
+#: lib/getopt.c:360
#, c-format
-msgid "%s: unrecognized option '--%s'\n"
+msgid "%s: option '%s%s' requires an argument\n"
msgstr ""
-#: lib/getopt.c:753 lib/getopt.c:756
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr ""
-
-#: lib/getopt.c:805 lib/getopt.c:808
+#: lib/getopt.c:621
#, c-format
msgid "%s: invalid option -- '%c'\n"
msgstr ""
-#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#: lib/getopt.c:636 lib/getopt.c:682
#, c-format
msgid "%s: option requires an argument -- '%c'\n"
msgstr ""
-#: lib/getopt.c:934 lib/getopt.c:950
+#: src/cdecl99.c:71
#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
+msgid "Usage: %s [options]\n"
msgstr ""
-#: lib/getopt.c:974 lib/getopt.c:992
+#: src/cdecl99.c:73
#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgid "Try %s --help for more information.\n"
msgstr ""
-#: lib/getopt.c:1013 lib/getopt.c:1031
+#: src/cdecl99.c:88
#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr ""
-
-#: src/cdecl99.c:43
-msgctxt "longopt"
-msgid "quiet"
-msgstr ""
-
-#: src/cdecl99.c:44
-msgctxt "longopt"
-msgid "batch"
-msgstr ""
-
-#: src/cdecl99.c:45
-msgctxt "longopt"
-msgid "interactive"
+msgid " -%c, --%s=%s"
msgstr ""
-#: src/cdecl99.c:46
-msgctxt "longopt"
-msgid "file"
+#: src/cdecl99.c:92
+#, c-format
+msgid " -%c, --%s"
msgstr ""
-#: src/cdecl99.c:47
-msgctxt "longopt"
-msgid "execute"
+#: src/cdecl99.c:123
+msgid ""
+"This is \"cdecl99\": a command-line tool for parsing and constructing\n"
+"complicated C declarations."
msgstr ""
+"This is “cdecl99”: a command-line tool for parsing and constructing\n"
+"complicated C declarations."
-#: src/cdecl99.c:48
-msgctxt "longopt"
-msgid "version"
+#: src/cdecl99.c:127
+msgid "Options:"
msgstr ""
-#: src/cdecl99.c:49
-msgctxt "longopt"
-msgid "help"
+#: src/cdecl99.c:154
+msgid "For more information, see the cdecl99(1) man page."
msgstr ""
-#. TRANSLATORS: Help messages are indented 20 spaces and thus should
-#. not have lines longer than 60 columns.
+#. TRANSLATORS: Please add *another line* indicating where users should
+#. report translation bugs.
#.
-#: src/cdecl99.c:67
-msgid "Suppress the welcome message.\n"
-msgstr ""
-
-#: src/cdecl99.c:68
-msgid "Execute commands as normal, but do not print any prompts.\n"
-msgstr ""
-
-#: src/cdecl99.c:69
-msgid "Run in interactive mode. This is the default.\n"
-msgstr ""
-
-#: src/cdecl99.c:70
-msgid "Read commands from FILE instead of standard input.\n"
+#: src/cdecl99.c:161
+#, c-format
+msgid "Report bugs to <%s>.\n"
msgstr ""
-#: src/cdecl99.c:71
-msgctxt "longopt|file"
-msgid "FILE"
+#: src/cdecl99.c:186 src/errors.lst:1
+msgid "failed to allocate memory"
msgstr ""
-#: src/cdecl99.c:72
-msgid ""
-"Execute COMMAND as if it were entered at the prompt.\n"
-"This can be specified multiple times.\n"
+#: src/cdecl99.c:490
+#, c-format
+msgid "%s: excess command-line arguments:"
msgstr ""
-#: src/cdecl99.c:74
-msgctxt "longopt|execute"
+#: src/options.h:52
+msgctxt "execute"
msgid "COMMAND"
msgstr ""
-#: src/cdecl99.c:75
-msgid "Print a version message and then exit.\n"
-msgstr ""
-
-#: src/cdecl99.c:76
-msgid "Print this message.\n"
-msgstr ""
-
-#. TRANSLATORS: ARG is only used for options without help text.
-#: src/cdecl99.c:79
-msgctxt "longopt"
-msgid "ARG"
+#: src/options.h:53
+msgctxt "file"
+msgid "FILE"
msgstr ""
-#: src/cdecl99.c:147
-#, c-format
-msgid " -%c"
+#: src/options.h:57
+msgctxt "quiet"
+msgid "Suppress the welcome message."
msgstr ""
-#: src/cdecl99.c:150
-#, c-format
-msgid " -%c, --%s=%s"
+#: src/options.h:59
+msgctxt "batch"
+msgid ""
+"Run in batch mode. Commands are executed as normal but\n"
+"prompts are not printed."
msgstr ""
-#: src/cdecl99.c:151
-#, c-format
-msgid " -%c, --%s"
+#: src/options.h:62
+msgctxt "interactive"
+msgid "Run in interactive mode. This is the default."
msgstr ""
-#: src/cdecl99.c:156
-#, c-format
-msgid " -%c, --%s=%s, --%s=%s"
+#: src/options.h:64
+msgctxt "file"
+msgid "Read commands from FILE instead of standard input."
msgstr ""
-#: src/cdecl99.c:160
-#, c-format
-msgid " -%c, --%s, --%s"
-msgstr ""
-
-#: src/cdecl99.c:196
+#: src/options.h:66
+msgctxt "execute"
msgid ""
-"This is \"cdecl99\": a command-line tool for parsing and constructing\n"
-"complicated C declarations.\n"
-msgstr ""
-"This is “cdecl99”: a command-line tool for parsing and constructing\n"
-"complicated C declarations.\n"
-
-#: src/cdecl99.c:199
-msgid "Options:"
-msgstr ""
-
-#: src/cdecl99.c:208
-msgid "For more information, see the cdecl99(1) man page.\n"
+"Execute COMMAND as if it were entered at the prompt.\n"
+"This option can be specified multiple times."
msgstr ""
-#. TRANSLATORS: Please add *another line* indicating where users should
-#. report translation bugs.
-#.
-#: src/cdecl99.c:214
-#, c-format
-msgid "Report bugs to <%s>.\n"
+#: src/options.h:69
+msgctxt "version"
+msgid "Print a version message and then exit."
msgstr ""
-#: src/errors.lst:1
-msgid "failed to allocate memory"
+#: src/options.h:71
+msgctxt "help"
+msgid "Print this message and then exit."
msgstr ""
#: src/errors.lst:2
#include <readline.h>
#include <striconv.h>
#include <localcharset.h>
+#include <mbswidth.h>
#define _(x) gettext(x)
-#define N_(x) x
-#define PN_(c, x) x
static const char *progname = "cdecl99";
-static const char sopts[] = "qbif:e:VH";
-#define RAW_LOPTS \
- { PN_("longopt", "quiet"), 0, NULL, 'q' }, \
- { PN_("longopt", "batch"), 0, NULL, 'b' }, \
- { PN_("longopt", "interactive"), 0, NULL, 'i' }, \
- { PN_("longopt", "file"), 1, NULL, 'f' }, \
- { PN_("longopt", "execute"), 1, NULL, 'e' }, \
- { PN_("longopt", "version"), 0, NULL, 'V' }, \
- { PN_("longopt", "help"), 0, NULL, 'H' }
-/*
- * With NLS, we need a buffer big enough to store the translated options.
- * The translations will be filled in at program startup.
- */
-enum { NOPTS = sizeof (struct option[]){RAW_LOPTS} / sizeof (struct option) };
-static struct option lopts[NOPTS + !!ENABLE_NLS * NOPTS + 1] = { RAW_LOPTS };
-
-static struct helptext {
- int val;
- const char *text;
- const char *argname;
-} helptext[] = {
- /*
- * TRANSLATORS: Help messages are indented 20 spaces and thus should
- * not have lines longer than 60 columns.
- */
- { 'q', N_("Suppress the welcome message.\n") },
- { 'b', N_("Execute commands as normal, but do not print any prompts.\n") },
- { 'i', N_("Run in interactive mode. This is the default.\n") },
- { 'f', N_("Read commands from FILE instead of standard input.\n"),
- PN_("longopt|file", "FILE") },
- { 'e', N_("Execute COMMAND as if it were entered at the prompt.\n"
- "This can be specified multiple times.\n"),
- PN_("longopt|execute", "COMMAND") },
- { 'V', N_("Print a version message and then exit.\n") },
- { 'H', N_("Print this message.\n") },
-
- /* TRANSLATORS: ARG is only used for options without help text. */
- { 0, NULL, PN_("longopt", "ARG") }
+#include "options.h"
+static const char sopts[] = SOPT_STRING;
+static const struct option lopts[] = {
+ LOPTS_INITIALIZER,
+ {0}
};
static void print_version(void)
static void print_usage(FILE *f)
{
- fprintf(f, "Usage: %s [options]\n", progname);
+ fprintf(f, _("Usage: %s [options]\n"), progname);
if (f != stdout)
fprintf(f, _("Try %s --help for more information.\n"),
progname);
}
-/*
- * Print the help description of a particular command-line option, identified
- * by its short option name.
- */
-static void print_option(int val)
+static int
+print_optstring(const struct option *opt, const struct lopt_help *help)
{
- const struct option *tmp[2];
- const struct helptext *help;
- const char *argname;
- char context[32];
- size_t rc, n = 0;
+ char optstring[100];
int w;
- /* Find the options and help text corresponding to val. */
- for (const struct option *o = lopts; o->val; o++) {
- if (o->val == val) {
- assert(n < sizeof tmp / sizeof tmp[0]);
- tmp[n++] = o;
- }
- }
-
- for (help = helptext; help->val; help++) {
- if (help->val == val)
- break;
+ if (!ENABLE_NLS)
+ goto no_translate;
+
+ if (opt->has_arg) {
+ w = snprintf(optstring, sizeof optstring,
+ _(" -%c, --%s=%s"), opt->val, opt->name,
+ pgettext_expr(opt->name, help->arg));
+ } else {
+ w = snprintf(optstring, sizeof optstring,
+ _(" -%c, --%s"), opt->val, opt->name);
}
- /* Prepare translations. */
- if (!ENABLE_NLS) {
- argname = help->argname;
- } else if (n > 0) {
- rc = snprintf(context, sizeof context, "longopt%c%s",
- help->text ? '|' : '\0', tmp[0]->name);
- assert(rc < sizeof context);
+ if (w < 0)
+ goto no_translate;
- if (help->argname)
- argname = pgettext_expr(context, help->argname);
- }
+ w = mbsnwidth(optstring, w, 0);
+ printf("%s", optstring);
+ goto out;
- switch (n) {
- case 0:
- w = printf(_(" -%c"), val);
- break;
- case 1:
- w = printf(tmp[0]->has_arg ? _(" -%c, --%s=%s")
- : _(" -%c, --%s"),
- val, tmp[0]->name, argname);
- break;
- case 2:
- if (tmp[0]->has_arg) {
- w = printf(_(" -%c, --%s=%s, --%s=%s"), val,
- tmp[0]->name, argname,
- tmp[1]->name, argname);
- } else {
- w = printf(_(" -%c, --%s, --%s"), val,
- tmp[0]->name, tmp[1]->name);
- }
- break;
- default:
- assert(0);
+no_translate:
+ if (opt->has_arg) {
+ w = printf(" -%c, --%s=%s", opt->val, opt->name, help->arg);
+ } else {
+ w = printf(" -%c, --%s", opt->val, opt->name);
}
-
- if (!help->text) {
- putchar('\n');
- return;
- }
-
- if (w > 18) {
+out:
+ if (w < 0 || w > 18) {
putchar('\n');
- w = 0;
+ return 0;
}
- for (const char *line = gettext(help->text); *line;) {
- const char *nl = strchr(line, '\n');
-
- if (!nl) {
- printf("%*s%s\n", 20-w, "", line);
- break;
- }
-
- printf("%*s%.*s\n", 20-w, "", (int)(nl-line), line);
- line = nl+1;
- }
+ return w;
}
static void print_help(void)
{
+ const struct option *opt;
+
print_usage(stdout);
- puts(_(
-"This is \"cdecl99\": a command-line tool for parsing and constructing\n"
-"complicated C declarations.\n"));
+ puts(_("This is \"cdecl99\": a command-line tool for parsing and constructing\n"
+ "complicated C declarations."));
+ putchar('\n');
puts(_("Options:"));
- for (const char *c = sopts; *c; c++) {
- if (*c == ':' || *c == '+' || *c == '-')
+ for (opt = lopts; opt->name; opt++) {
+ struct lopt_help help;
+ const char *line;
+ int w;
+
+ if (!lopt_get_help(opt, &help))
continue;
- print_option(*c);
+ w = print_optstring(opt, &help);
+
+ if (ENABLE_NLS)
+ help.desc = pgettext_expr(opt->name, help.desc);
+
+ for (line = help.desc; *line; w = 0) {
+ const char *nl = strchr(line, '\n');
+ int n = (nl ? nl-line : -1);
+
+ printf("%*s%.*s\n", 20-w, "", n, line);
+ if (!nl)
+ break;
+
+ line = nl+1;
+ }
}
putchar('\n');
- puts(_("For more information, see the cdecl99(1) man page.\n"));
+ puts(_("For more information, see the cdecl99(1) man page."));
+ putchar('\n');
/*
* TRANSLATORS: Please add *another line* indicating where users should
return ret;
}
-/* Initialize gettext and setup translated long options. */
+/* Initialize gettext */
static void init_i18n(void)
{
if (!ENABLE_NLS)
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
-
- for (int i = 0, j = NOPTS; i < NOPTS; i++) {
- const char *tname = pgettext_expr("longopt", lopts[i].name);
-
- if (strcmp(tname, lopts[i].name) != 0) {
- lopts[j] = lopts[i];
- lopts[j].name = tname;
- j++;
- }
- }
}
int main(int argc, char **argv)
projects / cdecl99.git / commitdiff