X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/f3d0075fed997b037645e866622224d8175dddfd..fd680aff4b56cdf9ece7d6ccfbd9e43ba88ef365:/src/cdecl99.c

diff --git a/src/cdecl99.c b/src/cdecl99.c
index 6eb00df..574d36e 100644
--- a/src/cdecl99.c
+++ b/src/cdecl99.c
@@ -29,15 +29,14 @@
 
 #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"
 
 #if HAVE_READLINE_READLINE_H
 #  include <readline/readline.h>
@@ -64,9 +63,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 +75,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 +104,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
@@ -253,8 +244,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]);
 		}