Convert the calls to repl/repl_execute to tail calls from main.
-static int do_readline(char **linebuf, size_t *n, int batch)
+static int do_readline(char **linebuf, size_t *n, bool batch)
{
#if !HAVE_READLINE
if (!batch) {
{
#if !HAVE_READLINE
if (!batch) {
-static int repl(int batch)
+static int repl(bool batch)
size_t n;
while (do_readline(&line, &n, batch)) {
int rc = run_command(line, batch);
if (rc > 0)
break;
size_t n;
while (do_readline(&line, &n, batch)) {
int rc = run_command(line, batch);
if (rc > 0)
break;
- else if (rc < 0)
- ret = -batch;
+ if (rc < 0)
+ fail = batch;
+ return fail ? EXIT_FAILURE : 0;
}
static int repl_cmdline(unsigned count, char **commands)
{
}
static int repl_cmdline(unsigned count, char **commands)
{
unsigned i;
for (i = 0; i < count; i++) {
int rc = run_command(commands[i], true);
unsigned i;
for (i = 0; i < count; i++) {
int rc = run_command(commands[i], true);
- if (rc < 0)
- ret = -1;
- else if (rc > 0)
+ if (rc < 0)
+ fail = true;
+ return fail ? EXIT_FAILURE : 0;
}
/* Initialize gettext */
}
/* Initialize gettext */
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
switch ((execute = initialize(argc, argv))) {
case INIT_EXIT_SUCCESS: return EXIT_SUCCESS;
switch ((execute = initialize(argc, argv))) {
case INIT_EXIT_SUCCESS: return EXIT_SUCCESS;
- rc = repl_cmdline(execute, argv);
+ return repl_cmdline(execute, argv);
- rc = repl(batch_mode);
-
- if (rc != 0)
- return EXIT_FAILURE;
- return EXIT_SUCCESS;
+ return repl(batch_mode);