summaryrefslogtreecommitdiffstats
path: root/sys/boot
diff options
context:
space:
mode:
authordcs <dcs@FreeBSD.org>1999-02-04 13:28:56 +0000
committerdcs <dcs@FreeBSD.org>1999-02-04 13:28:56 +0000
commit90242e08222eedf2b53c73b41ebd92b68f4eabb0 (patch)
tree950b0b0dd40f061f3042eb5f02a86b779da0b97d /sys/boot
parent0fa743a353ae10db92e82a0497183f42a3def11b (diff)
downloadFreeBSD-src-90242e08222eedf2b53c73b41ebd92b68f4eabb0.zip
FreeBSD-src-90242e08222eedf2b53c73b41ebd92b68f4eabb0.tar.gz
Fix ficlExecFD to take kern/9412 changes into account. Also modify it
not to vmThrow errors. This is not what the comments say it does, and it doesn't work when there is no ficlExec environment (like it's only use in sys/boot/common/interp_forth.c). PR: bin/9772
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/ficl/ficl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/boot/ficl/ficl.c b/sys/boot/ficl/ficl.c
index e90aee2..fab56f6 100644
--- a/sys/boot/ficl/ficl.c
+++ b/sys/boot/ficl/ficl.c
@@ -373,11 +373,11 @@ int ficlExecFD(FICL_VM *pVM, int fd)
break;
continue;
}
- if ((rval = ficlExec(pVM, cp, i)) >= VM_ERREXIT)
+ rval = ficlExec(pVM, cp, i);
+ if(rval != VM_QUIT && rval != VM_USEREXIT && rval != VM_OUTOFTEXT)
{
pVM->sourceID = id;
- vmThrowErr(pVM, "ficlExecFD: Error at line %d", nLine);
- break;
+ return rval;
}
}
/*
OpenPOWER on IntegriCloud