1 files changed, 46 insertions, 29 deletions

diff --git a/src/bin/main.c b/src/bin/main.c
index d0328f0..a969956 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -23,12 +23,14 @@
 #include <errno.h>
 #include "aplwc_repl.h"
 
+static unsigned long failsim_start;
+static unsigned long failsim_count;
+
 static void *
 my_alloc(size_t size, size_t *actual)
 {
 	size_t target = size;
 	void *p;
-	int fail2;
 
 	if(actual){
 		if(NEVER(target == 0))
@@ -45,12 +47,11 @@ my_alloc(size_t size, size_t *actual)
 		}
 	}
 
-	fail2 = aplwc_simulate_failure();
 
 	p = FAILCASE(malloc(target), NULL);
 	if((p == NULL) && (size < target)){
 		target = size;
-		p = FAILCASE_X(malloc(target), NULL, fail2);
+		p = FAILCASE(malloc(target), NULL);
 	}
 
 	if(actual)
@@ -64,6 +65,19 @@ my_dealloc(void *p)
 	free(p);
 }
 
+static unsigned long 
+my_setup_failsim(enum aplwc_failsim_parameter p, unsigned long def)
+{
+	switch(p){
+	case APLWC_FAILSIM_START:
+		return failsim_start = getenv_ulong("APLWC_SIMULATE_FAILURE_START", def);
+	case APLWC_FAILSIM_COUNT:
+		return failsim_count = getenv_ulong("APLWC_SIMULATE_FAILURE_COUNT", def);
+	default:
+		return def;
+	}
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -73,28 +87,25 @@ main(int argc, char *argv[])
 	AplwcLine line;
 	AplwcValue value;
 	char *input, *src;
-	int exit_code, line_number;
+	int line_number;
 	size_t input_size, src_size, i;
 	int opt, xflag, input_file;
 	long tmp;
-	unsigned long print_failsims;
 	FILE *f;
+	unsigned long failsim_count, failsim_fails;
 
 	aplwc_clear_line(&line);
 	aplwc_clear_value(&value);
 	input = NULL;
 	xflag = 0;
 	input_file = 0;
-	exit_code = 0;
 	line_number = 0;
 	aplwc = NULL;
 
-	aplwc_simulate_failure_at = getenv_ulong("APLWC_SIMULATE_FAILURE_AT", 0);
-	print_failsims = getenv_ulong("APLWC_SIMULATE_FAILURE_PRINT_COUNT", 0);
-
 	memset(&fns, 0, sizeof(fns));
 	fns.alloc = my_alloc;
 	fns.dealloc = my_dealloc;
+	fns.setup_failsim = my_setup_failsim;
 
 	while((opt = getopt(argc, argv, "x")) != -1){
 		switch(opt){
@@ -104,7 +115,7 @@ main(int argc, char *argv[])
 		default:
 usage:
 			fprintf(stderr, "Usage: %s [-x] [file]\n", argv[0]);
-			exit_code = 1;
+			ret = APLWC_OTHER_FAILURE;
 			goto end;
 		}
 	}
@@ -114,7 +125,7 @@ usage:
 		f = fopen(argv[optind], "r");
 		if(f == NULL){
 			fprintf(stderr, "Could not open file: %s: %s\n", argv[optind], strerror(errno));
-			exit_code = 1;
+			ret = APLWC_OTHER_FAILURE;
 			goto end;
 		}
 	}else if(optind == argc)
@@ -125,7 +136,6 @@ usage:
 	aplwc = aplwc_new(fns, &ret);
 	if(ret){
 		fprintf(stderr, "Couldn't create new aplwc instance: %s\n", aplwc_errstr_rc(ret));
-		exit_code = 1;
 		goto end;
 	}
 
@@ -133,7 +143,7 @@ usage:
 		if(FAILCASE(fseek(f, 0, SEEK_END), -1)){
 file_size:
 			fprintf(stderr, "Failed to determine file size\n");
-			exit_code = 1;
+			ret = APLWC_OTHER_FAILURE;
 			goto end;
 		}
 		tmp = FAILCASE(ftell(f), -1);
@@ -144,12 +154,12 @@ file_size:
 		input = FAILCASE(malloc(input_size), NULL);
 		if(input == NULL){
 			fprintf(stderr, "Failed to allocate space for file contents\n");
-			exit_code = 1;
+			ret = APLWC_OTHER_FAILURE;
 			goto end;
 		}
 		if(FAILCASE(fread(input, 1, input_size, f), 0) < input_size){
 			fprintf(stderr, "Failed to read file contents\n");
-			exit_code = 1;
+			ret = APLWC_OTHER_FAILURE;
 			goto end;
 		}
 		fclose(f);
@@ -170,7 +180,6 @@ file_size:
 		ret = aplwc_load_module(aplwc, "Main", src, src_size);
 		if(ret){
 			fprintf(stderr, "Couldn't load Main module from file %s: %s\n", argv[optind], aplwc_errstr_rc(ret));
-			exit_code = 1;
 			goto end;
 		}
 		free(input);
@@ -199,7 +208,11 @@ file_size:
 			if(!aplwc_valid_line(&line)){
 line_error:
 				fprintf(stderr, "error on line %d: %s: %s\n", line_number, aplwc_errstr(aplwc), input);
-				continue;
+				if(aplwc_failsim_query(APLWC_FAILSIM_COUNT) > 0){
+					ret = aplwc_last_error(aplwc);
+					goto end;
+				}else
+					continue;
 			}
 			aplwc_eval(&line, &value);
 			if(!aplwc_valid_value(&value))
@@ -218,19 +231,23 @@ end:
 	if(aplwc)
 		aplwc_destroy(aplwc);
 
-	if(print_failsims){
-		f = fdopen(3, "w");
-		if(f == NULL){
-			fprintf(stderr, "Failed to open fd 3\n");
-			exit_code = 1;
-		}else{
-			fprintf(f, "%ld\n", aplwc_simulate_failure_count);
-			fclose(f);
+	failsim_count = aplwc_failsim_query(APLWC_FAILSIM_COUNT);
+	failsim_fails = aplwc_failsim_query(APLWC_FAILSIM_FAILS);
+	if(failsim_count > 0){
+		switch(ret){
+		case APLWC_OK:
+		case APLWC_OTHER_FAILURE:
+		case APLWC_OUT_OF_MEMORY:
+			break;
+		default:
+			return 97;
 		}
-	}
 
-	if((exit_code != 0) && aplwc_simulate_failure_at && (aplwc_simulate_failure_count >= aplwc_simulate_failure_at))
-		exit_code = 0;
+		if(failsim_count > failsim_fails)
+			return 98;
+		else
+			return 99;
+	}
 
-	return exit_code;
+	return (ret != APLWC_OK);
 }