From e7b2e067cd007f12227af623649a8e9204a352b1 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Sat, 8 Oct 2011 10:53:33 -0400 Subject: [PATCH] Implement --help. --- po/en.po | 194 +++++++++++++++++++++++++++++++++++++++++++++++++- src/cdecl99.c | 143 +++++++++++++++++++++++++++++++++++-- 2 files changed, 331 insertions(+), 6 deletions(-) diff --git a/po/en.po b/po/en.po index 2a587de..af09430 100644 --- a/po/en.po +++ b/po/en.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: cdecl99 0.1\n" "Report-Msgid-Bugs-To: nbowler@draconx.ca\n" -"POT-Creation-Date: 2011-09-13 21:34-0400\n" +"POT-Creation-Date: 2011-10-06 14:48-0400\n" "PO-Revision-Date: 2011-09-13 21:54-0400\n" "Last-Translator: Nick Bowler \n" "Language-Team: English\n" @@ -16,7 +16,197 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: lib/getopt.c:547 lib/getopt.c:576 +#, c-format +msgid "%s: option '%s' is ambiguous; possibilities:" +msgstr "" + +#: lib/getopt.c:624 lib/getopt.c:628 +#, c-format +msgid "%s: option '--%s' doesn't allow an argument\n" +msgstr "" + +#: lib/getopt.c:637 lib/getopt.c:642 +#, c-format +msgid "%s: option '%c%s' doesn't allow an argument\n" +msgstr "" + +#: lib/getopt.c:685 lib/getopt.c:704 +#, c-format +msgid "%s: option '--%s' requires an argument\n" +msgstr "" + +#: lib/getopt.c:742 lib/getopt.c:745 +#, c-format +msgid "%s: unrecognized option '--%s'\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 +#, c-format +msgid "%s: invalid option -- '%c'\n" +msgstr "" + +#: lib/getopt.c:858 lib/getopt.c:875 lib/getopt.c:1083 lib/getopt.c:1101 +#, c-format +msgid "%s: option requires an argument -- '%c'\n" +msgstr "" + +#: lib/getopt.c:931 lib/getopt.c:947 +#, c-format +msgid "%s: option '-W %s' is ambiguous\n" +msgstr "" + +#: lib/getopt.c:971 lib/getopt.c:989 +#, c-format +msgid "%s: option '-W %s' doesn't allow an argument\n" +msgstr "" + +#: lib/getopt.c:1010 lib/getopt.c:1028 +#, c-format +msgid "%s: option '-W %s' requires an argument\n" +msgstr "" + +#: src/cdecl99.c:38 +msgctxt "longopt" +msgid "quiet" +msgstr "" + +#: src/cdecl99.c:39 +msgctxt "longopt" +msgid "batch" +msgstr "" + +#: src/cdecl99.c:40 +msgctxt "longopt" +msgid "interactive" +msgstr "" + +#: src/cdecl99.c:41 +msgctxt "longopt" +msgid "file" +msgstr "" + +#: src/cdecl99.c:42 +msgctxt "longopt" +msgid "execute" +msgstr "" + +#: src/cdecl99.c:43 +msgctxt "longopt" +msgid "version" +msgstr "" + +#: src/cdecl99.c:44 +msgctxt "longopt" +msgid "help" +msgstr "" + +#: src/cdecl99.c:62 +msgid "Suppress the welcome message.\n" +msgstr "" + +#: src/cdecl99.c:63 +msgid "Execute commands as normal, but do not print any prompts.\n" +msgstr "" + +#: src/cdecl99.c:64 +msgid "Run in interactive mode. This is the default.\n" +msgstr "" + +#: src/cdecl99.c:65 +msgid "Read commands from FILE instead of standard input.\n" +msgstr "" + +#: src/cdecl99.c:66 +msgctxt "longopt|file" +msgid "FILE" +msgstr "" + +#: src/cdecl99.c:67 +msgid "" +"Execute COMMAND as if it were entered at the prompt.\n" +"This can be specified multiple times.\n" +msgstr "" + +#: src/cdecl99.c:69 +msgctxt "longopt|execute" +msgid "COMMAND" +msgstr "" + +#: src/cdecl99.c:70 +msgid "Print a version message and then exit.\n" +msgstr "" + +#: src/cdecl99.c:71 +msgid "Print this message.\n" +msgstr "" + +#. TRANSLATORS: ARG is only used for options without help text. +#: src/cdecl99.c:74 +msgctxt "longopt" +msgid "ARG" +msgstr "" + #. TRANSLATORS: (C) must *always* be translated as ©. -#: src/cdecl99.c:46 +#: src/cdecl99.c:81 msgid "(C)" msgstr "©" + +#: src/cdecl99.c:132 +#, c-format +msgid " -%c" +msgstr "" + +#: src/cdecl99.c:135 +#, c-format +msgid " -%c, --%s=%s" +msgstr "" + +#: src/cdecl99.c:136 +#, c-format +msgid " -%c, --%s" +msgstr "" + +#: src/cdecl99.c:141 +#, c-format +msgid " -%c, --%s=%s, --%s=%s" +msgstr "" + +#: src/cdecl99.c:145 +#, c-format +msgid " -%c, --%s, --%s" +msgstr "" + +#: src/cdecl99.c:181 +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:184 +msgid "Options:" +msgstr "" + +#: src/cdecl99.c:193 +msgid "For more information, see the cdecl99(1) man page.\n" +msgstr "" + +#: src/cdecl99.c:199 +#, c-format +msgid "Report bugs to <%s>.\n" +msgstr "" + +#: src/errors.lst:1 +msgid "failed to allocate memory" +msgstr "" + +#: src/errors.lst:2 +msgid "syntax error" +msgstr "" diff --git a/src/cdecl99.c b/src/cdecl99.c index c70834f..d58433b 100644 --- a/src/cdecl99.c +++ b/src/cdecl99.c @@ -24,9 +24,11 @@ #include #include #include +#include #include "readline.h" #include "cdecl.h" +#define _(x) gettext(x) #define N_(x) x #define PN_(c, x) x @@ -48,6 +50,30 @@ static const char sopts[] = "qbif:e:VH"; 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") } +}; + static void print_version(void) { puts(PACKAGE_STRING); @@ -63,10 +89,114 @@ static void print_usage(FILE *f) fprintf(f, "Usage: %s [options]\n", progname); } +/* + * Print the help description of a particular command-line option, identified + * by its short option name. + */ +static void print_option(int val) +{ + const struct option *tmp[2]; + const struct helptext *help; + const char *argname; + char context[32]; + size_t rc, n = 0; + 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; + } + + /* 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 (help->argname) + argname = pgettext_expr(context, help->argname); + } + + 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); + } + + if (!help->text) { + putchar('\n'); + return; + } + + if (w > 18) { + putchar('\n'); + w = 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; + } +} + static void print_help(void) { print_usage(stdout); - puts("Detailed help coming soon."); + + puts(_( +"This is \"cdecl99\": a command-line tool for parsing and constructing\n" +"complicated C declarations.\n")); + + puts(_("Options:")); + for (const char *c = sopts; *c; c++) { + if (*c == ':' || *c == '+' || *c == '-') + continue; + + print_option(*c); + } + putchar('\n'); + + puts(_("For more information, see the cdecl99(1) man page.\n")); + + /* + * TRANSLATORS: Please add *another line* indicating where users should + * report translation bugs. + */ + printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT); } /* @@ -340,9 +470,14 @@ static void init_i18n(void) if (!ENABLE_NLS) return; - for (int i = 0; i < NOPTS; i++) { - lopts[i+NOPTS] = lopts[i]; - lopts[i+NOPTS].name = pgettext_expr("longopt", lopts[i].name); + 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++; + } } } -- 2.43.2