--- src/sys/boot/ficl/loader.c	2005/02/20 16:31:53	1.5
+++ src/sys/boot/ficl/loader.c	2008/03/29 23:31:07	1.6
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/boot/ficl/loader.c,v 1.9 2003/06/08 03:11:16 nyan Exp $
+ * $FreeBSD: src/sys/boot/ficl/loader.c,v 1.12 2006/05/12 04:07:42 jhb Exp $
  * $DragonFly$
  */
 
@@ -57,11 +57,13 @@
  * 		.#	    ( value -- )
  */
 
-#ifndef TESTMAIN
 void
 ficlSetenv(FICL_VM *pVM)
 {
-	char	*namep, *valuep, *name, *value;
+#ifndef TESTMAIN
+	char	*name, *value;
+#endif
+	char	*namep, *valuep;
 	int	names, values;
 
 #if FICL_ROBUST > 1
@@ -72,6 +74,7 @@ ficlSetenv(FICL_VM *pVM)
 	values = stackPopINT(pVM->pStack);
 	valuep = (char*) stackPopPtr(pVM->pStack);
 
+#ifndef TESTMAIN
 	name = (char*) ficlMalloc(names+1);
 	if (!name)
 		vmThrowErr(pVM, "Error: out of memory");
@@ -86,6 +89,7 @@ ficlSetenv(FICL_VM *pVM)
 	setenv(name, value, 1);
 	ficlFree(name);
 	ficlFree(value);
+#endif
 
 	return;
 }
@@ -93,7 +97,10 @@ ficlSetenv(FICL_VM *pVM)
 void
 ficlSetenvq(FICL_VM *pVM)
 {
-	char	*namep, *valuep, *name, *value;
+#ifndef TESTMAIN
+	char	*name, *value;
+#endif
+	char	*namep, *valuep;
 	int	names, values, overwrite;
 
 #if FICL_ROBUST > 1
@@ -105,6 +112,7 @@ ficlSetenvq(FICL_VM *pVM)
 	values = stackPopINT(pVM->pStack);
 	valuep = (char*) stackPopPtr(pVM->pStack);
 
+#ifndef TESTMAIN
 	name = (char*) ficlMalloc(names+1);
 	if (!name)
 		vmThrowErr(pVM, "Error: out of memory");
@@ -119,6 +127,7 @@ ficlSetenvq(FICL_VM *pVM)
 	setenv(name, value, overwrite);
 	ficlFree(name);
 	ficlFree(value);
+#endif
 
 	return;
 }
@@ -126,7 +135,10 @@ ficlSetenvq(FICL_VM *pVM)
 void
 ficlGetenv(FICL_VM *pVM)
 {
-	char	*namep, *name, *value;
+#ifndef TESTMAIN
+	char	*name;
+#endif
+	char	*namep, *value;
 	int	names;
 
 #if FICL_ROBUST > 1
@@ -135,6 +147,7 @@ ficlGetenv(FICL_VM *pVM)
 	names = stackPopINT(pVM->pStack);
 	namep = (char*) stackPopPtr(pVM->pStack);
 
+#ifndef TESTMAIN
 	name = (char*) ficlMalloc(names+1);
 	if (!name)
 		vmThrowErr(pVM, "Error: out of memory");
@@ -148,6 +161,7 @@ ficlGetenv(FICL_VM *pVM)
 		stackPushPtr(pVM->pStack, value);
 		stackPushINT(pVM->pStack, strlen(value));
 	} else
+#endif
 		stackPushINT(pVM->pStack, -1);
 
 	return;
@@ -156,7 +170,10 @@ ficlGetenv(FICL_VM *pVM)
 void
 ficlUnsetenv(FICL_VM *pVM)
 {
-	char	*namep, *name;
+#ifndef TESTMAIN
+	char	*name;
+#endif
+	char	*namep;
 	int	names;
 
 #if FICL_ROBUST > 1
@@ -165,6 +182,7 @@ ficlUnsetenv(FICL_VM *pVM)
 	names = stackPopINT(pVM->pStack);
 	namep = (char*) stackPopPtr(pVM->pStack);
 
+#ifndef TESTMAIN
 	name = (char*) ficlMalloc(names+1);
 	if (!name)
 		vmThrowErr(pVM, "Error: out of memory");
@@ -173,6 +191,7 @@ ficlUnsetenv(FICL_VM *pVM)
 
 	unsetenv(name);
 	ficlFree(name);
+#endif
 
 	return;
 }
