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

diff --git a/src/cdecl99.c b/src/cdecl99.c
index 6eb00df..1d8dff0 100644
--- 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-2023 Nick Bowler
+ * Copyright © 2011-2012, 2020-2024 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
@@ -26,18 +26,19 @@
 #include <locale.h>
 #include <assert.h>
 #include <stdarg.h>
+#include <inttypes.h>
 
 #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"
+#include "getline.h"
 
 #if HAVE_READLINE_READLINE_H
 #  include <readline/readline.h>
@@ -64,9 +65,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 +77,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 +106,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
@@ -124,21 +117,6 @@ static void print_help(const struct option *lopts)
 	printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
 }
 
-static int do_getline(char **linebuf, size_t *n)
-{
-	ssize_t rc;
-
-	if ((rc = getline(linebuf, n, stdin)) < 0) {
-		if (ferror(stdin))
-			print_error("%s", strerror(errno));
-		return 0;
-	}
-
-	if (rc-- && (*linebuf)[rc] == '\n')
-		(*linebuf)[rc] = '\0';
-	return 1;
-}
-
 static int do_readline(char **linebuf, size_t *n, bool batch)
 {
 #if !HAVE_READLINE
@@ -165,7 +143,7 @@ static int repl(bool batch)
 {
 	char *line = NULL;
 	bool fail = 0;
-	size_t n;
+	size_t n = 0;
 
 	while (do_readline(&line, &n, batch)) {
 		int rc = run_command(line, batch);
@@ -253,8 +231,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]);
 		}