From c76efd47edeab9fe1d80234f811c21561e2f8034 Mon Sep 17 00:00:00 2001 From: Holger Vogt Date: Sun, 19 Jun 2022 17:25:32 +0200 Subject: [PATCH] If the 'source' command fails, fall back to the input only if in interactive mode. Otherwise exit. --- src/frontend/inp.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/frontend/inp.c b/src/frontend/inp.c index 43e2dc5e5..0935b4c6c 100644 --- a/src/frontend/inp.c +++ b/src/frontend/inp.c @@ -1737,7 +1737,10 @@ com_source(wordlist *wl) #ifdef SHARED_MODULE controlled_exit(1); #else - cp_evloop(NULL); + if (cp_getvar("interactive", CP_BOOL, NULL, 0)) + cp_evloop(NULL); + else + controlled_exit(1); #endif } while (wl) { @@ -1752,7 +1755,10 @@ com_source(wordlist *wl) #ifdef SHARED_MODULE controlled_exit(1); #else - cp_evloop(NULL); + if (cp_getvar("interactive", CP_BOOL, NULL, 0)) + cp_evloop(NULL); + else + controlled_exit(1); #endif } while ((n = fread(buf, 1, BSIZE_SP, tp)) > 0) @@ -1774,7 +1780,10 @@ com_source(wordlist *wl) #ifdef SHARED_MODULE controlled_exit(1); #else - cp_evloop(NULL); + if (cp_getvar("interactive", CP_BOOL, NULL, 0)) + cp_evloop(NULL); + else + controlled_exit(1); #endif return; }