From d742bdfc760eb62ac6600a6779e733c79db3a679 Mon Sep 17 00:00:00 2001
From: "Daniel C. Sobral" <dcs@FreeBSD.org>
Date: Mon, 12 Jun 2000 16:45:01 +0000
Subject: [PATCH] The word environment? returns a flag indicating whether the
 variable was found or not. Fix it's usage. Alas, it caused no problem before,
 besides leaving garbage in the stack, because refill, used by [if] [else]
 [then], was broken.

---
 sys/boot/forth/loader.4th | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/sys/boot/forth/loader.4th b/sys/boot/forth/loader.4th
index 8d5f6702817..e9369df3f4a 100644
--- a/sys/boot/forth/loader.4th
+++ b/sys/boot/forth/loader.4th
@@ -24,13 +24,29 @@
 \
 \ $FreeBSD$
 
-s" arch-alpha" environment? [if]
-s" loader_version" environment? 3 < abort" Loader version 0.3+ required"
-[then]
+s" arch-alpha" environment? [if] [if]
+	s" loader_version" environment?  [if]
+		3 < [if]
+			.( Loader version 0.3+ required) cr
+			abort
+		[then]
+	[else]
+		.( Could not get loader version!) cr
+		abort
+	[then]
+[then] [then]
 
-s" arch-i386" environment? [if]
-s" loader_version" environment? 8 < abort" Loader version 0.8+ required"
-[then]
+s" arch-i386" environment? [if] [if]
+	s" loader_version" environment?  [if]
+		8 < [if]
+			.( Loader version 0.8+ required) cr
+			abort
+		[then]
+	[else]
+		.( Could not get loader version!) cr
+		abort
+	[then]
+[then] [then]
 
 include /boot/support.4th