X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/a0976f87118cc8d9ccc7a79f2ef29935798284e1..85f21977c90a06318541b0ac547c6e273afabce9:/src/cdecl99.c diff --git a/src/cdecl99.c b/src/cdecl99.c index 5ddc889..3eb7cc1 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-2023 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 @@ -29,27 +29,43 @@ #include #include -#include -#include #include #include "cdecl99.h" #include "cdecl.h" #include "help.h" #include "xtra.h" -#include "copysym.h" #include "options.h" +#include "version.h" +#include "getline.h" + +#if HAVE_READLINE_READLINE_H +# include +#endif +#if HAVE_RL_ADD_HISTORY && HAVE_READLINE_HISTORY_H +# include + +/* call add_history only if the line is non-blank */ +static void do_add_history(const char *line) +{ + if (line[strspn(line, " \t")]) + add_history(line); +} +#else +static void do_add_history(const char *line) +{ +} +#endif static const char *progname = "cdecl99"; -static bool interactive = true; +static bool batch_mode; void print_error(const char *fmt, ...) { va_list(ap); - if (!interactive) - fprintf(stderr, "%s: ", progname); - fprintf(stderr, "%s", _("error: ")); + fprintf(stderr, batch_mode ? "%s: %s" : "%.0s%s", + progname, _("error: ")); va_start(ap, fmt); vfprintf(stderr, fmt, ap); @@ -60,13 +76,7 @@ void print_error(const char *fmt, ...) static void print_version(void) { - const char *copysign = copyright_symbol(locale_charset()); - - puts(PACKAGE_STRING); - 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."); + do_print_version(PACKAGE_STRING); } static void print_usage(FILE *f) @@ -95,10 +105,9 @@ static void print_help(const struct option *lopts) 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 @@ -107,70 +116,60 @@ static void print_help(const struct option *lopts) printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT); } -static int is_blank_line(const char *line) +static int do_readline(char **linebuf, size_t *n, bool batch) { - return !line[strspn(line, " \t")]; +#if !HAVE_READLINE + if (!batch) { + fputs("> ", stdout); + fflush(stdout); + } + + return do_getline(linebuf, n); +#else + if (batch) + return do_getline(linebuf, n); + + free(*linebuf); + if (!(*linebuf = readline("> "))) + return 0; + + do_add_history(*linebuf); + return 1; +#endif } -static int repl(void) +static int repl(bool batch) { - char *line; - - for (; (line = readline("> ")); free(line)) { - if (!is_blank_line(line)) - add_history(line); + char *line = NULL; + bool fail = 0; + size_t n = 0; - if (run_command(line, true) > 0) + while (do_readline(&line, &n, batch)) { + int rc = run_command(line, batch); + if (rc > 0) break; + if (rc < 0) + fail = batch; } free(line); - return 0; + return fail ? EXIT_FAILURE : 0; } static int repl_cmdline(unsigned count, char **commands) { - int ret = 0; + bool fail = 0; unsigned i; for (i = 0; i < count; i++) { - int rc = run_command(commands[i], false); - if (rc < 0) - ret = -1; - else if (rc > 0) + int rc = run_command(commands[i], true); + if (rc > 0) break; - } - - return ret; -} - -static int repl_noninteractive(void) -{ - int rc, ret = 0, saved_errno; - char *line = NULL; - size_t n; - - 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) - break; + fail = true; } - saved_errno = errno; - free(line); - - if (ferror(stdin)) { - print_error("%s", strerror(saved_errno)); - return -1; - } - - return ret; + return fail ? EXIT_FAILURE : 0; } /* Initialize gettext */ @@ -207,10 +206,10 @@ static int initialize(int argc, char **argv) quiet = 1; break; case 'b': - interactive = false; + batch_mode = true; break; case 'i': - interactive = true; + batch_mode = false; break; case 'f': filename = optarg; @@ -231,8 +230,8 @@ static int initialize(int argc, char **argv) } if (optind < argc) { - fprintf(stderr, "%s: ", progname); - fprintf(stderr, _("excess command-line arguments:")); + fprintf(stderr, "%s: %s", progname, + _("excess command-line arguments:")); for (i = optind; i < argc; i++) { fprintf(stderr, " %s", argv[i]); } @@ -243,10 +242,10 @@ static int initialize(int argc, char **argv) /* --filename and --execute imply --batch. */ if (filename || execute) - interactive = false; + batch_mode = true; /* --batch implies --quiet */ - if (interactive && !quiet) + if (!batch_mode && !quiet) print_version(); /* --execute supersedes --filename */ @@ -263,21 +262,15 @@ static int initialize(int argc, char **argv) int main(int argc, char **argv) { - int rc, execute; + int 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(execute, argv); + if (execute) + return repl_cmdline(execute, argv); else - rc = repl_noninteractive(); - - if (rc != 0) - return EXIT_FAILURE; - return EXIT_SUCCESS; + return repl(batch_mode); }