Port to use getline.h from dxcommon.

[cdecl99.git] / src / cdecl99.c

diff --git a/src/cdecl99.c b/src/cdecl99.c
index 1b821689625645e57265572d2f873767336d0d57..0622e6726dec5a2df183d02ff53f2facd48573da 100644 (file)
--- 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,18 +26,19 @@
 #include <locale.h>
 #include <assert.h>
 #include <stdarg.h>
+#include <inttypes.h>
 
 #include <getopt.h>
 #include <gettext.h>
-#include <localcharset.h>
 #include <mbswidth.h>
 
 #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 <readline/readline.h>
@@ -64,9 +65,8 @@ void print_error(const char *fmt, ...)
 {
        va_list(ap);
 
-       if (batch_mode)
-               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);
@@ -77,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)
@@ -112,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
@@ -126,20 +119,20 @@ static void print_help(const struct option *lopts)
 
 static int do_getline(char **linebuf, size_t *n)
 {
-       ssize_t rc;
+       int rc;
 
-       if ((rc = getline(linebuf, n, stdin)) < 0) {
-               if (ferror(stdin))
+       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;
        }
 
-       if (rc-- && (*linebuf)[rc] == '\n')
-               (*linebuf)[rc] = '\0';
-       return 1;
+       return rc;
 }
 
-static int do_readline(char **linebuf, size_t *n, int batch)
+static int do_readline(char **linebuf, size_t *n, bool batch)
 {
 #if !HAVE_READLINE
        if (!batch) {
@@ -161,38 +154,38 @@ static int do_readline(char **linebuf, size_t *n, int batch)
 #endif
 }
 
-static int repl(int batch)
+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, batch)) {
                int rc = run_command(line, batch);
                if (rc > 0)
                        break;
-               else if (rc < 0)
-                       ret = -batch;
+               if (rc < 0)
+                       fail = batch;
        }
 
        free(line);
-       return ret;
+       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], true);
-               if (rc < 0)
-                       ret = -1;
-               else if (rc > 0)
+               if (rc > 0)
                        break;
+               if (rc < 0)
+                       fail = true;
        }
 
-       return ret;
+       return fail ? EXIT_FAILURE : 0;
 }
 
 /* Initialize gettext */
@@ -253,8 +246,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]);
                }
@@ -285,7 +278,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;
@@ -293,11 +286,7 @@ int main(int argc, char **argv)
        }
 
        if (execute)
-               rc = repl_cmdline(execute, argv);
+               return repl_cmdline(execute, argv);
        else
-               rc = repl(batch_mode);
-
-       if (rc != 0)
-               return EXIT_FAILURE;
-       return EXIT_SUCCESS;
+               return repl(batch_mode);
 }