#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"
+
+#if HAVE_READLINE_READLINE_H
+# include <readline/readline.h>
+#endif
+#if HAVE_RL_ADD_HISTORY && HAVE_READLINE_HISTORY_H
+# include <readline/history.h>
+
+/* call add_history only if the line is non-blank */
+static void do_add_history(const char *line)
+{
+ if (line[strspn(line, " \t")])
+ add_history(line);
+}
+#else
+static void do_add_history(const char *line)
+{
+}
+#endif
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 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)
-{
- 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))
- add_history(line);
-
- if (run_command(line, true) > 0)
- break;
- }
-
- free(line);
- return 0;
-}
-
static int repl_cmdline(unsigned count, char **commands)
{
int ret = 0;
return ret;
}
-static int repl_noninteractive(void)
+static int do_getline(char **linebuf, size_t *n)
{
- int rc, ret = 0, saved_errno;
- char *line = NULL;
- size_t n;
+ ssize_t rc;
+
+ if ((rc = getline(linebuf, n, stdin)) < 0) {
+ if (ferror(stdin))
+ print_error("%s", strerror(errno));
+ return 0;
+ }
- while (getline(&line, &n, stdin) >= 0) {
- char *c = strchr(line, '\n');
- if (c)
- *c = '\0';
+ if (rc-- && (*linebuf)[rc] == '\n')
+ (*linebuf)[rc] = '\0';
+ return 1;
+}
- rc = run_command(line, false);
- if (rc < 0)
- ret = -1;
- else if (rc > 0)
- break;
+static int do_readline(char **linebuf, size_t *n, int interactive)
+{
+#if !HAVE_READLINE
+ if (interactive) {
+ fputs("> ", stdout);
+ fflush(stdout);
}
- saved_errno = errno;
- free(line);
+ return do_getline(linebuf, n);
+#else
+ if (!interactive)
+ return do_getline(linebuf, n);
+
+ free(*linebuf);
+ if (!(*linebuf = readline("> ")))
+ return 0;
+
+ do_add_history(*linebuf);
+ return 1;
+#endif
+}
- if (ferror(stdin)) {
- print_error("%s", strerror(saved_errno));
- return -1;
+static int repl(int interactive)
+{
+ char *line = NULL;
+ int ret = 0;
+ size_t n;
+
+ while (do_readline(&line, &n, interactive)) {
+ int rc = run_command(line, interactive);
+ if (rc > 0)
+ break;
+ else if (rc < 0)
+ ret = -!interactive;
}
+ free(line);
return ret;
}
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;
+ int i, opt, quiet = 0, execute = 0;
const char *filename = NULL;
- unsigned execute = 0;
- 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;
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;
}
}
}
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;
}
}
- if (interactive)
- rc = repl();
- else if (execute)
+ 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 (execute)
rc = repl_cmdline(execute, argv);
else
- rc = repl_noninteractive();
+ rc = repl(interactive);
if (rc != 0)
return EXIT_FAILURE;