/*
* 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 <getopt.h>
#include <gettext.h>
#include <readline.h>
-#include <striconv.h>
#include <localcharset.h>
#include <mbswidth.h>
#include "cdecl99.h"
#include "cdecl.h"
#include "help.h"
+#include "xtra.h"
+#include "copysym.h"
+#include "options.h"
static const char *progname = "cdecl99";
static bool interactive = true;
-#include "options.h"
-static const char sopts[] = SOPT_STRING;
-static const struct option lopts[] = {
- LOPTS_INITIALIZER,
- {0}
-};
-
void print_error(const char *fmt, ...)
{
va_list(ap);
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;
- }
+ const char *copysign = copyright_symbol(locale_charset());
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.");
-
- free(convsign);
}
static void print_usage(FILE *f)
progname);
}
-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);
puts(_("Options:"));
for (opt = lopts; opt->name; opt++) {
- struct lopt_help help;
-
if (!lopt_get_help(opt, &help))
continue;
printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
}
-static bool is_blank_line(const char *line)
+static int is_blank_line(const char *line)
{
- for (size_t i = 0; line[i]; i++) {
- if (!isblank((unsigned char)line[i]))
- return false;
- }
-
- return true;
+ return !line[strspn(line, " \t")];
}
static int repl(void)
return 0;
}
-static int repl_cmdline(int argc, char **argv)
+static int repl_cmdline(unsigned count, char **commands)
{
- int opt, rc, ret = 0;
+ int ret = 0;
+ unsigned i;
- optind = 1;
- while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) {
- if (opt != 'e')
- continue;
-
- 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)
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, 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;
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: ", progname);
-
- fprintf(stderr, _("excess command-line arguments:"),
- progname);
+ fprintf(stderr, _("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. */
interactive = false;
/* --batch implies --quiet */
- if (interactive && show_intro)
+ if (interactive && !quiet)
print_version();
/* --execute supersedes --filename */
if (filename && !execute) {
if (!freopen(filename, "r", stdin)) {
- print_error("failed to open %s: %s\n", filename,
+ print_error("failed to open %s: %s", filename,
strerror(errno));
- return EXIT_FAILURE;
+ return INIT_EXIT_FAILURE;
}
}
+ return execute;
+}
+
+int main(int argc, char **argv)
+{
+ int rc, execute;
+
+ switch ((execute = initialize(argc, argv))) {
+ case INIT_EXIT_SUCCESS: return EXIT_SUCCESS;
+ case INIT_EXIT_FAILURE: return EXIT_FAILURE;
+ }
+
if (interactive)
rc = repl();
else if (execute)
- rc = repl_cmdline(argc, argv);
+ rc = repl_cmdline(execute, argv);
else
rc = repl_noninteractive();
projects / cdecl99.git / blobdiff