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

diff --git a/src/cdecl99.c b/src/cdecl99.c
index 518dbbd..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-2021 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
@@ -25,45 +25,59 @@
 #include <errno.h>
 #include <locale.h>
 #include <assert.h>
-#include "history.h"
-#include "cdecl.h"
+#include <stdarg.h>
+#include <inttypes.h>
 
 #include <getopt.h>
 #include <gettext.h>
-#include <readline.h>
-#include <striconv.h>
-#include <localcharset.h>
 #include <mbswidth.h>
 
-#define _(x) gettext(x)
+#include "cdecl99.h"
+#include "cdecl.h"
+#include "help.h"
+#include "xtra.h"
+#include "options.h"
+#include "version.h"
+#include "getline.h"
 
-static const char *progname = "cdecl99";
+#if HAVE_READLINE_READLINE_H
+#  include <readline/readline.h>
+#endif
+#if HAVE_RL_ADD_HISTORY && HAVE_READLINE_HISTORY_H
+#  include <readline/history.h>
 
-#include "options.h"
-static const char sopts[] = SOPT_STRING;
-static const struct option lopts[] = {
-	LOPTS_INITIALIZER,
-	{0}
-};
+/* call add_history only if the line is non-blank */
+static void do_add_history(const char *line)
+{
+	if (line[strspn(line, " \t")])
+		add_history(line);
+}
+#else
+static void do_add_history(const char *line)
+{
+}
+#endif
 
-static void print_version(void)
+static const char *progname = "cdecl99";
+static bool batch_mode;
+
+void print_error(const char *fmt, ...)
 {
-	const char *copysign = "(C)";
-	void *convsign = NULL;
+	va_list(ap);
 
-	if (ENABLE_NLS) {
-		convsign = str_iconv("\xc2\xa9", "UTF-8", locale_charset());
-		if (convsign)
-			copysign = convsign;
-	}
+	fprintf(stderr, batch_mode ? "%s: %s" : "%.0s%s",
+	                progname, _("error: "));
 
-	puts(PACKAGE_STRING);
-	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.");
+	va_start(ap, fmt);
+	vfprintf(stderr, fmt, ap);
+	va_end(ap);
 
-	free(convsign);
+	fprintf(stderr, "\n");
+}
+
+static void print_version(void)
+{
+	do_print_version(PACKAGE_STRING);
 }
 
 static void print_usage(FILE *f)
@@ -74,48 +88,9 @@ static void print_usage(FILE *f)
 		           progname);
 }
 
