Fix build with new Bison versions.

[cdecl99.git] / src / cdecl99.c

diff --git a/src/cdecl99.c b/src/cdecl99.c
index 99b5d63eaed47bcc2c197117ae95beb7cd89d1ef..bebdfffa43de00ee166bfcbee9b13e9ee70e9015 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 Nick Bowler
+ * Copyright © 2011-2012, 2020 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
@@ -13,8 +13,9 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
+
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -23,13 +24,16 @@
 #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
@@ -78,12 +82,22 @@ 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 2020 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)
@@ -478,13 +492,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);