From e681dd3e2c1221fcf81cc8bc36a70decc50d9ebb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20E=C3=9Fer?= <se@FreeBSD.org>
Date: Wed, 12 May 2021 07:22:37 +0200
Subject: [PATCH] Revert "Vendor import of Gavin D. Howard's bc version 4.0.2"

The update had been performed on a check-out of the vendor branch,
but the final push lacked the target designation vendor/bc.
---
 contrib/bc/NEWS.md           | 9 ---------
 contrib/bc/include/history.h | 1 -
 contrib/bc/include/version.h | 2 +-
 contrib/bc/src/history.c     | 5 +----
 contrib/bc/src/vm.c          | 2 --
 contrib/bc/tests/other.sh    | 5 +++--
 6 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/contrib/bc/NEWS.md b/contrib/bc/NEWS.md
index c78bddd27e76..c66e7b164c8a 100644
--- a/contrib/bc/NEWS.md
+++ b/contrib/bc/NEWS.md
@@ -1,14 +1,5 @@
 # News
 
-## 4.0.2
-
-This is a production release that fixes two bugs:
-
-1.	If no files are used and the first statement on `stdin` is invalid, `scale`
-	would not be set to `20` even if `-l` was used.
-2.	When using history, `bc` failed to respond properly to `SIGSTOP` and
-	`SIGTSTP`.
-
 ## 4.0.1
 
 This is a production release that only adds one thing: flushing output when it
diff --git a/contrib/bc/include/history.h b/contrib/bc/include/history.h
index 444a2a107ac5..469785a118a9 100644
--- a/contrib/bc/include/history.h
+++ b/contrib/bc/include/history.h
@@ -165,7 +165,6 @@ typedef enum BcHistoryAction {
 	BC_ACTION_ENTER = 13,
 	BC_ACTION_CTRL_N = 14,
 	BC_ACTION_CTRL_P = 16,
-	BC_ACTION_CTRL_S = 19,
 	BC_ACTION_CTRL_T = 20,
 	BC_ACTION_CTRL_U = 21,
 	BC_ACTION_CTRL_W = 23,
diff --git a/contrib/bc/include/version.h b/contrib/bc/include/version.h
index 42eb3a11d2c0..ab4823bd7c2a 100644
--- a/contrib/bc/include/version.h
+++ b/contrib/bc/include/version.h
@@ -36,6 +36,6 @@
 #ifndef BC_VERSION_H
 #define BC_VERSION_H
 
-#define VERSION 4.0.2
+#define VERSION 4.0.1
 
 #endif // BC_VERSION_H
diff --git a/contrib/bc/src/history.c b/contrib/bc/src/history.c
index 317d9193036c..c0d54fe35234 100644
--- a/contrib/bc/src/history.c
+++ b/contrib/bc/src/history.c
@@ -1281,11 +1281,8 @@ static BcStatus bc_history_edit(BcHistory *h, const char *prompt) {
 
 			default:
 			{
-				if (c >= BC_ACTION_CTRL_A && c <= BC_ACTION_CTRL_Z) {
+				if (c >= BC_ACTION_CTRL_A && c <= BC_ACTION_CTRL_Z)
 					bc_history_printCtrl(h, c);
-					if (c == BC_ACTION_CTRL_Z) raise(SIGTSTP);
-					if (c == BC_ACTION_CTRL_S) raise(SIGSTOP);
-				}
 				else bc_history_edit_insert(h, cbuf, nread);
 				break;
 			}
diff --git a/contrib/bc/src/vm.c b/contrib/bc/src/vm.c
index d01c8fd6860f..e7ee8d35ba54 100644
--- a/contrib/bc/src/vm.c
+++ b/contrib/bc/src/vm.c
@@ -835,8 +835,6 @@ static void bc_vm_exec(void) {
 #if BC_ENABLE_EXTRA_MATH
 		if (!BC_IS_POSIX) bc_vm_load(bc_lib2_name, bc_lib2);
 #endif // BC_ENABLE_EXTRA_MATH
-
-		bc_program_exec(&vm.prog);
 	}
 #endif // BC_ENABLED
 
diff --git a/contrib/bc/tests/other.sh b/contrib/bc/tests/other.sh
index e13891fcad89..d2ef4f6d0694 100755
--- a/contrib/bc/tests/other.sh
+++ b/contrib/bc/tests/other.sh
@@ -138,7 +138,7 @@ else
 
 	set +e
 
-	printf 'three\n' | cut -c1-3 > /dev/null
+	printf 'three\n' | head -c3 > /dev/null
 	err=$?
 
 	if [ "$err" -eq 0 ]; then
@@ -156,7 +156,8 @@ else
 
 		printf '4 April 2021\n' > "$easter_res"
 
-		"$testdir/dc/scripts/easter.sh" "$exe" 2021 | cut -c1-12 > "$easter_out"
+		"$testdir/dc/scripts/easter.sh" "$exe" 2021 | head -c12 > "$easter_out"
+		printf '\n' >> "$easter_out"
 		err="$?"
 
 		checktest "$d" "$err" "Easter script" "$easter_res" "$easter_out"