X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/f2f75f25ecc377fb95877449aa12314ee1385a1f..HEAD:/src/cdecl99.c diff --git a/src/cdecl99.c b/src/cdecl99.c index 2a522d4..0622e67 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-2024 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,115 +25,72 @@ #include #include #include +#include +#include #include #include -#include -#include -#include #include #include "cdecl99.h" #include "cdecl.h" - -static const char *progname = "cdecl99"; - +#include "help.h" +#include "xtra.h" #include "options.h" -static const char sopts[] = SOPT_STRING; -static const struct option lopts[] = { - LOPTS_INITIALIZER, - {0} -}; - -static void print_version(void) -{ - const char *copysign = "(C)"; - void *convsign = NULL; +#include "version.h" +#include "getline.h" - if (ENABLE_NLS) { - convsign = str_iconv("\xc2\xa9", "UTF-8", locale_charset()); - if (convsign) - copysign = convsign; - } +#if HAVE_READLINE_READLINE_H +# include +#endif +#if HAVE_RL_ADD_HISTORY && HAVE_READLINE_HISTORY_H +# include - puts(PACKAGE_STRING); - 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."); - - free(convsign); -} - -static void print_usage(FILE *f) +/* call add_history only if the line is non-blank */ +static void do_add_history(const char *line) { - fprintf(f, _("Usage: %s [options]\n"), progname); - if (f != stdout) - fprintf(f, _("Try %s --help for more information.\n"), - progname); + if (line[strspn(line, " \t")]) + add_history(line); } - -static int -print_optstring(const struct option *opt, const struct lopt_help *help) +#else +static void do_add_history(const char *line) { - char optstring[100]; - int w; +} +#endif - 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); - } +static const char *progname = "cdecl99"; +static bool batch_mode; - if (w < 0) - goto no_translate; +void print_error(const char *fmt, ...) +{ + va_list(ap); - w = mbsnwidth(optstring, w, 0); - printf("%s", optstring); - goto out; + fprintf(stderr, batch_mode ? "%s: %s" : "%.0s%s", + progname, _("error: ")); -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; - } + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + va_end(ap); - return w; + fprintf(stderr, "\n"); } -/* - * 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) +static void print_version(void) { - 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; + do_print_version(PACKAGE_STRING); +} - s = nl+1; - } +static void print_usage(FILE *f) +{ + fprintf(f, _("Usage: %s [options]\n"), progname); + if (f != stdout) + fprintf(f, _("Try %s --help for more information.\n"), + progname); } -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,23 +101,14 @@ static void print_help(void) puts(_("Options:")); for (opt = lopts; opt->name; opt++) { - struct lopt_help help; - 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'); - puts(_("For more information, see the cdecl99(1) man page.")); - putchar('\n'); + printf("\n%s\n\n", + _("For more information, see the cdecl99(1) man page.")); /* * TRANSLATORS: Please add *another line* indicating where users should @@ -169,79 +117,75 @@ static void print_help(void) printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT); } -static bool is_blank_line(const char *line) +static int do_getline(char **linebuf, size_t *n) { - for (size_t i = 0; line[i]; i++) { - if (!isblank((unsigned char)line[i])) - return false; + int rc; + + if ((rc = dx_getline(linebuf, n, stdin)) < 0) { + if (rc == DX_GETLINE_ENOMEM) + print_error("%s", _("failed to allocate memory")); + else + print_error("%s", strerror(errno)); + return 0; } - return true; + return rc; } -static int repl(void) +static int do_readline(char **linebuf, size_t *n, bool batch) { - char *line; +#if !HAVE_READLINE + if (!batch) { + fputs("> ", stdout); + fflush(stdout); + } - for (; (line = readline("> ")); free(line)) { - if (!is_blank_line(line)) - add_history(line); + return do_getline(linebuf, n); +#else + if (batch) + return do_getline(linebuf, n); - if (run_command(line, true) > 0) - break; - } + free(*linebuf); + if (!(*linebuf = readline("> "))) + return 0; - free(line); - return 0; + do_add_history(*linebuf); + return 1; +#endif } -static int repl_cmdline(int argc, char **argv) +static int repl(bool batch) { - int opt, rc, ret = 0; - - optind = 1; - while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) { - if (opt != 'e') - continue; + char *line = NULL; + bool fail = 0; + size_t n = 0; - rc = run_command(optarg, false); - if (rc < 0) - ret = -1; - else if (rc > 0) + while (do_readline(&line, &n, batch)) { + int rc = run_command(line, batch); + if (rc > 0) break; + if (rc < 0) + fail = batch; } - return ret; + free(line); + return fail ? EXIT_FAILURE : 0; } -static int repl_noninteractive(void) +static int repl_cmdline(unsigned count, char **commands) { - int rc, ret = 0, saved_errno; - char *line = NULL; - size_t n; + bool fail = 0; + unsigned i; - while (getline(&line, &n, stdin) >= 0) { - char *c = strchr(line, '\n'); - if (c) - *c = '\0'; - - rc = run_command(line, false); - if (rc < 0) - ret = -1; - else if (rc > 0) + for (i = 0; i < count; i++) { + int rc = run_command(commands[i], true); + if (rc > 0) break; + if (rc < 0) + fail = true; } - saved_errno = errno; - free(line); - - if (ferror(stdin)) { - errno = saved_errno; - perror("read error"); - return -1; - } - - return ret; + return fail ? EXIT_FAILURE : 0; } /* Initialize gettext */ @@ -255,81 +199,94 @@ 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; + batch_mode = true; break; case 'i': - interactive = true; + batch_mode = false; break; case 'f': 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: %s", progname, + _("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. */ if (filename || execute) - interactive = false; + batch_mode = true; /* --batch implies --quiet */ - if (interactive && show_intro) + if (!batch_mode && !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; } } - if (interactive) - rc = repl(); - else if (execute) - rc = repl_cmdline(argc, argv); - else - rc = repl_noninteractive(); + return execute; +} - if (rc != 0) - return EXIT_FAILURE; - return EXIT_SUCCESS; +int main(int argc, char **argv) +{ + int execute; + + switch ((execute = initialize(argc, argv))) { + case INIT_EXIT_SUCCESS: return EXIT_SUCCESS; + case INIT_EXIT_FAILURE: return EXIT_FAILURE; + } + + if (execute) + return repl_cmdline(execute, argv); + else + return repl(batch_mode); }