-static int
-print_optstring(const struct option *opt, const struct lopt_help *help)
-{
-	char optstring[100];
-	int w;
-
-	if (!ENABLE_NLS)
-		goto no_translate;
-
-	if (opt->has_arg) {
-		w = snprintf(optstring, sizeof optstring,
-		             _("  -%c, --%s=%s"), opt->val, opt->name,
-		             pgettext_expr(opt->name, help->arg));
-	} else {
-		w = snprintf(optstring, sizeof optstring,
-		             _("  -%c, --%s"), opt->val, opt->name);
-	}
-
-	if (w < 0)
-		goto no_translate;
-
-	w = mbsnwidth(optstring, w, 0);
-	printf("%s", optstring);
-	goto out;
-
-no_translate:
-	if (opt->has_arg) {
-		w = printf("  -%c, --%s=%s", opt->val, opt->name, help->arg);
-	} else {
-		w = printf("  -%c, --%s", opt->val, opt->name);
-	}
-out:
-	if (w < 0 || w > 18) {
-		putchar('\n');
-		return 0;
-	}
-
-	return w;
-}
-
-static void print_help(void)
+static void print_help(const struct option *lopts)
 {
+	struct lopt_help help = {0};
 	const struct option *opt;
 
 	print_usage(stdout);
@@ -126,33 +101,14 @@ static void print_help(void)
 
 	puts(_("Options:"));
 	for (opt = lopts; opt->name; opt++) {
-		struct lopt_help help;
-		const char *line;
-		int w;
-
 		if (!lopt_get_help(opt, &help))
 			continue;
 
-		w = print_optstring(opt, &help);
-
-		if (ENABLE_NLS)
-			help.desc = pgettext_expr(opt->name, help.desc);
-
-		for (line = help.desc; *line; w = 0) {
-			const char *nl = strchr(line, '\n');
-			int n = (nl ? nl-line : -1);
-
-			printf("%*s%.*s\n", 20-w, "", n, line);
-			if (!nl)
-				break;
-
-			line = nl+1;
-		}
+		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
@@ -161,278 +117,60 @@ static void print_help(void)
 	printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
 }
 
-/*
- * Format a declaration according to the given function and return a pointer
- * to the formatted string.  The returned pointer remains valid until the
- * next call, after which it must not be re-used.
- *
- * Returns NULL on failure.
- */
-static const char *
-do_format(size_t func(char *, size_t, struct cdecl *), struct cdecl *decl)
-{
-	static size_t bufsz;
-	static char *buf;
-
-	size_t rc;
-
-retry:
-	rc = func(buf, bufsz, decl);
-	if (rc >= bufsz) {
-		char *tmp;
-
-		tmp = realloc(buf, rc + 1);
-		if (!tmp) {
-			fprintf(stderr, "%s\n", _("failed to allocate memory"));
-			return NULL;
-		}
-
-		buf = tmp;
-		bufsz = rc + 1;
-		goto retry;
-	}
-
-	return buf;
-}
-
-static int cmd_explain(const char *cmd, const char *arg)
-{
-	const struct cdecl_error *err;
-	struct cdecl *decl;
-	const char *str;
-	int ret = -1;
-
-	decl = cdecl_parse_decl(arg);
-	if (!decl) {
-		err = cdecl_get_error();
-		fprintf(stderr, "%s\n", err->str);
-		goto out;
-	}
-
-	for (struct cdecl *i = decl; i; i = i->next) {
-		str = do_format(cdecl_explain, i);
-		if (!str)
-			goto out;
-
-		printf("%s\n", str);
-	}
-
-	ret = 1;
-out:
-	cdecl_free(decl);
-	return ret;
-}
-
-static int cmd_simplify(const char *cmd, const char *arg)
-{
-	const struct cdecl_error *err;
-	struct cdecl *decl;
-	const char *str;
-	int ret = -1;
-
-	decl = cdecl_parse_decl(arg);
-	if (!decl) {
-		err = cdecl_get_error();
-		fprintf(stderr, "%s\n", err->str);
-		goto out;
-	}
-
-	for (struct cdecl *i = decl; i; i = i->next) {
-		struct cdecl_declspec *s = i->specifiers;
-
-		if (i != decl) {
-			i->specifiers = NULL;
-			printf(", ");
-		}
-
-		str = do_format(cdecl_declare, i);
-		i->specifiers = s;
-
-		if (!str)
-			goto out;
-
-		printf("%s", str);
-	}
-
-	putchar('\n');
-
-	ret = 1;
-out:
-	cdecl_free(decl);
-	return ret;
-}
-
-static int cmd_declare(const char *cmd, const char *arg)
+static int do_readline(char **linebuf, size_t *n, bool batch)
 {
-	const struct cdecl_error *err;
-	struct cdecl *decl;
-	const char *str;
-	int ret = -1;
-
-	/* The name of the command is significant here. */
-	decl = cdecl_parse_english(cmd);
-	if (!decl) {
-		err = cdecl_get_error();
-		fprintf(stderr, "%s\n", err->str);
-		goto out;
+#if !HAVE_READLINE
+	if (!batch) {
+		fputs("> ", stdout);
+		fflush(stdout);
 	}
 
-	/*
-	 * English parses have at most one full declarator, so no loop is
-	 * needed here.
-	 */
-	str = do_format(cdecl_declare, decl);
-	if (!str)
-		goto out;
-
-	printf("%s\n", str);
-	ret = 1;
-out:
-	cdecl_free(decl);
-	return ret;
-}
-
-static int cmd_quit(const char *cmd, const char *arg)
-{
-	return 0;
-}
+	return do_getline(linebuf, n);
+#else
+	if (batch)
+		return do_getline(linebuf, n);
 
-static int cmd_help(const char *cmd, const char *arg);
-
-static const struct command {
-	char name[16];
-	int (*func)(const char *cmd, const char *arg);
-	const char *blurb;
-} commands[] = {
-	{ "explain",  cmd_explain,  "Explain a C declaration." },
-	{ "simplify", cmd_simplify, "Simplify a C declaration." },
-	{ "declare",  cmd_declare,  "Construct a C declaration." },
-	{ "type",     cmd_declare,  "Construct a C type name." },
-	{ "help",     cmd_help,     "Print this list of commands." },
-	{ "quit",     cmd_quit,     "Quit the program." },
-	{ "exit",     cmd_quit,     NULL }
-};
-static const size_t ncommands = sizeof commands / sizeof commands[0];
-
-static int cmd_help(const char *cmd, const char *arg)
-{
-	for (size_t i = 0; i < ncommands; i++) {
-		if (!commands[i].blurb)
-			continue;
-
-		printf("%s -- %s\n", commands[i].name, commands[i].blurb);
-	}
+	free(*linebuf);
+	if (!(*linebuf = readline("> ")))
+		return 0;
 
+	do_add_history(*linebuf);
 	return 1;
+#endif
 }
 
-/*
- * Ensure that the first n characters of str equal the entire (null-terminated)
- * string cmd.
- */
-static int cmd_cmp(const char *str, const char *cmd, size_t n)
+static int repl(bool batch)
 {
-	size_t cmdlen = strlen(cmd);
-
-	if (n < cmdlen)
-		return -1;
-	if (n > cmdlen)
-		return 1;
-	return memcmp(str, cmd, n);
-}
-
-static int run_command(const char *line)
-{
-	const char *cmd = line + strspn(line, " \t");
-	const char *arg = cmd  + strcspn(cmd, " \t");
-
-	if (cmd[0] == '\0')
-		return 1;
-
-	for (size_t i = 0; i < ncommands; i++) {
-		if (cmd_cmp(cmd, commands[i].name, arg-cmd) != 0)
-			continue;
-
-		return commands[i].func(cmd, arg);
-	}
-
-	fprintf(stderr, "Undefined command: %.*s\n", (int)(arg-cmd), cmd);
-	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);
+	char *line = NULL;
+	bool fail = 0;
+	size_t n = 0;
 
-		if (!run_command(line))
+	while (do_readline(&line, &n, batch)) {
+		int rc = run_command(line, batch);
+		if (rc > 0)
 			break;
+		if (rc < 0)
+			fail = batch;
 	}
 
 	free(line);
-	return 0;
+	return fail ? EXIT_FAILURE : 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;
+	bool fail = 0;
+	unsigned i;
 
-		rc = run_command(optarg);
-		if (rc < 0)
-			ret = -1;
-		else if (rc == 0)
+	for (i = 0; i < count; i++) {
+		int rc = run_command(commands[i], true);
+		if (rc > 0)
 			break;
-	}
-
-	return ret;
-}
-
-static int repl_noninteractive(void)
-{
-	int rc, ret = 0, saved_errno;
-	char *line = NULL;
-	size_t n;
-
-	while (getline(&line, &n, stdin) >= 0) {
-		char *c = strchr(line, '\n');
-		if (c)
-			*c = '\0';
-
-		rc = run_command(line);
 		if (rc < 0)
-			ret = -1;
-		else if (rc == 0)
-			break;
-	}
-
-	saved_errno = errno;
-	free(line);
-
-	if (ferror(stdin)) {
-		errno = saved_errno;
-		perror("read error");
-		return -1;
+			fail = true;
 	}
 
-	return ret;
+	return fail ? EXIT_FAILURE : 0;
 }
 
 /* Initialize gettext */
@@ -446,81 +184,94 @@ static void init_i18n(void)
 	textdomain(PACKAGE);
 }
 
