X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/247d234f2e263700e0a7ce7f6c9219d010c182ca..c11f668ec9c5b2f0016cf6920a111c52e895b24a:/src/cdecl99.c diff --git a/src/cdecl99.c b/src/cdecl99.c index d7ddd77..1d8dff0 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 @@ -26,33 +26,47 @@ #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" +#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); @@ -63,13 +77,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) @@ -98,10 +106,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 @@ -110,81 +117,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) -{ - return !line[strspn(line, " \t")]; -} - -static int repl_cmdline(unsigned count, char **commands) -{ - int ret = 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) - break; - } - - return ret; -} - -static int do_getline(char **linebuf, size_t *n) -{ - ssize_t rc; - - if ((rc = getline(linebuf, n, stdin)) < 0) { - if (ferror(stdin)) - print_error("%s", strerror(errno)); - return 0; - } - - if (rc-- && (*linebuf)[rc] == '\n') - (*linebuf)[rc] = '\0'; - return 1; -} - -static int do_readline(char **linebuf, size_t *n, int interactive) +static int do_readline(char **linebuf, size_t *n, bool batch) { #if !HAVE_READLINE - if (interactive) { + if (!batch) { fputs("> ", stdout); fflush(stdout); } return do_getline(linebuf, n); #else - if (!interactive) + if (batch) return do_getline(linebuf, n); free(*linebuf); if (!(*linebuf = readline("> "))) return 0; - if (!is_blank_line(*linebuf)) - add_history(*linebuf); + do_add_history(*linebuf); return 1; #endif } -static int repl(int interactive) +static int repl(bool batch) { char *line = NULL; - int ret = 0; - size_t n; + bool fail = 0; + size_t n = 0; - while (do_readline(&line, &n, interactive)) { - int rc = run_command(line, interactive); + while (do_readline(&line, &n, batch)) { + int rc = run_command(line, batch); if (rc > 0) break; - else if (rc < 0) - ret = -!interactive; + if (rc < 0) + fail = batch; } free(line); - return ret; + return fail ? EXIT_FAILURE : 0; +} + +static int repl_cmdline(unsigned count, char **commands) +{ + bool fail = 0; + unsigned i; + + for (i = 0; i < count; i++) { + int rc = run_command(commands[i], true); + if (rc > 0) + break; + if (rc < 0) + fail = true; + } + + return fail ? EXIT_FAILURE : 0; } /* Initialize gettext */ @@ -221,10 +207,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; @@ -245,8 +231,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]); } @@ -257,10 +243,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 */ @@ -277,7 +263,7 @@ 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; @@ -285,11 +271,7 @@ int main(int argc, char **argv) } if (execute) - rc = repl_cmdline(execute, argv); + return repl_cmdline(execute, argv); else - rc = repl(interactive); - - if (rc != 0) - return EXIT_FAILURE; - return EXIT_SUCCESS; + return repl(batch_mode); }