Make bc/dc not exit with -e and -f in B/DC_ENV_ARGS

This behavior was requested by my one user on NetBSD, and after checking
with Stefan Esser of FreeBSD, we decided that it wasn't a big enough
deal to not do. In fact, in my mind, it fixes a lot of problems with how
B/DC_ENV_ARGS interacts with scripts.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/args.c b/src/args.c
index b26062c6..9c26b7c1 100644
--- a/src/args.c
+++ b/src/args.c
@@ -89,7 +89,7 @@ static void bc_args_file(const char *file) {
 	free(buf);
 }
 
-void bc_args(int argc, char *argv[]) {
+void bc_args(int argc, char *argv[], bool exit_exprs) {
 
 	int c;
 	size_t i;
@@ -109,6 +109,7 @@ void bc_args(int argc, char *argv[]) {
 				if (vm.no_exit_exprs)
 					bc_vm_verr(BC_ERR_FATAL_OPTION, "-e (--expression)");
 				bc_args_exprs(opts.optarg);
+				vm.exit_exprs = (exit_exprs || vm.exit_exprs);
 				break;
 			}
 
@@ -119,6 +120,7 @@ void bc_args(int argc, char *argv[]) {
 					if (vm.no_exit_exprs)
 						bc_vm_verr(BC_ERR_FATAL_OPTION, "-f (--file)");
 					bc_args_file(opts.optarg);
+					vm.exit_exprs = (exit_exprs || vm.exit_exprs);
 				}
 				break;
 			}