Don't parse command-line options more than once.

[cdecl99.git] / src / cdecl99.c

diff --git a/src/cdecl99.c b/src/cdecl99.c
index 27ce048c73c1053e2fd1a074f332b17a92211490..fc9d3b2593ebba80e101f9121055007dff01e659 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-2023 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
@@ -36,6 +36,7 @@
 
 #include "cdecl99.h"
 #include "cdecl.h"
+#include "help.h"
 
 static const char *progname = "cdecl99";
 static bool interactive = true;
@@ -74,7 +75,7 @@ static void print_version(void)
        }
 
        puts(PACKAGE_STRING);
-       printf("Copyright %s 2021 Nick Bowler.\n", copysign);
+       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.");
@@ -90,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;
@@ -162,17 +104,11 @@ 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');
 
@@ -212,16 +148,13 @@ static int repl(void)
        return 0;
 }
 
-static int repl_cmdline(int argc, char **argv)
+static int repl_cmdline(unsigned count, char **commands)
 {
-       int opt, rc, ret = 0;
-
-       optind = 1;
-       while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) {
-               if (opt != 'e')
-                       continue;
+       int ret = 0;
+       unsigned i;
 
-               rc = run_command(optarg, false);
+       for (i = 0; i < count; i++) {
+               int rc = run_command(commands[i], false);
                if (rc < 0)
                        ret = -1;
                else if (rc > 0)
@@ -273,8 +206,9 @@ static void init_i18n(void)
 
 int main(int argc, char **argv)
 {
-       bool show_intro = true, execute = false;
+       bool show_intro = true;
        const char *filename = NULL;
+       unsigned execute = 0;
        int i, opt, rc;
 
        if (argc > 0)
@@ -297,7 +231,7 @@ int main(int argc, char **argv)
                        filename = optarg;
                        break;
                case 'e':
-                       execute = true;
+                       argv[execute++] = optarg;
                        break;
                case 'V':
                        print_version();
@@ -313,9 +247,7 @@ int main(int argc, char **argv)
 
        if (optind < argc) {
                fprintf(stderr, "%s: ", progname);
-
-               fprintf(stderr, _("excess command-line arguments:"),
-                               progname);
+               fprintf(stderr, _("excess command-line arguments:"));
                for (i = optind; i < argc; i++) {
                        fprintf(stderr, " %s", argv[i]);
                }
@@ -344,7 +276,7 @@ int main(int argc, char **argv)
        if (interactive)
                rc = repl();
        else if (execute)
-               rc = repl_cmdline(argc, argv);
+               rc = repl_cmdline(execute, argv);
        else
                rc = repl_noninteractive();