#include <config.h>
#include <stdio.h>
#include <stdlib.h>
+#include <stdbool.h>
#include <string.h>
#include <getopt.h>
#include "readline.h"
#include "cdecl.h"
static const char *progname = "cdecl99";
-static const char sopts[] = "VH";
+static const char sopts[] = "qbiVH";
static const struct option lopts[] = {
- { "version", 0, NULL, 'V' },
- { "help", 0, NULL, 'H' },
+ { "quiet", 0, NULL, 'q' },
+ { "batch", 0, NULL, 'b' },
+ { "interactive", 0, NULL, 'i' },
+ { "version", 0, NULL, 'V' },
+ { "help", 0, NULL, 'H' },
{ 0 }
};
{
static size_t bufsz;
static char *buf;
+ int ret = -1;
struct cdecl *decl;
size_t rc;
printf("%s\n", buf);
}
+
+ ret = 1;
out:
cdecl_free(decl);
- return 1;
+ return ret;
}
static int cmd_quit(char *cmd, char *arg)
return 1;
}
-static int repl(void)
+static int repl(bool interactive)
{
+ char *prompt = interactive ? "> " : NULL;
+ int rc, ret = 0;
char *line;
- int ret;
- print_version();
-
- for (; (line = readline("> ")); free(line)) {
+ for (; (line = readline(prompt)); free(line)) {
char *cmd = line + strspn(line, " \t");
char *arg = cmd + strcspn(cmd, " \t");
if (strcmp(cmd, commands[i].name) != 0)
continue;
- ret = commands[i].func(cmd, arg);
- if (ret <= 0)
+ rc = commands[i].func(cmd, arg);
+ if (!interactive && rc < 0)
+ ret = -1;
+ if (rc == 0)
goto out;
goto next;
}
fprintf(stderr, "Undefined command: %s\n", cmd);
+ ret = -1;
next:
;
}
-
- ret = 0;
out:
free(line);
return ret;
int main(int argc, char **argv)
{
+ bool show_intro = true, interactive = true;
int opt;
if (argc > 0)
while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) {
switch (opt) {
+ case 'q':
+ show_intro = false;
+ break;
+ case 'b':
+ interactive = false;
+ break;
+ case 'i':
+ interactive = true;
+ break;
case 'V':
print_version();
return EXIT_SUCCESS;
}
}
- if (repl() != 0)
+ if (interactive && show_intro)
+ print_version();
+
+ if (repl(interactive) != 0)
return EXIT_FAILURE;
return EXIT_SUCCESS;