Improve usage messages a bit.

[cdecl99.git] / src / cdecl99.c

diff --git a/src/cdecl99.c b/src/cdecl99.c
index d58433ba15e68774eadfb3549d8f73583102fc5a..5941009eb7df8401e897b13ebe3795872872cbb5 100644 (file)
--- a/src/cdecl99.c
+++ b/src/cdecl99.c
@@ -1,33 +1,39 @@
 /*
- *  Command line utility for making sense of C declarations.
- *  Copyright © 2011 Nick Bowler
+ * Command line utility for making sense of C declarations.
+ * Copyright © 2011-2012, 2020-2021 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
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
+
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
+#include <ctype.h>
 #include <errno.h>
 #include <locale.h>
-#include <getopt.h>
-#include <gettext.h>
 #include <assert.h>
-#include "readline.h"
+#include "history.h"
 #include "cdecl.h"
 
+#include <getopt.h>
+#include <gettext.h>
+#include <readline.h>
+#include <striconv.h>
+#include <localcharset.h>
+
 #define _(x) gettext(x)
 #define N_(x) x
 #define PN_(c, x) x
@@ -76,17 +82,30 @@ static struct helptext {
 
 static void print_version(void)
 {
+       const char *copysign = "(C)";
+       void *convsign = NULL;
+
+       if (ENABLE_NLS) {
+               convsign = str_iconv("\xc2\xa9", "UTF-8", locale_charset());
+               if (convsign)
+                       copysign = convsign;
+       }
+
        puts(PACKAGE_STRING);
-       /* TRANSLATORS: (C) must *always* be translated as ©. */
-       printf("Copyright %s 2011 Nick Bowler.\n", gettext("(C)"));
-       puts("License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.");
+       printf("Copyright %s 2021 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.");
+
+       free(convsign);
 }
 
 static void print_usage(FILE *f)
 {
        fprintf(f, "Usage: %s [options]\n", progname);
+       if (f != stdout)
+               fprintf(f, _("Try %s --help for more information.\n"),
+                          progname);
 }
 
 /*
@@ -221,7 +240,7 @@ retry:
 
                tmp = realloc(buf, rc + 1);
                if (!tmp) {
-                       fprintf(stderr, "failed to allocate memory\n");
+                       fprintf(stderr, "%s\n", _("failed to allocate memory"));
                        return NULL;
                }
 
@@ -398,11 +417,24 @@ static int run_command(const char *line)
        return -1;
 }
 
+static bool is_blank_line(const char *line)
+{
+       for (size_t i = 0; line[i]; i++) {
+               if (!isblank((unsigned char)line[i]))
+                       return false;
+       }
+
+       return true;
+}
+
 static int repl(void)
 {
        char *line;
 
        for (; (line = readline("> ")); free(line)) {
+               if (!is_blank_line(line))
+                       cdecl_add_history(line);
+
                if (!run_command(line))
                        break;
        }
@@ -463,13 +495,13 @@ static int repl_noninteractive(void)
 /* Initialize gettext and setup translated long options. */
 static void init_i18n(void)
 {
+       if (!ENABLE_NLS)
+               return;
+
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
 
-       if (!ENABLE_NLS)
-               return;
-
        for (int i = 0, j = NOPTS; i < NOPTS; i++) {
                const char *tname = pgettext_expr("longopt", lopts[i].name);
 
@@ -485,7 +517,7 @@ int main(int argc, char **argv)
 {
        bool show_intro = true, interactive = true, execute = false;
        const char *filename = NULL;
-       int opt, rc;
+       int i, opt, rc;
 
        if (argc > 0)
                progname = argv[0];
@@ -521,6 +553,17 @@ int main(int argc, char **argv)
                }
        }
 
+       if (optind < argc) {
+               fprintf(stderr, _("%s: excess command-line arguments:"),
+                               progname);
+               for (i = optind; i < argc; i++) {
+                       fprintf(stderr, " %s", argv[i]);
+               }
+               fprintf(stderr, "\n");
+               print_usage(stderr);
+               return EXIT_FAILURE;
+       }
+
        /* --filename and --execute imply --batch. */
        if (filename || execute)
                interactive = false;