From: Nick Bowler <nbowler@draconx.ca>
Date: Thu, 7 Jul 2011 22:32:07 +0000 (-0400)
Subject: Add initial support for non-interactive modes to cdecl99.
X-Git-Tag: v1~143
X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/commitdiff_plain/7a91f9b26e6aff8250077f15f87fdc48066fe422

Add initial support for non-interactive modes to cdecl99.
---

diff --git a/src/cdecl99.c b/src/cdecl99.c
index 23c3e5c..b47565d 100644
--- a/src/cdecl99.c
+++ b/src/cdecl99.c
@@ -18,16 +18,20 @@
 #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 }
 };
 
@@ -55,6 +59,7 @@ static int cmd_explain(char *cmd, char *arg)
 {
 	static size_t bufsz;
 	static char *buf;
+	int ret = -1;
 
 	struct cdecl *decl;
 	size_t rc;
@@ -82,9 +87,11 @@ retry:
 
 		printf("%s\n", buf);
 	}
+
+	ret = 1;
 out:
 	cdecl_free(decl);
-	return 1;
+	return ret;
 }
 
 static int cmd_quit(char *cmd, char *arg)
@@ -118,14 +125,13 @@ static int cmd_help(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");
 
@@ -138,18 +144,19 @@ static int repl(void)
 			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;
@@ -157,6 +164,7 @@ out:
 
 int main(int argc, char **argv)
 {
+	bool show_intro = true, interactive = true;
 	int opt;
 
 	if (argc > 0)
@@ -164,6 +172,15 @@ int main(int argc, char **argv)
 
 	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;
@@ -176,7 +193,10 @@ int main(int argc, char **argv)
 		}
 	}
 
-	if (repl() != 0)
+	if (interactive && show_intro)
+		print_version();
+
+	if (repl(interactive) != 0)
 		return EXIT_FAILURE;
 
 	return EXIT_SUCCESS;