-int main(int argc, char **argv)
+enum {
+	INIT_EXIT_SUCCESS = -1,
+	INIT_EXIT_FAILURE = -2
+};
+
+static int initialize(int argc, char **argv)
 {
-	bool show_intro = true, interactive = true, execute = false;
+	int i, opt, quiet = 0, execute = 0;
 	const char *filename = NULL;
-	int i, opt, rc;
+
+	XTRA_PACKED_LOPTS(lopts);
 
 	if (argc > 0)
 		progname = argv[0];
 
 	init_i18n();
 
-	while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) {
+	while ((opt = getopt_long(argc, argv, SOPT_STRING, lopts, 0)) != -1) {
 		switch (opt) {
 		case 'q':
-			show_intro = false;
+			quiet = 1;
 			break;
 		case 'b':
-			interactive = false;
+			batch_mode = true;
 			break;
 		case 'i':
-			interactive = true;
+			batch_mode = false;
 			break;
 		case 'f':
 			filename = optarg;
 			break;
 		case 'e':
-			execute = true;
+			argv[execute++] = optarg;
 			break;
 		case 'V':
 			print_version();
-			return EXIT_SUCCESS;
+			return INIT_EXIT_SUCCESS;
 		case 'H':
-			print_help();
-			return EXIT_SUCCESS;
+			print_help(lopts);
+			return INIT_EXIT_SUCCESS;
 		default:
 			print_usage(stderr);
-			return EXIT_FAILURE;
+			return INIT_EXIT_FAILURE;
 		}
 	}
 
 	if (optind < argc) {
-		fprintf(stderr, _("%s: excess command-line arguments:"),
-		                progname);
+		fprintf(stderr, "%s: %s", progname,
+		                _("excess command-line arguments:"));
 		for (i = optind; i < argc; i++) {
 			fprintf(stderr, " %s", argv[i]);
 		}
 		fprintf(stderr, "\n");
 		print_usage(stderr);
-		return EXIT_FAILURE;
+		return INIT_EXIT_FAILURE;
 	}
 
 	/* --filename and --execute imply --batch. */
 	if (filename || execute)
-		interactive = false;
+		batch_mode = true;
 
 	/* --batch implies --quiet */
-	if (interactive && show_intro)
+	if (!batch_mode && !quiet)
 		print_version();
 
 	/* --execute supersedes --filename */
 	if (filename && !execute) {
 		if (!freopen(filename, "r", stdin)) {
-			perror(filename);
-			return EXIT_FAILURE;
+			print_error("failed to open %s: %s", filename,
+			                                strerror(errno));
+			return INIT_EXIT_FAILURE;
 		}
 	}
 
-	if (interactive)
-		rc = repl();
-	else if (execute)
-		rc = repl_cmdline(argc, argv);
-	else
-		rc = repl_noninteractive();
+	return execute;
+}
+
+int main(int argc, char **argv)
+{
+	int execute;
+
+	switch ((execute = initialize(argc, argv))) {
+	case INIT_EXIT_SUCCESS: return EXIT_SUCCESS;
+	case INIT_EXIT_FAILURE: return EXIT_FAILURE;
+	}
 
-	if (rc != 0)
-		return EXIT_FAILURE;
-	return EXIT_SUCCESS;
+	if (execute)
+		return repl_cmdline(execute, argv);
+	else
+		return repl(batch_mode);
 }