/*
- * 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, 2020-2021 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 <https://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 <assert.h>
+#include "history.h"
+#include "cdecl.h"
+
#include <getopt.h>
#include <gettext.h>
-#include "readline.h"
-#include "cdecl.h"
+#include <readline.h>
+#include <striconv.h>
+#include <localcharset.h>
+#include <mbswidth.h>
-#define N_(x) x
-#define PN_(c, x) x
+#define _(x) gettext(x)
static const char *progname = "cdecl99";
-static const char sopts[] = "qbif:e:VH";
-#define RAW_LOPTS \
- { PN_("longopt", "quiet"), 0, NULL, 'q' }, \
- { PN_("longopt", "batch"), 0, NULL, 'b' }, \
- { PN_("longopt", "interactive"), 0, NULL, 'i' }, \
- { PN_("longopt", "file"), 1, NULL, 'f' }, \
- { PN_("longopt", "execute"), 1, NULL, 'e' }, \
- { PN_("longopt", "version"), 0, NULL, 'V' }, \
- { PN_("longopt", "help"), 0, NULL, 'H' }
-/*
- * With NLS, we need a buffer big enough to store the translated options.
- * The translations will be filled in at program startup.
- */
-enum { NOPTS = sizeof (struct option[]){RAW_LOPTS} / sizeof (struct option) };
-static struct option lopts[NOPTS + !!ENABLE_NLS * NOPTS + 1] = { RAW_LOPTS };
+#include "options.h"
+static const char sopts[] = SOPT_STRING;
+static const struct option lopts[] = {
+ LOPTS_INITIALIZER,
+ {0}
+};
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;
+ }
+
puts(PACKAGE_STRING);
- /* TRANSLATORS: (C) must *always* be translated as ©. */
- printf("Copyright %s 2011 Nick Bowler.\n", gettext("(C)"));
- puts("License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.");
+ 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.");
+
+ free(convsign);
}
static void print_usage(FILE *f)
{
- fprintf(f, "Usage: %s [options]\n", progname);
+ fprintf(f, _("Usage: %s [options]\n"), progname);
+ if (f != stdout)
+ fprintf(f, _("Try %s --help for more information.\n"),
+ 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)
{
+ const struct option *opt;
+
print_usage(stdout);
- puts("Detailed help coming soon.");
+
+ puts(_("This is \"cdecl99\": a command-line tool for parsing and constructing\n"
+ "complicated C declarations."));
+ putchar('\n');
+
+ 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;
+ }
+ }
+ putchar('\n');
+
+ puts(_("For more information, see the cdecl99(1) man page."));
+ putchar('\n');
+
+ /*
+ * TRANSLATORS: Please add *another line* indicating where users should
+ * report translation bugs.
+ */
+ printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}
/*
tmp = realloc(buf, rc + 1);
if (!tmp) {
- fprintf(stderr, "failed to allocate memory\n");
+ fprintf(stderr, "%s\n", _("failed to allocate memory"));
return NULL;
}
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;
}
return ret;
}
-/* Initialize gettext and setup translated long options. */
+/* Initialize gettext */
static void init_i18n(void)
{
- setlocale(LC_ALL, "");
- bindtextdomain(PACKAGE, LOCALEDIR);
- textdomain(PACKAGE);
-
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);
- }
+ setlocale(LC_ALL, "");
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ textdomain(PACKAGE);
}
int main(int argc, char **argv)
{
bool show_intro = true, interactive = true, execute = false;
const char *filename = NULL;
- int opt, rc;
+ int i, opt, rc;
if (argc > 0)
progname = argv[0];
}
}
+ if (optind < argc) {
+ fprintf(stderr, _("%s: excess command-line arguments:"),
+ progname);
+ for (i = optind; i < argc; i++) {
+ fprintf(stderr, " %s", argv[i]);
+ }
+ fprintf(stderr, "\n");
+ print_usage(stderr);
+ return EXIT_FAILURE;
+ }
+
/* --filename and --execute imply --batch. */
if (filename || execute)
interactive = false;