Avoid warnings about unused scanner functions.

[cdecl99.git] / src / cdecl99.c

diff --git a/src/cdecl99.c b/src/cdecl99.c
index eac0023731ce9838342dd286032ad876c36463b4..6eb00df53a57b934e06ee353a0813af17d607b08 100644 (file)
--- a/src/cdecl99.c
+++ b/src/cdecl99.c
@@ -29,7 +29,6 @@
 
 #include <getopt.h>
 #include <gettext.h>
-#include <readline.h>
 #include <localcharset.h>
 #include <mbswidth.h>
 
@@ -40,14 +39,32 @@
 #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;
+static bool batch_mode;
 
 void print_error(const char *fmt, ...)
 {
        va_list(ap);
 
-       if (!interactive)
+       if (batch_mode)
                fprintf(stderr, "%s: ", progname);
        fprintf(stderr, "%s", _("error: "));
 
@@ -79,6 +96,7 @@ static void print_usage(FILE *f)
 
 static void print_help(const struct option *lopts)
 {
+       struct lopt_help help = {0};
        const struct option *opt;
 
        print_usage(stdout);
@@ -89,8 +107,6 @@ static void print_help(const struct option *lopts)
 
        puts(_("Options:"));
        for (opt = lopts; opt->name; opt++) {
-               struct lopt_help help;
-
                if (!lopt_get_help(opt, &help))
                        continue;
 
@@ -108,70 +124,75 @@ static void print_help(const struct option *lopts)
        printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
 }
 
-static int is_blank_line(const char *line)
+static int do_getline(char **linebuf, size_t *n)
 {
-       return !line[strspn(line, " \t")];
-}
+       ssize_t rc;
 
-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;
+       if ((rc = getline(linebuf, n, stdin)) < 0) {
+               if (ferror(stdin))
+                       print_error("%s", strerror(errno));
+               return 0;
        }
 
-       free(line);
-       return 0;
+       if (rc-- && (*linebuf)[rc] == '\n')
+               (*linebuf)[rc] = '\0';
+       return 1;
 }
 
-static int repl_cmdline(unsigned count, char **commands)
+static int do_readline(char **linebuf, size_t *n, bool batch)
 {
-       int ret = 0;
-       unsigned i;
-
-       for (i = 0; i < count; i++) {
-               int rc = run_command(commands[i], false);
-               if (rc < 0)
-                       ret = -1;
-               else if (rc > 0)
-                       break;
+#if !HAVE_READLINE
+       if (!batch) {
+               fputs("> ", stdout);
+               fflush(stdout);
        }
 
-       return ret;
+       return do_getline(linebuf, n);
+#else
+       if (batch)
+               return do_getline(linebuf, n);
+
+       free(*linebuf);
+       if (!(*linebuf = readline("> ")))
+               return 0;
+
+       do_add_history(*linebuf);
+       return 1;
+#endif
 }
 
-static int repl_noninteractive(void)
+static int repl(bool batch)
 {
-       int rc, ret = 0, saved_errno;
        char *line = NULL;
+       bool fail = 0;
        size_t n;
 
-       while (getline(&line, &n, stdin) >= 0) {
-               char *c = strchr(line, '\n');
-               if (c)
-                       *c = '\0';
-
-               rc = run_command(line, false);
-               if (rc < 0)
-                       ret = -1;
-               else if (rc > 0)
+       while (do_readline(&line, &n, batch)) {
+               int rc = run_command(line, batch);
+               if (rc > 0)
                        break;
+               if (rc < 0)
+                       fail = batch;
        }
 
-       saved_errno = errno;
        free(line);
+       return fail ? EXIT_FAILURE : 0;
+}
 
-       if (ferror(stdin)) {
-               print_error("%s", strerror(saved_errno));
-               return -1;
+static int repl_cmdline(unsigned count, char **commands)
+{
+       bool fail = 0;
+       unsigned i;
+
+       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;
 }
 
 /* Initialize gettext */
@@ -208,10 +229,10 @@ static int initialize(int argc, char **argv)
                        quiet = 1;
                        break;
                case 'b':
-                       interactive = false;
+                       batch_mode = true;
                        break;
                case 'i':
-                       interactive = true;
+                       batch_mode = false;
                        break;
                case 'f':
                        filename = optarg;
@@ -244,10 +265,10 @@ static int initialize(int argc, char **argv)
 
        /* --filename and --execute imply --batch. */
        if (filename || execute)
-               interactive = false;
+               batch_mode = true;
 
        /* --batch implies --quiet */
-       if (interactive && !quiet)
+       if (!batch_mode && !quiet)
                print_version();
 
        /* --execute supersedes --filename */
@@ -264,21 +285,15 @@ static int initialize(int argc, char **argv)
 
 int main(int argc, char **argv)
 {
-       int rc, execute;
+       int 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(execute, argv);
+       if (execute)
+               return repl_cmdline(execute, argv);
        else
-               rc = repl_noninteractive();
-
-       if (rc != 0)
-               return EXIT_FAILURE;
-       return EXIT_SUCCESS;
+               return repl(batch_mode);
 }