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

diff --git a/src/cdecl99.c b/src/cdecl99.c
index 9d9fcc8..1da195e 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-2022 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
@@ -30,13 +30,13 @@
 #include <getopt.h>
 #include <gettext.h>
 #include <readline.h>
-#include <striconv.h>
 #include <localcharset.h>
 #include <mbswidth.h>
 
 #include "cdecl99.h"
 #include "cdecl.h"
 #include "help.h"
+#include "copysym.h"
 
 static const char *progname = "cdecl99";
 static bool interactive = true;
@@ -65,22 +65,13 @@ void print_error(const char *fmt, ...)
 
 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;
-	}
+	const char *copysign = copyright_symbol(locale_charset());
 
 	puts(PACKAGE_STRING);
-	printf("Copyright %s 2022 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.");
-
-	free(convsign);
 }
 
 static void print_usage(FILE *f)
@@ -122,14 +113,9 @@ static void print_help(void)
 	printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
 }
 
-static bool is_blank_line(const char *line)
+static int is_blank_line(const char *line)
 {
-	for (size_t i = 0; line[i]; i++) {
-		if (!isblank((unsigned char)line[i]))
-			return false;
-	}
-
-	return true;
+	return !line[strspn(line, " \t")];
 }
 
 static int repl(void)
@@ -148,16 +134,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)
@@ -209,8 +192,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)
@@ -233,7 +217,7 @@ int main(int argc, char **argv)
 			filename = optarg;
 			break;
 		case 'e':
-			execute = true;
+			argv[execute++] = optarg;
 			break;
 		case 'V':
 			print_version();
@@ -269,7 +253,7 @@ int main(int argc, char **argv)
 	/* --execute supersedes --filename */
 	if (filename && !execute) {
 		if (!freopen(filename, "r", stdin)) {
-			print_error("failed to open %s: %s\n", filename,
+			print_error("failed to open %s: %s", filename,
 			                                strerror(errno));
 			return EXIT_FAILURE;
 		}
@@ -278,7 +262,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();