X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/87278972ae64ef4c5eff110af1565b1988160fb4..99cde35bb58605e86541acd812860c222e375af2:/src/cdecl99.c

diff --git a/src/cdecl99.c b/src/cdecl99.c
index c70834f..99b5d63 100644
--- a/src/cdecl99.c
+++ b/src/cdecl99.c
@@ -1,32 +1,36 @@
 /*
- *  Command line utility for making sense of C declarations.
- *  Copyright © 2011 Nick Bowler
+ * Command line utility for making sense of C declarations.
+ * Copyright © 2011-2012 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
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
+#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"
 
+#define _(x) gettext(x)
 #define N_(x) x
 #define PN_(c, x) x
 
@@ -48,6 +52,30 @@ static const char sopts[] = "qbif:e:VH";
 enum { NOPTS = sizeof (struct option[]){RAW_LOPTS} / sizeof (struct option) };
 static struct option lopts[NOPTS + !!ENABLE_NLS * NOPTS + 1] = { RAW_LOPTS };
 
+static struct helptext {
+	int val;
+	const char *text;
+	const char *argname;
+} helptext[] = {
+	/*
+	 * TRANSLATORS: Help messages are indented 20 spaces and thus should
+	 * not have lines longer than 60 columns.
+	 */
+	{ 'q', N_("Suppress the welcome message.\n") },
+	{ 'b', N_("Execute commands as normal, but do not print any prompts.\n") },
+	{ 'i', N_("Run in interactive mode.  This is the default.\n") },
+	{ 'f', N_("Read commands from FILE instead of standard input.\n"),
+	       PN_("longopt|file", "FILE") },
+	{ 'e', N_("Execute COMMAND as if it were entered at the prompt.\n"
+	          "This can be specified multiple times.\n"),
+	       PN_("longopt|execute", "COMMAND") },
+	{ 'V', N_("Print a version message and then exit.\n") },
+	{ 'H', N_("Print this message.\n") },
+
+	/* TRANSLATORS: ARG is only used for options without help text. */
+	{ 0, NULL, PN_("longopt", "ARG") }
+};
+
 static void print_version(void)
 {
 	puts(PACKAGE_STRING);
@@ -63,10 +91,114 @@ static void print_usage(FILE *f)
 	fprintf(f, "Usage: %s [options]\n", progname);
 }
 
+/*
+ * Print the help description of a particular command-line option, identified
+ * by its short option name.
+ */
+static void print_option(int val)
+{
+	const struct option *tmp[2];
+	const struct helptext *help;
+	const char *argname;
+	char context[32];
+	size_t rc, n = 0;
+	int w;
+
+	/* Find the options and help text corresponding to val. */
+	for (const struct option *o = lopts; o->val; o++) {
+		if (o->val == val) {
+			assert(n < sizeof tmp / sizeof tmp[0]);
+			tmp[n++] = o;
+		}
+	}
+
+	for (help = helptext; help->val; help++) {
+		if (help->val == val)
+			break;
+	}
+
+	/* Prepare translations. */
+	if (!ENABLE_NLS) {
+		argname = help->argname;
+	} else if (n > 0) {
+		rc = snprintf(context, sizeof context, "longopt%c%s",
+		              help->text ? '|' : '\0', tmp[0]->name);
+		assert(rc < sizeof context);
+
+		if (help->argname)
+			argname = pgettext_expr(context, help->argname);
+	}
+
+	switch (n) {
+	case 0:
+		w = printf(_("  -%c"), val);
+		break;
+	case 1:
+		w = printf(tmp[0]->has_arg ? _("  -%c, --%s=%s")
+		                           : _("  -%c, --%s"),
+		           val, tmp[0]->name, argname);
+		break;
+	case 2:
+		if (tmp[0]->has_arg) {
+			w = printf(_("  -%c, --%s=%s, --%s=%s"), val,
+			           tmp[0]->name, argname,
+			           tmp[1]->name, argname);
+		} else {
+			w = printf(_("  -%c, --%s, --%s"), val,
+			           tmp[0]->name, tmp[1]->name);
+		}
+		break;
+	default:
+		assert(0);
+	}
+
+	if (!help->text) {
+		putchar('\n');
+		return;
+	}
+
+	if (w > 18) {
+		putchar('\n');
+		w = 0;
+	}
+
+	for (const char *line = gettext(help->text); *line;) {
+		const char *nl = strchr(line, '\n');
+
+		if (!nl) {
+			printf("%*s%s\n", 20-w, "", line);
+			break;
+		}
+
+		printf("%*s%.*s\n", 20-w, "", (int)(nl-line), line);
+		line = nl+1;
+	}
+}
+
 static void print_help(void)
 {
 	print_usage(stdout);
-	puts("Detailed help coming soon.");
+
+	puts(_(
+"This is \"cdecl99\": a command-line tool for parsing and constructing\n"
+"complicated C declarations.\n"));
+
+	puts(_("Options:"));
+	for (const char *c = sopts; *c; c++) {
+		if (*c == ':' || *c == '+' || *c == '-')
+			continue;
+
+		print_option(*c);
+	}
+	putchar('\n');
+
+	puts(_("For more information, see the cdecl99(1) man page.\n"));
+
+	/*
+	 * TRANSLATORS: Please add *another line* indicating where users should
+	 * report translation bugs.
+	 */
+	printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
 }
 
 /*
@@ -268,11 +400,24 @@ static int run_command(const char *line)
 	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);
+
 		if (!run_command(line))
 			break;
 	}
@@ -340,9 +485,14 @@ static void init_i18n(void)
 	if (!ENABLE_NLS)
 		return;
 
-	for (int i = 0; i < NOPTS; i++) {
-		lopts[i+NOPTS] = lopts[i];
-		lopts[i+NOPTS].name = pgettext_expr("longopt", lopts[i].name);
+	for (int i = 0, j = NOPTS; i < NOPTS; i++) {
+		const char *tname = pgettext_expr("longopt", lopts[i].name);
+
+		if (strcmp(tname, lopts[i].name) != 0) {
+			lopts[j] = lopts[i];
+			lopts[j].name = tname;
+			j++;
+		}
 	}
 }