1998-08-21 03:17:42 +00:00
|
|
|
/*-
|
|
|
|
* Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
*/
|
2003-08-25 23:30:41 +00:00
|
|
|
|
|
|
|
#include <sys/cdefs.h>
|
|
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
|
1998-08-21 03:17:42 +00:00
|
|
|
/*
|
1998-09-01 00:41:24 +00:00
|
|
|
* Simple commandline interpreter, toplevel and misc.
|
1998-08-21 03:17:42 +00:00
|
|
|
*
|
1998-10-07 02:38:26 +00:00
|
|
|
* XXX may be obsoleted by BootFORTH or some other, better, interpreter.
|
1998-08-21 03:17:42 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stand.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include "bootstrap.h"
|
|
|
|
|
1998-12-22 11:41:51 +00:00
|
|
|
#ifdef BOOT_FORTH
|
|
|
|
#include "ficl.h"
|
1999-09-29 04:43:16 +00:00
|
|
|
#define RETURN(x) stackPushINT(bf_vm->pStack,!x); return(x)
|
1998-12-22 11:41:51 +00:00
|
|
|
|
|
|
|
extern FICL_VM *bf_vm;
|
|
|
|
#else
|
|
|
|
#define RETURN(x) return(x)
|
|
|
|
#endif
|
|
|
|
|
1998-08-21 03:17:42 +00:00
|
|
|
#define MAXARGS 20 /* maximum number of arguments allowed */
|
|
|
|
|
|
|
|
static void prompt(void);
|
|
|
|
|
2000-08-04 05:23:41 +00:00
|
|
|
#ifndef BOOT_FORTH
|
|
|
|
static int perform(int argc, char *argv[]);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Perform the command
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
perform(int argc, char *argv[])
|
|
|
|
{
|
|
|
|
int result;
|
|
|
|
struct bootblk_command **cmdp;
|
|
|
|
bootblk_cmd_t *cmd;
|
|
|
|
|
|
|
|
if (argc < 1)
|
|
|
|
return(CMD_OK);
|
|
|
|
|
|
|
|
/* set return defaults; a successful command will override these */
|
|
|
|
command_errmsg = command_errbuf;
|
|
|
|
strcpy(command_errbuf, "no error message");
|
|
|
|
cmd = NULL;
|
|
|
|
result = CMD_ERROR;
|
|
|
|
|
|
|
|
/* search the command set for the command */
|
|
|
|
SET_FOREACH(cmdp, Xcommand_set) {
|
|
|
|
if (((*cmdp)->c_name != NULL) && !strcmp(argv[0], (*cmdp)->c_name))
|
|
|
|
cmd = (*cmdp)->c_fn;
|
|
|
|
}
|
|
|
|
if (cmd != NULL) {
|
|
|
|
result = (cmd)(argc, argv);
|
|
|
|
} else {
|
|
|
|
command_errmsg = "unknown command";
|
|
|
|
}
|
|
|
|
RETURN(result);
|
|
|
|
}
|
|
|
|
#endif /* ! BOOT_FORTH */
|
|
|
|
|
1998-08-21 03:17:42 +00:00
|
|
|
/*
|
|
|
|
* Interactive mode
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
interact(void)
|
|
|
|
{
|
As reported in kern/118222, pxeboot in RELENG7 (and presumably
above) exhibits some misbehaviours on machines with AMD64 CPUs,
which at least in some cases I have tracked down to a heap overflow.
It is unclear whether it depends on the CPU or on the pxe bios
itself which may use more memory on AMD machines.
Noticeably a pxeboot compiled from 6.x sources works fine on all
machines I have tried so far, while a pxeboot compiled from 7.x
sources does not.
This patch is a first step in reducing the amount of memory used
while processing the configuration files read by the loader at boot
(some of them are quite large, 1700+ lines), and it does so by:
+ moving a buffer to static memory instead of allocating in the heap;
+ skipping empty lines;
+ reducing the amount of memory used for line descriptors;
Unfortunately there are several changes between 6.x and above,
affecting the compiler, the loader code itself, and libstand,
and it is not so straightforward to
These changes fix the behaviour on one motherboard with a
single-core AMD cpu, but are still not enough e.g on an Asus
M2N-VM (with a dual-core CPU).
I need to investigate the problem a bit more before figuring
out what should be committed to RELENG_7
PR: kern/118222
2008-11-20 14:57:09 +00:00
|
|
|
static char input[256]; /* big enough? */
|
1999-01-04 18:38:23 +00:00
|
|
|
#ifndef BOOT_FORTH
|
1998-08-21 03:17:42 +00:00
|
|
|
int argc;
|
|
|
|
char **argv;
|
1999-01-04 18:38:23 +00:00
|
|
|
#endif
|
1998-08-21 03:17:42 +00:00
|
|
|
|
1998-11-04 00:29:01 +00:00
|
|
|
#ifdef BOOT_FORTH
|
|
|
|
bf_init();
|
|
|
|
#endif
|
|
|
|
|
1998-09-03 02:10:09 +00:00
|
|
|
/*
|
|
|
|
* Read our default configuration
|
|
|
|
*/
|
1999-01-22 23:50:14 +00:00
|
|
|
if(include("/boot/loader.rc")!=CMD_OK)
|
|
|
|
include("/boot/boot.conf");
|
1998-09-03 02:10:09 +00:00
|
|
|
printf("\n");
|
|
|
|
/*
|
1998-10-07 02:38:26 +00:00
|
|
|
* Before interacting, we might want to autoboot.
|
1998-09-03 02:10:09 +00:00
|
|
|
*/
|
1998-10-07 02:38:26 +00:00
|
|
|
autoboot_maybe();
|
|
|
|
|
1998-09-03 02:10:09 +00:00
|
|
|
/*
|
|
|
|
* Not autobooting, go manual
|
|
|
|
*/
|
|
|
|
printf("\nType '?' for a list of commands, 'help' for more detailed help.\n");
|
1999-04-20 12:07:03 +00:00
|
|
|
if (getenv("prompt") == NULL)
|
1999-11-27 21:44:47 +00:00
|
|
|
setenv("prompt", "${interpret}", 1);
|
1999-11-01 08:05:22 +00:00
|
|
|
if (getenv("interpret") == NULL)
|
2001-11-19 17:30:26 +00:00
|
|
|
setenv("interpret", "OK", 1);
|
1998-09-03 02:10:09 +00:00
|
|
|
|
|
|
|
|
1998-08-21 03:17:42 +00:00
|
|
|
for (;;) {
|
|
|
|
input[0] = '\0';
|
|
|
|
prompt();
|
|
|
|
ngets(input, sizeof(input));
|
1998-11-04 00:29:01 +00:00
|
|
|
#ifdef BOOT_FORTH
|
2000-06-14 19:37:00 +00:00
|
|
|
bf_vm->sourceID.i = 0;
|
1998-11-04 00:29:01 +00:00
|
|
|
bf_run(input);
|
|
|
|
#else
|
1998-09-01 00:41:24 +00:00
|
|
|
if (!parse(&argc, &argv, input)) {
|
|
|
|
if (perform(argc, argv))
|
1998-08-21 03:17:42 +00:00
|
|
|
printf("%s: %s\n", argv[0], command_errmsg);
|
1998-09-01 00:41:24 +00:00
|
|
|
free(argv);
|
|
|
|
} else {
|
|
|
|
printf("parse error\n");
|
|
|
|
}
|
1998-11-04 00:29:01 +00:00
|
|
|
#endif
|
1998-08-21 03:17:42 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
1998-10-07 02:38:26 +00:00
|
|
|
* Read commands from a file, then execute them.
|
|
|
|
*
|
|
|
|
* We store the commands in memory and close the source file so that the media
|
|
|
|
* holding it can safely go away while we are executing.
|
|
|
|
*
|
|
|
|
* Commands may be prefixed with '@' (so they aren't displayed) or '-' (so
|
|
|
|
* that the script won't stop if they fail).
|
1998-08-21 03:17:42 +00:00
|
|
|
*/
|
1999-01-22 23:50:14 +00:00
|
|
|
COMMAND_SET(include, "include", "read commands from a file", command_include);
|
1998-08-21 03:17:42 +00:00
|
|
|
|
|
|
|
static int
|
1999-01-22 23:50:14 +00:00
|
|
|
command_include(int argc, char *argv[])
|
1998-08-21 03:17:42 +00:00
|
|
|
{
|
|
|
|
int i;
|
1999-01-15 00:31:45 +00:00
|
|
|
int res;
|
1999-02-22 13:12:37 +00:00
|
|
|
char **argvbuf;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Since argv is static, we need to save it here.
|
|
|
|
*/
|
2000-08-03 09:14:02 +00:00
|
|
|
argvbuf = (char**) calloc((u_int)argc, sizeof(char*));
|
1999-02-22 13:12:37 +00:00
|
|
|
for (i = 0; i < argc; i++)
|
|
|
|
argvbuf[i] = strdup(argv[i]);
|
1998-08-21 03:17:42 +00:00
|
|
|
|
1999-01-15 00:31:45 +00:00
|
|
|
res=CMD_OK;
|
|
|
|
for (i = 1; (i < argc) && (res == CMD_OK); i++)
|
1999-02-22 13:12:37 +00:00
|
|
|
res = include(argvbuf[i]);
|
|
|
|
|
|
|
|
for (i = 0; i < argc; i++)
|
|
|
|
free(argvbuf[i]);
|
|
|
|
free(argvbuf);
|
|
|
|
|
1999-01-15 00:31:45 +00:00
|
|
|
return(res);
|
1998-08-21 03:17:42 +00:00
|
|
|
}
|
|
|
|
|
As reported in kern/118222, pxeboot in RELENG7 (and presumably
above) exhibits some misbehaviours on machines with AMD64 CPUs,
which at least in some cases I have tracked down to a heap overflow.
It is unclear whether it depends on the CPU or on the pxe bios
itself which may use more memory on AMD machines.
Noticeably a pxeboot compiled from 6.x sources works fine on all
machines I have tried so far, while a pxeboot compiled from 7.x
sources does not.
This patch is a first step in reducing the amount of memory used
while processing the configuration files read by the loader at boot
(some of them are quite large, 1700+ lines), and it does so by:
+ moving a buffer to static memory instead of allocating in the heap;
+ skipping empty lines;
+ reducing the amount of memory used for line descriptors;
Unfortunately there are several changes between 6.x and above,
affecting the compiler, the loader code itself, and libstand,
and it is not so straightforward to
These changes fix the behaviour on one motherboard with a
single-core AMD cpu, but are still not enough e.g on an Asus
M2N-VM (with a dual-core CPU).
I need to investigate the problem a bit more before figuring
out what should be committed to RELENG_7
PR: kern/118222
2008-11-20 14:57:09 +00:00
|
|
|
/*
|
|
|
|
* Header prepended to each line. The text immediately follows the header.
|
|
|
|
* We try to make this short in order to save memory -- the loader has
|
|
|
|
* limited memory available, and some of the forth files are very long.
|
|
|
|
*/
|
1999-01-22 23:50:14 +00:00
|
|
|
struct includeline
|
1998-10-07 02:38:26 +00:00
|
|
|
{
|
As reported in kern/118222, pxeboot in RELENG7 (and presumably
above) exhibits some misbehaviours on machines with AMD64 CPUs,
which at least in some cases I have tracked down to a heap overflow.
It is unclear whether it depends on the CPU or on the pxe bios
itself which may use more memory on AMD machines.
Noticeably a pxeboot compiled from 6.x sources works fine on all
machines I have tried so far, while a pxeboot compiled from 7.x
sources does not.
This patch is a first step in reducing the amount of memory used
while processing the configuration files read by the loader at boot
(some of them are quite large, 1700+ lines), and it does so by:
+ moving a buffer to static memory instead of allocating in the heap;
+ skipping empty lines;
+ reducing the amount of memory used for line descriptors;
Unfortunately there are several changes between 6.x and above,
affecting the compiler, the loader code itself, and libstand,
and it is not so straightforward to
These changes fix the behaviour on one motherboard with a
single-core AMD cpu, but are still not enough e.g on an Asus
M2N-VM (with a dual-core CPU).
I need to investigate the problem a bit more before figuring
out what should be committed to RELENG_7
PR: kern/118222
2008-11-20 14:57:09 +00:00
|
|
|
struct includeline *next;
|
|
|
|
#ifndef BOOT_FORTH
|
1998-10-07 02:38:26 +00:00
|
|
|
int flags;
|
|
|
|
int line;
|
|
|
|
#define SL_QUIET (1<<0)
|
|
|
|
#define SL_IGNOREERR (1<<1)
|
As reported in kern/118222, pxeboot in RELENG7 (and presumably
above) exhibits some misbehaviours on machines with AMD64 CPUs,
which at least in some cases I have tracked down to a heap overflow.
It is unclear whether it depends on the CPU or on the pxe bios
itself which may use more memory on AMD machines.
Noticeably a pxeboot compiled from 6.x sources works fine on all
machines I have tried so far, while a pxeboot compiled from 7.x
sources does not.
This patch is a first step in reducing the amount of memory used
while processing the configuration files read by the loader at boot
(some of them are quite large, 1700+ lines), and it does so by:
+ moving a buffer to static memory instead of allocating in the heap;
+ skipping empty lines;
+ reducing the amount of memory used for line descriptors;
Unfortunately there are several changes between 6.x and above,
affecting the compiler, the loader code itself, and libstand,
and it is not so straightforward to
These changes fix the behaviour on one motherboard with a
single-core AMD cpu, but are still not enough e.g on an Asus
M2N-VM (with a dual-core CPU).
I need to investigate the problem a bit more before figuring
out what should be committed to RELENG_7
PR: kern/118222
2008-11-20 14:57:09 +00:00
|
|
|
#endif
|
|
|
|
char text[0];
|
1998-10-07 02:38:26 +00:00
|
|
|
};
|
|
|
|
|
1999-01-15 00:31:45 +00:00
|
|
|
int
|
2000-08-03 09:14:02 +00:00
|
|
|
include(const char *filename)
|
1998-08-21 03:17:42 +00:00
|
|
|
{
|
1999-01-22 23:50:14 +00:00
|
|
|
struct includeline *script, *se, *sp;
|
1998-10-07 02:38:26 +00:00
|
|
|
char input[256]; /* big enough? */
|
1999-02-04 17:06:46 +00:00
|
|
|
#ifdef BOOT_FORTH
|
|
|
|
int res;
|
|
|
|
char *cp;
|
2000-06-14 19:37:00 +00:00
|
|
|
int prevsrcid, fd, line;
|
1999-02-04 17:06:46 +00:00
|
|
|
#else
|
1999-01-15 00:31:45 +00:00
|
|
|
int argc,res;
|
1998-10-07 02:38:26 +00:00
|
|
|
char **argv, *cp;
|
|
|
|
int fd, flags, line;
|
1999-02-04 17:06:46 +00:00
|
|
|
#endif
|
1998-08-21 03:17:42 +00:00
|
|
|
|
|
|
|
if (((fd = open(filename, O_RDONLY)) == -1)) {
|
1999-01-15 00:31:45 +00:00
|
|
|
sprintf(command_errbuf,"can't open '%s': %s\n", filename, strerror(errno));
|
|
|
|
return(CMD_ERROR);
|
1998-10-07 02:38:26 +00:00
|
|
|
}
|
1998-08-21 03:17:42 +00:00
|
|
|
|
1998-10-07 02:38:26 +00:00
|
|
|
/*
|
|
|
|
* Read the script into memory.
|
|
|
|
*/
|
|
|
|
script = se = NULL;
|
|
|
|
line = 0;
|
|
|
|
|
1999-03-02 16:16:57 +00:00
|
|
|
while (fgetstr(input, sizeof(input), fd) >= 0) {
|
1998-10-07 02:38:26 +00:00
|
|
|
line++;
|
1999-02-04 17:06:46 +00:00
|
|
|
#ifdef BOOT_FORTH
|
|
|
|
cp = input;
|
|
|
|
#else
|
1998-10-07 02:38:26 +00:00
|
|
|
flags = 0;
|
|
|
|
/* Discard comments */
|
2000-09-10 13:48:51 +00:00
|
|
|
if (strncmp(input+strspn(input, " "), "\\ ", 2) == 0)
|
1998-10-07 02:38:26 +00:00
|
|
|
continue;
|
|
|
|
cp = input;
|
|
|
|
/* Echo? */
|
|
|
|
if (input[0] == '@') {
|
|
|
|
cp++;
|
|
|
|
flags |= SL_QUIET;
|
|
|
|
}
|
|
|
|
/* Error OK? */
|
|
|
|
if (input[0] == '-') {
|
|
|
|
cp++;
|
|
|
|
flags |= SL_IGNOREERR;
|
|
|
|
}
|
1999-02-04 17:06:46 +00:00
|
|
|
#endif
|
1998-10-07 02:38:26 +00:00
|
|
|
/* Allocate script line structure and copy line, flags */
|
As reported in kern/118222, pxeboot in RELENG7 (and presumably
above) exhibits some misbehaviours on machines with AMD64 CPUs,
which at least in some cases I have tracked down to a heap overflow.
It is unclear whether it depends on the CPU or on the pxe bios
itself which may use more memory on AMD machines.
Noticeably a pxeboot compiled from 6.x sources works fine on all
machines I have tried so far, while a pxeboot compiled from 7.x
sources does not.
This patch is a first step in reducing the amount of memory used
while processing the configuration files read by the loader at boot
(some of them are quite large, 1700+ lines), and it does so by:
+ moving a buffer to static memory instead of allocating in the heap;
+ skipping empty lines;
+ reducing the amount of memory used for line descriptors;
Unfortunately there are several changes between 6.x and above,
affecting the compiler, the loader code itself, and libstand,
and it is not so straightforward to
These changes fix the behaviour on one motherboard with a
single-core AMD cpu, but are still not enough e.g on an Asus
M2N-VM (with a dual-core CPU).
I need to investigate the problem a bit more before figuring
out what should be committed to RELENG_7
PR: kern/118222
2008-11-20 14:57:09 +00:00
|
|
|
if (*cp == '\0')
|
|
|
|
continue; /* ignore empty line, save memory */
|
1999-01-22 23:50:14 +00:00
|
|
|
sp = malloc(sizeof(struct includeline) + strlen(cp) + 1);
|
1998-10-09 07:09:22 +00:00
|
|
|
strcpy(sp->text, cp);
|
1999-02-04 17:06:46 +00:00
|
|
|
#ifndef BOOT_FORTH
|
1998-10-07 02:38:26 +00:00
|
|
|
sp->flags = flags;
|
|
|
|
sp->line = line;
|
As reported in kern/118222, pxeboot in RELENG7 (and presumably
above) exhibits some misbehaviours on machines with AMD64 CPUs,
which at least in some cases I have tracked down to a heap overflow.
It is unclear whether it depends on the CPU or on the pxe bios
itself which may use more memory on AMD machines.
Noticeably a pxeboot compiled from 6.x sources works fine on all
machines I have tried so far, while a pxeboot compiled from 7.x
sources does not.
This patch is a first step in reducing the amount of memory used
while processing the configuration files read by the loader at boot
(some of them are quite large, 1700+ lines), and it does so by:
+ moving a buffer to static memory instead of allocating in the heap;
+ skipping empty lines;
+ reducing the amount of memory used for line descriptors;
Unfortunately there are several changes between 6.x and above,
affecting the compiler, the loader code itself, and libstand,
and it is not so straightforward to
These changes fix the behaviour on one motherboard with a
single-core AMD cpu, but are still not enough e.g on an Asus
M2N-VM (with a dual-core CPU).
I need to investigate the problem a bit more before figuring
out what should be committed to RELENG_7
PR: kern/118222
2008-11-20 14:57:09 +00:00
|
|
|
#endif
|
1998-10-07 02:38:26 +00:00
|
|
|
sp->next = NULL;
|
|
|
|
|
|
|
|
if (script == NULL) {
|
|
|
|
script = sp;
|
|
|
|
} else {
|
|
|
|
se->next = sp;
|
|
|
|
}
|
|
|
|
se = sp;
|
|
|
|
}
|
|
|
|
close(fd);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Execute the script
|
|
|
|
*/
|
1999-02-04 17:06:46 +00:00
|
|
|
#ifndef BOOT_FORTH
|
1998-10-07 02:38:26 +00:00
|
|
|
argv = NULL;
|
2000-06-14 19:37:00 +00:00
|
|
|
#else
|
|
|
|
prevsrcid = bf_vm->sourceID.i;
|
|
|
|
bf_vm->sourceID.i = fd;
|
1999-02-04 17:06:46 +00:00
|
|
|
#endif
|
1999-01-15 00:31:45 +00:00
|
|
|
res = CMD_OK;
|
1998-10-07 02:38:26 +00:00
|
|
|
for (sp = script; sp != NULL; sp = sp->next) {
|
|
|
|
|
1999-02-04 17:06:46 +00:00
|
|
|
#ifdef BOOT_FORTH
|
|
|
|
res = bf_run(sp->text);
|
|
|
|
if (res != VM_OUTOFTEXT) {
|
1999-02-22 13:12:37 +00:00
|
|
|
sprintf(command_errbuf, "Error while including %s, in the line:\n%s", filename, sp->text);
|
1999-02-04 17:06:46 +00:00
|
|
|
res = CMD_ERROR;
|
|
|
|
break;
|
|
|
|
} else
|
|
|
|
res = CMD_OK;
|
|
|
|
#else
|
1998-10-07 02:38:26 +00:00
|
|
|
/* print if not being quiet */
|
|
|
|
if (!(sp->flags & SL_QUIET)) {
|
|
|
|
prompt();
|
|
|
|
printf("%s\n", sp->text);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Parse the command */
|
|
|
|
if (!parse(&argc, &argv, sp->text)) {
|
1998-10-09 07:09:22 +00:00
|
|
|
if ((argc > 0) && (perform(argc, argv) != 0)) {
|
1998-10-07 02:38:26 +00:00
|
|
|
/* normal command */
|
|
|
|
printf("%s: %s\n", argv[0], command_errmsg);
|
1999-01-15 00:31:45 +00:00
|
|
|
if (!(sp->flags & SL_IGNOREERR)) {
|
|
|
|
res=CMD_ERROR;
|
1998-10-07 02:38:26 +00:00
|
|
|
break;
|
1999-01-15 00:31:45 +00:00
|
|
|
}
|
1998-09-01 00:41:24 +00:00
|
|
|
}
|
1998-10-07 02:38:26 +00:00
|
|
|
free(argv);
|
|
|
|
argv = NULL;
|
|
|
|
} else {
|
|
|
|
printf("%s line %d: parse error\n", filename, sp->line);
|
1999-01-15 00:31:45 +00:00
|
|
|
res=CMD_ERROR;
|
1998-10-07 02:38:26 +00:00
|
|
|
break;
|
1998-08-21 03:17:42 +00:00
|
|
|
}
|
1999-02-04 17:06:46 +00:00
|
|
|
#endif
|
1998-10-07 02:38:26 +00:00
|
|
|
}
|
1999-02-04 17:06:46 +00:00
|
|
|
#ifndef BOOT_FORTH
|
1998-10-07 02:38:26 +00:00
|
|
|
if (argv != NULL)
|
|
|
|
free(argv);
|
2000-06-14 19:37:00 +00:00
|
|
|
#else
|
|
|
|
bf_vm->sourceID.i = prevsrcid;
|
1999-02-04 17:06:46 +00:00
|
|
|
#endif
|
1998-10-07 02:38:26 +00:00
|
|
|
while(script != NULL) {
|
|
|
|
se = script;
|
|
|
|
script = script->next;
|
|
|
|
free(se);
|
1998-08-21 03:17:42 +00:00
|
|
|
}
|
1999-01-15 00:31:45 +00:00
|
|
|
return(res);
|
1998-08-21 03:17:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
1998-09-03 02:10:09 +00:00
|
|
|
* Emit the current prompt; use the same syntax as the parser
|
|
|
|
* for embedding environment variables.
|
1998-08-21 03:17:42 +00:00
|
|
|
*/
|
|
|
|
static void
|
|
|
|
prompt(void)
|
|
|
|
{
|
1999-03-08 10:32:39 +00:00
|
|
|
char *pr, *p, *cp, *ev;
|
1998-08-21 03:17:42 +00:00
|
|
|
|
1998-09-03 02:10:09 +00:00
|
|
|
if ((cp = getenv("prompt")) == NULL)
|
|
|
|
cp = ">";
|
1999-03-08 10:32:39 +00:00
|
|
|
pr = p = strdup(cp);
|
1998-08-21 03:17:42 +00:00
|
|
|
|
|
|
|
while (*p != 0) {
|
1998-09-03 02:10:09 +00:00
|
|
|
if ((*p == '$') && (*(p+1) == '{')) {
|
|
|
|
for (cp = p + 2; (*cp != 0) && (*cp != '}'); cp++)
|
1998-08-21 03:17:42 +00:00
|
|
|
;
|
|
|
|
*cp = 0;
|
1998-09-03 02:10:09 +00:00
|
|
|
ev = getenv(p + 2);
|
1998-08-21 03:17:42 +00:00
|
|
|
|
1998-09-03 02:10:09 +00:00
|
|
|
if (ev != NULL)
|
2000-07-10 06:40:06 +00:00
|
|
|
printf("%s", ev);
|
1998-09-03 02:10:09 +00:00
|
|
|
p = cp + 1;
|
|
|
|
continue;
|
1998-08-21 03:17:42 +00:00
|
|
|
}
|
|
|
|
putchar(*p++);
|
|
|
|
}
|
|
|
|
putchar(' ');
|
1999-03-08 10:32:39 +00:00
|
|
|
free(pr);
|
1998-08-21 03:17:42 +00:00
|
|
|
}
|