@@ -192,7 +211,9 @@ ficlCopyin(FICL_VM *pVM)
 	dest = stackPopINT(pVM->pStack);
 	src = stackPopPtr(pVM->pStack);
 
+#ifndef TESTMAIN
 	archsw.arch_copyin(src, dest, len);
+#endif
 
 	return;
 }
@@ -212,7 +233,9 @@ ficlCopyout(FICL_VM *pVM)
 	dest = stackPopPtr(pVM->pStack);
 	src = stackPopINT(pVM->pStack);
 
+#ifndef TESTMAIN
 	archsw.arch_copyout(src, dest, len);
+#endif
 
 	return;
 }
@@ -220,7 +243,10 @@ ficlCopyout(FICL_VM *pVM)
 void
 ficlFindfile(FICL_VM *pVM)
 {
-	char	*name, *type, *namep, *typep;
+#ifndef TESTMAIN
+	char	*name;
+#endif
+	char	*type, *namep, *typep;
 	struct	preloaded_file* fp;
 	int	names, types;
 
@@ -232,6 +258,7 @@ ficlFindfile(FICL_VM *pVM)
 	typep = (char*) stackPopPtr(pVM->pStack);
 	names = stackPopINT(pVM->pStack);
 	namep = (char*) stackPopPtr(pVM->pStack);
+#ifndef TESTMAIN
 	name = (char*) ficlMalloc(names+1);
 	if (!name)
 		vmThrowErr(pVM, "Error: out of memory");
@@ -244,11 +271,15 @@ ficlFindfile(FICL_VM *pVM)
 	type[types] = '\0';
 
 	fp = file_findfile(name, type);
+#else
+	fp = NULL;
+#endif
 	stackPushPtr(pVM->pStack, fp);
 
 	return;
 }
 
+#ifndef TESTMAIN
 #ifdef HAVE_PNP
 
 void
@@ -638,11 +669,6 @@ void ficlCompilePlatform(FICL_SYSTEM *pS
     dictAppendWord(dp, "dictthreshold", ficlDictThreshold, FW_DEFAULT);
     dictAppendWord(dp, "dictincrease", ficlDictIncrease, FW_DEFAULT);
 
-#ifndef TESTMAIN
-#ifdef __i386__
-    dictAppendWord(dp, "outb",      ficlOutb,       FW_DEFAULT);
-    dictAppendWord(dp, "inb",       ficlInb,        FW_DEFAULT);
-#endif
     dictAppendWord(dp, "setenv",    ficlSetenv,	    FW_DEFAULT);
     dictAppendWord(dp, "setenv?",   ficlSetenvq,    FW_DEFAULT);
     dictAppendWord(dp, "getenv",    ficlGetenv,	    FW_DEFAULT);
@@ -650,11 +676,16 @@ void ficlCompilePlatform(FICL_SYSTEM *pS
     dictAppendWord(dp, "copyin",    ficlCopyin,	    FW_DEFAULT);
     dictAppendWord(dp, "copyout",   ficlCopyout,    FW_DEFAULT);
     dictAppendWord(dp, "findfile",  ficlFindfile,   FW_DEFAULT);
+    dictAppendWord(dp, "ccall",	    ficlCcall,	    FW_DEFAULT);
+#ifndef TESTMAIN
+#ifdef __i386__
+    dictAppendWord(dp, "outb",      ficlOutb,       FW_DEFAULT);
+    dictAppendWord(dp, "inb",       ficlInb,        FW_DEFAULT);
+#endif
 #ifdef HAVE_PNP
     dictAppendWord(dp, "pnpdevices",ficlPnpdevices, FW_DEFAULT);
     dictAppendWord(dp, "pnphandlers",ficlPnphandlers, FW_DEFAULT);
 #endif
-    dictAppendWord(dp, "ccall",	    ficlCcall,	    FW_DEFAULT);
 #endif
 
 #if defined(__i386__)