X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/63274ac7f99c516b88bd1f94e05e5c715a4800ce..HEAD:/src/cdecl99.c
diff --git a/src/cdecl99.c b/src/cdecl99.c
index 2df7ec8..0622e67 100644
--- a/src/cdecl99.c
+++ b/src/cdecl99.c
@@ -1,346 +1,292 @@
/*
- * 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-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
- * 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 .
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
*/
+
#include
#include
#include
#include
#include
+#include
#include
-#include
-#include "readline.h"
-#include "cdecl.h"
+#include
+#include
+#include
+#include
-static const char *progname = "cdecl99";
-static const char sopts[] = "qbif:e:VH";
-static const struct option lopts[] = {
- { "quiet", 0, NULL, 'q' },
- { "batch", 0, NULL, 'b' },
- { "interactive", 0, NULL, 'i' },
- { "file", 1, NULL, 'f' },
- { "execute", 1, NULL, 'e' },
- { "version", 0, NULL, 'V' },
- { "help", 0, NULL, 'H' },
- { 0 }
-};
+#include
+#include
+#include
-static void print_version(void)
+#include "cdecl99.h"
+#include "cdecl.h"
+#include "help.h"
+#include "xtra.h"
+#include "options.h"
+#include "version.h"
+#include "getline.h"
+
+#if HAVE_READLINE_READLINE_H
+# include
+#endif
+#if HAVE_RL_ADD_HISTORY && HAVE_READLINE_HISTORY_H
+# include
+
+/* call add_history only if the line is non-blank */
+static void do_add_history(const char *line)
{
- puts(PACKAGE_STRING);
- puts("Copyright (C) 2011 Nick Bowler.");
- puts("License GPLv3+: GNU GPL version 3 or later .");
- puts("This is free software: you are free to change and redistribute it.");
- puts("There is NO WARRANTY, to the extent permitted by law.");
+ if (line[strspn(line, " \t")])
+ add_history(line);
}
-
-static void print_usage(FILE *f)
+#else
+static void do_add_history(const char *line)
{
- fprintf(f, "Usage: %s [options]\n", progname);
}
+#endif
-static void print_help(void)
-{
- print_usage(stdout);
- puts("Detailed help coming soon.");
-}
+static const char *progname = "cdecl99";
+static bool batch_mode;
-/*
- * 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)
+void print_error(const char *fmt, ...)
{
- static size_t bufsz;
- static char *buf;
+ va_list(ap);
- size_t rc;
+ fprintf(stderr, batch_mode ? "%s: %s" : "%.0s%s",
+ progname, _("error: "));
-retry:
- rc = func(buf, bufsz, decl);
- if (rc >= bufsz) {
- char *tmp;
+ va_start(ap, fmt);
+ vfprintf(stderr, fmt, ap);
+ va_end(ap);
- tmp = realloc(buf, rc + 1);
- if (!tmp) {
- fprintf(stderr, "failed to allocate memory\n");
- return NULL;
- }
-
- buf = tmp;
- bufsz = rc + 1;
- goto retry;
- }
-
- return buf;
+ fprintf(stderr, "\n");
}
-static int cmd_explain(const char *cmd, const char *arg)
+static void print_version(void)
{
- struct cdecl *decl;
- const char *str;
- int ret = -1;
-
- decl = cdecl_parse_decl(arg);
- if (!decl)
- 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;
+ do_print_version(PACKAGE_STRING);
}
-static int cmd_simplify(const char *cmd, const char *arg)
+static void print_usage(FILE *f)
{
- struct cdecl *decl;
- const char *str;
- int ret = -1;
-
- decl = cdecl_parse_decl(arg);
- if (!decl)
- 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;
+ fprintf(f, _("Usage: %s [options]\n"), progname);
+ if (f != stdout)
+ fprintf(f, _("Try %s --help for more information.\n"),
+ progname);
}
-static int cmd_quit(const char *cmd, const char *arg)
+static void print_help(const struct option *lopts)
{
- return 0;
-}
+ struct lopt_help help = {0};
+ const struct option *opt;
-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." },
- { "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];
+ print_usage(stdout);
-static int cmd_help(const char *cmd, const char *arg)
-{
- for (size_t i = 0; i < ncommands; i++) {
- if (!commands[i].blurb)
+ 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++) {
+ if (!lopt_get_help(opt, &help))
continue;
- printf("%s -- %s\n", commands[i].name, commands[i].blurb);
+ help_print_option(opt, help.arg, help.desc, 20);
}
- return 1;
+ printf("\n%s\n\n",
+ _("For more information, see the cdecl99(1) man page."));
+
+ /*
+ * TRANSLATORS: Please add *another line* indicating where users should
+ * report translation bugs.
+ */
+ printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}
-/*
- * 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 do_getline(char **linebuf, size_t *n)
{
- size_t cmdlen = strlen(cmd);
+ int rc;
+
+ if ((rc = dx_getline(linebuf, n, stdin)) < 0) {
+ if (rc == DX_GETLINE_ENOMEM)
+ print_error("%s", _("failed to allocate memory"));
+ else
+ print_error("%s", strerror(errno));
+ return 0;
+ }
- if (n < cmdlen)
- return -1;
- if (n > cmdlen)
- return 1;
- return memcmp(str, cmd, n);
+ return rc;
}
-static int run_command(const char *line)
+static int do_readline(char **linebuf, size_t *n, bool batch)
{
- const char *cmd = line + strspn(line, " \t");
- const char *arg = cmd + strcspn(cmd, " \t");
+#if !HAVE_READLINE
+ if (!batch) {
+ fputs("> ", stdout);
+ fflush(stdout);
+ }
- if (cmd[0] == '\0')
- return 1;
+ return do_getline(linebuf, n);
+#else
+ if (batch)
+ return do_getline(linebuf, n);
- for (size_t i = 0; i < ncommands; i++) {
- if (cmd_cmp(cmd, commands[i].name, arg-cmd) != 0)
- continue;
+ free(*linebuf);
+ if (!(*linebuf = readline("> ")))
+ return 0;
- return commands[i].func(cmd, arg);
- }
-
- fprintf(stderr, "Undefined command: %.*s\n", (int)(arg-cmd), cmd);
- return -1;
+ do_add_history(*linebuf);
+ return 1;
+#endif
}
-static int repl(void)
+static int repl(bool batch)
{
- char *line;
+ char *line = NULL;
+ bool fail = 0;
+ size_t n = 0;
- for (; (line = readline("> ")); free(line)) {
- 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;
+ if (rc < 0)
+ fail = true;
}
- return ret;
+ return fail ? EXIT_FAILURE : 0;
}
-static int repl_noninteractive(void)
+/* Initialize gettext */
+static void init_i18n(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';
+ if (!ENABLE_NLS)
+ return;
- 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;
- }
-
- return ret;
+ setlocale(LC_ALL, "");
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ 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 opt, rc;
+
+ XTRA_PACKED_LOPTS(lopts);
if (argc > 0)
progname = argv[0];
- while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) {
+ init_i18n();
+
+ 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: %s", progname,
+ _("excess command-line arguments:"));
+ for (i = optind; i < argc; i++) {
+ fprintf(stderr, " %s", argv[i]);
+ }
+ fprintf(stderr, "\n");
+ print_usage(stderr);
+ 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;
- if (rc != 0)
- return EXIT_FAILURE;
- return EXIT_SUCCESS;
+ switch ((execute = initialize(argc, argv))) {
+ case INIT_EXIT_SUCCESS: return EXIT_SUCCESS;
+ case INIT_EXIT_FAILURE: return EXIT_FAILURE;
+ }
+
+ if (execute)
+ return repl_cmdline(execute, argv);
+ else
+ return repl(batch_mode);
}