/*
* Command line utility for making sense of C declarations.
- * Copyright © 2011-2012, 2020-2021 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
#include <errno.h>
#include <locale.h>
#include <assert.h>
+#include <stdarg.h>
#include <getopt.h>
#include <gettext.h>
#include "cdecl99.h"
#include "cdecl.h"
+#include "help.h"
static const char *progname = "cdecl99";
+static bool interactive = true;
#include "options.h"
static const char sopts[] = SOPT_STRING;
{0}
};
+void print_error(const char *fmt, ...)
+{
+ va_list(ap);
+
+ if (!interactive)
+ fprintf(stderr, "%s: ", progname);
+ fprintf(stderr, "%s", _("error: "));
+
+ va_start(ap, fmt);
+ vfprintf(stderr, fmt, ap);
+ va_end(ap);
+
+ fprintf(stderr, "\n");
+}
+
static void print_version(void)
{
const char *copysign = "(C)";
}
puts(PACKAGE_STRING);
- printf("Copyright %s 2021 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.");
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;
-}
-
-/*
- * Print a string, with each line indented by i spaces. The first line
- * will be indented by w fewer spaces (to account for the cursor being in
- * some other column).
- */
-void print_block(const char *s, int i, int w)
-{
- for (; *s; w = 0) {
- const char *nl = strchr(s, '\n');
- int n = (nl ? nl-s : -1);
-
- printf("%*s%.*s\n", i-w, "", n, s);
- if (!nl)
- break;
-
- s = nl+1;
- }
-}
-
static void print_help(void)
{
const struct option *opt;
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);
-
- print_block(help.desc, 20, w);
+ help_print_option(opt, help.arg, help.desc, 20);
}
putchar('\n');
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)
free(line);
if (ferror(stdin)) {
- errno = saved_errno;
- perror("read error");
+ print_error("%s", strerror(saved_errno));
return -1;
}
int main(int argc, char **argv)
{
- bool show_intro = true, interactive = true, execute = false;
+ bool show_intro = true;
const char *filename = NULL;
+ unsigned execute = 0;
int i, opt, rc;
if (argc > 0)
filename = optarg;
break;
case 'e':
- execute = true;
+ argv[execute++] = optarg;
break;
case 'V':
print_version();
}
if (optind < argc) {
- fprintf(stderr, _("%s: excess command-line arguments:"),
- progname);
+ fprintf(stderr, "%s: ", progname);
+ fprintf(stderr, _("excess command-line arguments:"));
for (i = optind; i < argc; i++) {
fprintf(stderr, " %s", argv[i]);
}
/* --execute supersedes --filename */
if (filename && !execute) {
if (!freopen(filename, "r", stdin)) {
- perror(filename);
+ print_error("failed to open %s: %s\n", filename,
+ strerror(errno));
return EXIT_FAILURE;
}
}
if (interactive)
rc = repl();
else if (execute)
- rc = repl_cmdline(argc, argv);
+ rc = repl_cmdline(execute, argv);
else
rc = repl_noninteractive();