X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/0c61f9637a469ac7a28b5a329551b03e6ad14d62..c807d652225fe170ee442591bb2a0bfc91c8618c:/src/cdecl99.c diff --git a/src/cdecl99.c b/src/cdecl99.c index 00053b2..5ddc889 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-2021 Nick Bowler + * Copyright © 2011-2012, 2020-2023 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 @@ -25,44 +25,48 @@ #include #include #include +#include #include #include #include -#include #include #include #include "cdecl99.h" #include "cdecl.h" +#include "help.h" +#include "xtra.h" +#include "copysym.h" +#include "options.h" static const char *progname = "cdecl99"; +static bool interactive = true; -#include "options.h" -static const char sopts[] = SOPT_STRING; -static const struct option lopts[] = { - LOPTS_INITIALIZER, - {0} -}; +void print_error(const char *fmt, ...) +{ + va_list(ap); + + if (!interactive) + fprintf(stderr, "%s: ", progname); + fprintf(stderr, "%s", _("error: ")); + + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + va_end(ap); + + fprintf(stderr, "\n"); +} static void print_version(void) { - const char *copysign = "(C)"; - void *convsign = NULL; - - if (ENABLE_NLS) { - convsign = str_iconv("\xc2\xa9", "UTF-8", locale_charset()); - if (convsign) - copysign = convsign; - } + const char *copysign = copyright_symbol(locale_charset()); puts(PACKAGE_STRING); - printf("Copyright %s 2021 Nick Bowler.\n", copysign); + printf("Copyright %s 2023 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."); - - free(convsign); } static void print_usage(FILE *f) @@ -73,67 +77,9 @@ static void print_usage(FILE *f) progname); } -static int -print_optstring(const struct option *opt, const struct lopt_help *help) -{ - char optstring[100]; - int w; - - 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); - } - - if (w < 0) - goto no_translate; - - w = mbsnwidth(optstring, w, 0); - printf("%s", optstring); - goto out; - -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); - } -out: - if (w < 0 || w > 18) { - putchar('\n'); - return 0; - } - - return w; -} - -/* - * 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). - */ -void print_block(const char *s, int i, int w) -{ - for (; *s; w = 0) { - const char *nl = strchr(s, '\n'); - int n = (nl ? nl-s : -1); - - printf("%*s%.*s\n", i-w, "", n, s); - if (!nl) - break; - - s = nl+1; - } -} - -static void print_help(void) +static void print_help(const struct option *lopts) { + struct lopt_help help = {0}; const struct option *opt; print_usage(stdout); @@ -144,19 +90,10 @@ static void print_help(void) puts(_("Options:")); for (opt = lopts; opt->name; opt++) { - struct lopt_help help; - const char *line; - int w; - if (!lopt_get_help(opt, &help)) continue; - w = print_optstring(opt, &help); - - if (ENABLE_NLS) - help.desc = pgettext_expr(opt->name, help.desc); - - print_block(help.desc, 20, w); + help_print_option(opt, help.arg, help.desc, 20); } putchar('\n'); @@ -170,14 +107,9 @@ static void print_help(void) printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT); } -static bool is_blank_line(const char *line) +static int is_blank_line(const char *line) { - for (size_t i = 0; line[i]; i++) { - if (!isblank((unsigned char)line[i])) - return false; - } - - return true; + return !line[strspn(line, " \t")]; } static int repl(void) @@ -196,16 +128,13 @@ static int repl(void) return 0; } -static int repl_cmdline(int argc, char **argv) +static int repl_cmdline(unsigned count, char **commands) { - int opt, rc, ret = 0; - - optind = 1; - while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) { - if (opt != 'e') - continue; + int ret = 0; + unsigned i; - rc = run_command(optarg, false); + for (i = 0; i < count; i++) { + int rc = run_command(commands[i], false); if (rc < 0) ret = -1; else if (rc > 0) @@ -237,8 +166,7 @@ static int repl_noninteractive(void) free(line); if (ferror(stdin)) { - errno = saved_errno; - perror("read error"); + print_error("%s", strerror(saved_errno)); return -1; } @@ -256,21 +184,27 @@ static void init_i18n(void) textdomain(PACKAGE); } -int main(int argc, char **argv) +enum { + INIT_EXIT_SUCCESS = -1, + INIT_EXIT_FAILURE = -2 +}; + +static int initialize(int argc, char **argv) { - bool show_intro = true, interactive = true, execute = false; + int i, opt, quiet = 0, execute = 0; const char *filename = NULL; - int i, opt, rc; + + XTRA_PACKED_LOPTS(lopts); if (argc > 0) progname = argv[0]; init_i18n(); - while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) { + while ((opt = getopt_long(argc, argv, SOPT_STRING, lopts, 0)) != -1) { switch (opt) { case 'q': - show_intro = false; + quiet = 1; break; case 'b': interactive = false; @@ -282,29 +216,29 @@ int main(int argc, char **argv) filename = optarg; break; case 'e': - execute = true; + argv[execute++] = optarg; break; case 'V': print_version(); - return EXIT_SUCCESS; + return INIT_EXIT_SUCCESS; case 'H': - print_help(); - return EXIT_SUCCESS; + print_help(lopts); + return INIT_EXIT_SUCCESS; default: print_usage(stderr); - return EXIT_FAILURE; + return INIT_EXIT_FAILURE; } } if (optind < argc) { - fprintf(stderr, _("%s: excess command-line arguments:"), - progname); + fprintf(stderr, "%s: ", progname); + fprintf(stderr, _("excess command-line arguments:")); for (i = optind; i < argc; i++) { fprintf(stderr, " %s", argv[i]); } fprintf(stderr, "\n"); print_usage(stderr); - return EXIT_FAILURE; + return INIT_EXIT_FAILURE; } /* --filename and --execute imply --batch. */ @@ -312,21 +246,34 @@ int main(int argc, char **argv) interactive = false; /* --batch implies --quiet */ - if (interactive && show_intro) + if (interactive && !quiet) print_version(); /* --execute supersedes --filename */ if (filename && !execute) { if (!freopen(filename, "r", stdin)) { - perror(filename); - return EXIT_FAILURE; + print_error("failed to open %s: %s", filename, + strerror(errno)); + return INIT_EXIT_FAILURE; } } + return execute; +} + +int main(int argc, char **argv) +{ + int rc, execute; + + switch ((execute = initialize(argc, argv))) { + case INIT_EXIT_SUCCESS: return EXIT_SUCCESS; + case INIT_EXIT_FAILURE: return EXIT_FAILURE; + } + if (interactive) rc = repl(); else if (execute) - rc = repl_cmdline(argc, argv); + rc = repl_cmdline(execute, argv); else rc = repl_noninteractive();