Improve gnulib build times.

[cdecl99.git] / src / cdecl99.c

diff --git a/src/cdecl99.c b/src/cdecl99.c
index 18c6a5d8676e4f671e8ecc6145cb37dd8b779d85..9d9fcc8a6615f5c5462cb903823e1516887c10d3 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-2021 Nick Bowler
+ * Copyright © 2011-2012, 2020-2022 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,8 +25,7 @@
 #include <errno.h>
 #include <locale.h>
 #include <assert.h>
-#include "history.h"
-#include "cdecl.h"
+#include <stdarg.h>
 
 #include <getopt.h>
 #include <gettext.h>
@@ -36,8 +35,11 @@
 #include <mbswidth.h>
 
 #include "cdecl99.h"
+#include "cdecl.h"
+#include "help.h"
 
 static const char *progname = "cdecl99";
+static bool interactive = true;
 
 #include "options.h"
 static const char sopts[] = SOPT_STRING;
@@ -46,6 +48,21 @@ static const struct option lopts[] = {
        {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)";
@@ -58,7 +75,7 @@ static void print_version(void)
        }
 
        puts(PACKAGE_STRING);
-       printf("Copyright %s 2021 Nick Bowler.\n", copysign);
+       printf("Copyright %s 2022 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.");
@@ -74,65 +91,6 @@ 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)
 {
        const struct option *opt;
@@ -146,18 +104,11 @@ 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');
 
@@ -187,7 +138,7 @@ static int repl(void)
 
        for (; (line = readline("> ")); free(line)) {
                if (!is_blank_line(line))
-                       cdecl_add_history(line);
+                       add_history(line);
 
                if (run_command(line, true) > 0)
                        break;
@@ -238,8 +189,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;
        }
 
@@ -259,7 +209,7 @@ static void init_i18n(void)
 
 int main(int argc, char **argv)
 {
-       bool show_intro = true, interactive = true, execute = false;
+       bool show_intro = true, execute = false;
        const char *filename = NULL;
        int i, opt, rc;
 
@@ -298,8 +248,8 @@ int main(int argc, char **argv)
        }
 
        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]);
                }
@@ -319,7 +269,8 @@ int main(int argc, char **argv)
        /* --execute supersedes --filename */
        if (filename && !execute) {
                if (!freopen(filename, "r", stdin)) {
-                       perror(filename);
+                       print_error("failed to open %s: %s\n", filename,
+                                                       strerror(errno));
                        return EXIT_FAILURE;
                }
        }