d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OK, fload/fexec work properly when both compiling and interpreting

Browse Source 
now.  Gack.
This commit is contained in:
Jordan K. Hubbard 1998-11-07 01:56:06 +00:00
parent eda1fa0957
commit 65e7b066b3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=40982
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/boot/ficl/words.c
View File

@ -4030,19 +4030,18 @@ static void forget(FICL_VM *pVM)
#define nLINEBUF 256
static void fload(FICL_VM *pVM)
{
FICL_STRING *pFilename;
char cp[nLINEBUF];
char cp[nLINEBUF], *p;
int i, fd, nLine = 0;
char ch;
CELL id;
pFilename->count = stackPopINT32(pVM->pStack);
bcopy(stackPopPtr(pVM->pStack), &pFilename->text, sizeof(char *));
fd = open(pFilename->text, O_RDONLY);
(void)stackPopINT32(pVM->pStack); /* don't need count value */
p = stackPopPtr(pVM->pStack);
fd = open(p, O_RDONLY);
if (fd == -1)
{
vmTextOut(pVM, "fload: Unable to open file: ", 0);
vmTextOut(pVM, pFilename->text, 1);
vmTextOut(pVM, p, 1);
vmThrow(pVM, VM_QUIT);
}
@ -4067,7 +4066,7 @@ static void fload(FICL_VM *pVM)
{
pVM->sourceID = id;
close(fd);
vmThrowErr(pVM, "fload: Error in file %s, line %d", pFilename->text, nLine);
vmThrowErr(pVM, "fload: Error in file %s, line %d", p, nLine);
break;
}
}
@ -4086,12 +4085,11 @@ static void fload(FICL_VM *pVM)
static void fexists(FICL_VM *pVM)
{
char *p;
FICL_STRING *pFilename;
int fd;
pFilename->count = stackPopINT32(pVM->pStack);
bcopy(stackPopPtr(pVM->pStack), &pFilename->text, sizeof(char *));
fd = open(pFilename->text, O_RDONLY);
(void)stackPopINT32(pVM->pStack); /* don't need count value */
p = stackPopPtr(pVM->pStack);
fd = open(p, O_RDONLY);
if (fd > 0) {
stackPushINT32(pVM->pStack, TRUE);
close(fd);