X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/debaed3750c42accb4c63378a06f5cdc9cd8be3d..d3e3654f75d01376794676885589a911d4b12e41:/src/cdecl99.c diff --git a/src/cdecl99.c b/src/cdecl99.c index bebdfff..18c6a5d 100644 --- a/src/cdecl99.c +++ b/src/cdecl99.c @@ -1,6 +1,6 @@ /* * Command line utility for making sense of C declarations. - * Copyright © 2011-2012, 2020 Nick Bowler + * Copyright © 2011-2012, 2020-2021 Nick Bowler * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,51 +33,17 @@ #include #include #include +#include -#define _(x) gettext(x) -#define N_(x) x -#define PN_(c, x) x +#include "cdecl99.h" 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) @@ -92,7 +58,7 @@ static void print_version(void) } puts(PACKAGE_STRING); - printf("Copyright %s 2020 Nick Bowler.\n", copysign); + printf("Copyright %s 2021 Nick Bowler.\n", copysign); puts("License GPLv3+: GNU GPL version 3 or any later version."); puts("This is free software: you are free to change and redistribute it."); puts("There is NO WARRANTY, to the extent permitted by law."); @@ -102,316 +68,107 @@ 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; - } - - 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(_( -"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); + return 0; } - 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); + return w; } /* - * Format a declaration according to the given function and return a pointer - * to the formatted string. The returned pointer remains valid until the - * next call, after which it must not be re-used. - * - * Returns NULL on failure. + * Print a string, with each line indented by i spaces. The first line + * will be indented by w fewer spaces (to account for the cursor being in + * some other column). */ -static const char * -do_format(size_t func(char *, size_t, struct cdecl *), struct cdecl *decl) +void print_block(const char *s, int i, int w) { - static size_t bufsz; - static char *buf; + for (; *s; w = 0) { + const char *nl = strchr(s, '\n'); + int n = (nl ? nl-s : -1); - size_t rc; - -retry: - rc = func(buf, bufsz, decl); - if (rc >= bufsz) { - char *tmp; - - tmp = realloc(buf, rc + 1); - if (!tmp) { - fprintf(stderr, "failed to allocate memory\n"); - return NULL; - } + printf("%*s%.*s\n", i-w, "", n, s); + if (!nl) + break; - buf = tmp; - bufsz = rc + 1; - goto retry; + s = nl+1; } - - return buf; } -static int cmd_explain(const char *cmd, const char *arg) +static void print_help(void) { - const struct cdecl_error *err; - struct cdecl *decl; - const char *str; - int ret = -1; - - decl = cdecl_parse_decl(arg); - if (!decl) { - err = cdecl_get_error(); - fprintf(stderr, "%s\n", err->str); - goto out; - } + const struct option *opt; - for (struct cdecl *i = decl; i; i = i->next) { - str = do_format(cdecl_explain, i); - if (!str) - goto out; - - printf("%s\n", str); - } - - ret = 1; -out: - cdecl_free(decl); - return ret; -} + print_usage(stdout); -static int cmd_simplify(const char *cmd, const char *arg) -{ - const struct cdecl_error *err; - struct cdecl *decl; - const char *str; - int ret = -1; - - decl = cdecl_parse_decl(arg); - if (!decl) { - err = cdecl_get_error(); - fprintf(stderr, "%s\n", err->str); - goto out; - } + puts(_("This is \"cdecl99\": a command-line tool for parsing and constructing\n" + "complicated C declarations.")); + putchar('\n'); - for (struct cdecl *i = decl; i; i = i->next) { - struct cdecl_declspec *s = i->specifiers; + puts(_("Options:")); + for (opt = lopts; opt->name; opt++) { + struct lopt_help help; + const char *line; + int w; - if (i != decl) { - i->specifiers = NULL; - printf(", "); - } + if (!lopt_get_help(opt, &help)) + continue; - str = do_format(cdecl_declare, i); - i->specifiers = s; + w = print_optstring(opt, &help); - if (!str) - goto out; + if (ENABLE_NLS) + help.desc = pgettext_expr(opt->name, help.desc); - printf("%s", str); + print_block(help.desc, 20, w); } - putchar('\n'); - ret = 1; -out: - cdecl_free(decl); - return ret; -} - -static int cmd_declare(const char *cmd, const char *arg) -{ - const struct cdecl_error *err; - struct cdecl *decl; - const char *str; - int ret = -1; - - /* The name of the command is significant here. */ - decl = cdecl_parse_english(cmd); - if (!decl) { - err = cdecl_get_error(); - fprintf(stderr, "%s\n", err->str); - goto out; - } + puts(_("For more information, see the cdecl99(1) man page.")); + putchar('\n'); /* - * English parses have at most one full declarator, so no loop is - * needed here. + * TRANSLATORS: Please add *another line* indicating where users should + * report translation bugs. */ - str = do_format(cdecl_declare, decl); - if (!str) - goto out; - - printf("%s\n", str); - ret = 1; -out: - cdecl_free(decl); - return ret; -} - -static int cmd_quit(const char *cmd, const char *arg) -{ - return 0; -} - -static int cmd_help(const char *cmd, const char *arg); - -static const struct command { - char name[16]; - int (*func)(const char *cmd, const char *arg); - const char *blurb; -} commands[] = { - { "explain", cmd_explain, "Explain a C declaration." }, - { "simplify", cmd_simplify, "Simplify a C declaration." }, - { "declare", cmd_declare, "Construct a C declaration." }, - { "type", cmd_declare, "Construct a C type name." }, - { "help", cmd_help, "Print this list of commands." }, - { "quit", cmd_quit, "Quit the program." }, - { "exit", cmd_quit, NULL } -}; -static const size_t ncommands = sizeof commands / sizeof commands[0]; - -static int cmd_help(const char *cmd, const char *arg) -{ - for (size_t i = 0; i < ncommands; i++) { - if (!commands[i].blurb) - continue; - - printf("%s -- %s\n", commands[i].name, commands[i].blurb); - } - - return 1; -} - -/* - * Ensure that the first n characters of str equal the entire (null-terminated) - * string cmd. - */ -static int cmd_cmp(const char *str, const char *cmd, size_t n) -{ - size_t cmdlen = strlen(cmd); - - if (n < cmdlen) - return -1; - if (n > cmdlen) - return 1; - return memcmp(str, cmd, n); -} - -static int run_command(const char *line) -{ - const char *cmd = line + strspn(line, " \t"); - const char *arg = cmd + strcspn(cmd, " \t"); - - if (cmd[0] == '\0') - return 1; - - for (size_t i = 0; i < ncommands; i++) { - if (cmd_cmp(cmd, commands[i].name, arg-cmd) != 0) - continue; - - return commands[i].func(cmd, arg); - } - - fprintf(stderr, "Undefined command: %.*s\n", (int)(arg-cmd), cmd); - return -1; + printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT); } static bool is_blank_line(const char *line) @@ -432,7 +189,7 @@ static int repl(void) if (!is_blank_line(line)) cdecl_add_history(line); - if (!run_command(line)) + if (run_command(line, true) > 0) break; } @@ -449,10 +206,10 @@ static int repl_cmdline(int argc, char **argv) if (opt != 'e') continue; - rc = run_command(optarg); + rc = run_command(optarg, false); if (rc < 0) ret = -1; - else if (rc == 0) + else if (rc > 0) break; } @@ -470,10 +227,10 @@ static int repl_noninteractive(void) if (c) *c = '\0'; - rc = run_command(line); + rc = run_command(line, false); if (rc < 0) ret = -1; - else if (rc == 0) + else if (rc > 0) break; } @@ -489,7 +246,7 @@ static int repl_noninteractive(void) return ret; } -/* Initialize gettext and setup translated long options. */ +/* Initialize gettext */ static void init_i18n(void) { if (!ENABLE_NLS) @@ -498,23 +255,13 @@ static void init_i18n(void) 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) { bool show_intro = true, interactive = true, execute = false; const char *filename = NULL; - int opt, rc; + int i, opt, rc; if (argc > 0) progname = argv[0]; @@ -550,6 +297,17 @@ int main(int argc, char **argv) } } + if (optind < argc) { + fprintf(stderr, _("%s: excess command-line arguments:"), + progname); + for (i = optind; i < argc; i++) { + fprintf(stderr, " %s", argv[i]); + } + fprintf(stderr, "\n"); + print_usage(stderr); + return EXIT_FAILURE; + } + /* --filename and --execute imply --batch. */ if (filename || execute) interactive = false;