Index: projects/lua-bootloader/sys/boot/common/interp.c =================================================================== --- projects/lua-bootloader/sys/boot/common/interp.c (revision 280994) +++ projects/lua-bootloader/sys/boot/common/interp.c (revision 280995) @@ -1,195 +1,196 @@ /*- * Copyright (c) 1998 Michael Smith + * Copyright (c) 2011 Wojciech A. Koszek * 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. */ #include __FBSDID("$FreeBSD$"); /* * Simple commandline interpreter, toplevel and misc. * * XXX may be obsoleted by BootFORTH or some other, better, interpreter. */ #include #include #include "bootstrap.h" #include "interp.h" #define MAXARGS 20 /* maximum number of arguments allowed */ struct interp *interp = #if defined(BOOT_LUA) &boot_interp_lua; #elif defined(BOOT_FORTH) &boot_interp_forth; #else &boot_interp_simple; #endif int default_load_config(void *ctx) { if (INTERP_INCL(interp, "/boot/loader.rc") != CMD_OK) return INTERP_INCL(interp, "/boot/boot.conf"); return CMD_OK; } /* * Interactive mode */ void interact(const char * rc) { static char input[256]; /* big enough? */ INTERP_INIT(interp); /* * Read our default configuration */ INTERP_LOAD_DEF_CONFIG(interp); printf("\n"); /* * Before interacting, we might want to autoboot. */ autoboot_maybe(); /* * Not autobooting, go manual */ printf("\nType '?' for a list of commands, 'help' for more detailed help.\n"); if (getenv("prompt") == NULL) setenv("prompt", "${interpret}", 1); if (getenv("interpret") == NULL) setenv("interpret", "OK", 1); for (;;) { input[0] = '\0'; prompt(); ngets(input, sizeof(input)); INTERP_RUN(interp, input); } } /* * 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). */ COMMAND_SET(include, "include", "read commands from a file", command_include); static int command_include(int argc, char *argv[]) { int i; int res; char **argvbuf; /* * Since argv is static, we need to save it here. */ argvbuf = (char**) calloc((u_int)argc, sizeof(char*)); for (i = 0; i < argc; i++) argvbuf[i] = strdup(argv[i]); res=CMD_OK; for (i = 1; (i < argc) && (res == CMD_OK); i++) res = INTERP_INCL(interp, argvbuf[i]); for (i = 0; i < argc; i++) free(argvbuf[i]); free(argvbuf); return(res); } /* * 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; } /* * Emit the current prompt; use the same syntax as the parser * for embedding environment variables. */ void prompt(void) { char *pr, *p, *cp, *ev; if ((cp = getenv("prompt")) == NULL) cp = ">"; pr = p = strdup(cp); while (*p != 0) { if ((*p == '$') && (*(p+1) == '{')) { for (cp = p + 2; (*cp != 0) && (*cp != '}'); cp++) ; *cp = 0; ev = getenv(p + 2); if (ev != NULL) printf("%s", ev); p = cp + 1; continue; } putchar(*p++); } putchar(' '); free(pr); } Index: projects/lua-bootloader/sys/boot/common/interp.h =================================================================== --- projects/lua-bootloader/sys/boot/common/interp.h (revision 280994) +++ projects/lua-bootloader/sys/boot/common/interp.h (revision 280995) @@ -1,86 +1,87 @@ /*- + * Copyright (c) 2011 Wojciech A. Koszek * Copyright (c) 2014 Pedro Souza * 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. * * $FreeBSD$ */ typedef void interp_init_t(void *ctx); typedef int interp_run_t(void *ctx, const char *input); typedef int interp_incl_t(void *ctx, const char *filename); typedef int interp_load_def_t(void *ctx); // load default configuration files struct interp { interp_init_t *init; interp_run_t *run; interp_incl_t *incl; interp_load_def_t *load_configs; void *context; }; #define INTERP_INIT(i) do { \ if (((i) != NULL) && ((i)->init != NULL)) { \ ((i)->init((i)->context)); \ } \ } while (0) #define INTERP_RUN(i, input) \ ((i)->run(((i)->context), input)) #define INTERP_INCL(i, filename) \ ((i)->incl(((i)->context), filename)) #define INTERP_LOAD_DEF_CONFIG(i) \ ((i)->load_configs(((i)->context))) extern struct interp boot_interp_simple; extern struct interp boot_interp_forth; extern struct interp boot_interp_lua; extern struct interp *interp; int perform(int argc, char *argv[]); void prompt(void); /* * Default config loader for interp_simple & intep_forth * Use it if your interpreter does not use a custom config * file. * * Calls interp->include with 'loader.rc' or 'boot.conf' */ int default_load_config(void *ctx); -struct includeline +struct includeline { struct includeline *next; int flags; int line; #define SL_QUIET (1<<0) #define SL_IGNOREERR (1<<1) char text[0]; -}; \ No newline at end of file +}; Index: projects/lua-bootloader/sys/boot/common/interp_lua.c =================================================================== --- projects/lua-bootloader/sys/boot/common/interp_lua.c (revision 280994) +++ projects/lua-bootloader/sys/boot/common/interp_lua.c (revision 280995) @@ -1,144 +1,145 @@ /*- + * Copyright (c) 2011 Wojciech A. Koszek * Copyright (c) 2014 Pedro Souza * 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. */ #include __FBSDID("$FreeBSD$"); #include #include "bootstrap.h" #include "interp.h" #define lua_c #include #include #include #include #include struct interp_lua_softc { lua_State *luap; }; static struct interp_lua_softc lua_softc; #ifdef LUA_DEBUG #define LDBG(...) do { \ printf("%s(%d): ", __func__, __LINE__); \ printf(__VA_ARGS__); \ printf("\n"); \ } while (0) #else #define LDBG(...) #endif void interp_lua_init(void *ctx) { lua_State *luap; struct bootblk_command **cmdp; struct interp_lua_softc *softc; struct env_var *ev; const char *name_str, *val_str; char buf[16]; softc = ctx; LDBG("creating context"); luap = lua_create(); if (luap == NULL) { printf("problem initializing the Lua interpreter\n"); abort(); } softc->luap = luap; register_utils(luap); luaopen_base(luap); luaL_requiref(luap, LUA_STRLIBNAME, luaopen_string, 1); lua_pop(luap, 1); } int interp_lua_run(void *data, const char *line) { lua_State *luap; struct interp_lua_softc *softc; int argc, ret; char **argv; char loader_line[128]; int status; int len; softc = data; luap = softc->luap; LDBG("executing line..."); if ((status = ldo_string(luap, line, strlen(line))) != 0) { /* * If we could not parse the line as Lua syntax, * try parsing it as a loader command. */ len = snprintf(loader_line, sizeof(loader_line), "loader.perform(\"%s\")", line); if (len > 0) status = ldo_string(luap, loader_line, len); } if (status != 0) printf("Failed to parse \'%s\'\n", line); return (0); } int interp_lua_incl(void *ctx, const char *filename) { struct interp_lua_softc *softc; softc = ctx; LDBG("loading file %s", filename); return (ldo_file(softc->luap, filename)); } /* * To avoid conflicts, this lua interpreter uses loader.lua instead of * loader.rc/boot.conf to load its configurations. */ int interp_lua_load_config(void *ctx) { LDBG("loading config"); return (interp_lua_incl(ctx, "/boot/loader.lua")); } struct interp boot_interp_lua = { .init = interp_lua_init, .run = interp_lua_run, .incl = interp_lua_incl, .load_configs = interp_lua_load_config, .context = &lua_softc }; Index: projects/lua-bootloader/sys/boot/common/interp_simple.c =================================================================== --- projects/lua-bootloader/sys/boot/common/interp_simple.c (revision 280994) +++ projects/lua-bootloader/sys/boot/common/interp_simple.c (revision 280995) @@ -1,182 +1,183 @@ /*- + * Copyright (c) 2011 Wojciech A. Koszek * Copyright (c) 2014 Pedro Souza * 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. * */ #include __FBSDID("$FreeBSD$"); #include #include #include "bootstrap.h" #include "interp.h" struct interp_simple_softc { int dummy; }; void interp_simple_init(void *ctx) { (void)ctx; /* Silent the compiler */ } int interp_simple_run(void *ctx, const char *input) { struct interp_simple_softc *softc; int argc; char **argv; softc = ctx; (void)softc; /* Currently unused */ if (!parse(&argc, &argv, input)) { if (perform(argc, argv)) printf("%s: %s\n", argv[0], command_errmsg); free(argv); } else { printf("parse error\n"); } return 0; } int interp_simple_incl(void *ctx, const char *filename) { struct includeline *script, *se, *sp; char input[256]; /* big enough? */ int argc,res; char **argv, *cp; int fd, flags, line; (void)ctx; /* Silent the compiler */ if (((fd = open(filename, O_RDONLY)) == -1)) { sprintf(command_errbuf,"can't open '%s': %s\n", filename, strerror(errno)); return(CMD_ERROR); } /* * Read the script into memory. */ script = se = NULL; line = 0; while (fgetstr(input, sizeof(input), fd) >= 0) { line++; flags = 0; /* Discard comments */ if (strncmp(input+strspn(input, " "), "\\ ", 2) == 0) continue; cp = input; /* Echo? */ if (input[0] == '@') { cp++; flags |= SL_QUIET; } /* Error OK? */ if (input[0] == '-') { cp++; flags |= SL_IGNOREERR; } /* Allocate script line structure and copy line, flags */ if (*cp == '\0') continue; /* ignore empty line, save memory */ sp = malloc(sizeof(struct includeline) + strlen(cp) + 1); /* On malloc failure (it happens!), free as much as possible and exit */ if (sp == NULL) { while (script != NULL) { se = script; script = script->next; free(se); } sprintf(command_errbuf, "file '%s' line %d: memory allocation " "failure - aborting\n", filename, line); return (CMD_ERROR); } strcpy(sp->text, cp); sp->flags = flags; sp->line = line; sp->next = NULL; if (script == NULL) { script = sp; } else { se->next = sp; } se = sp; } close(fd); /* * Execute the script */ argv = NULL; res = CMD_OK; for (sp = script; sp != NULL; sp = sp->next) { /* 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)) { if ((argc > 0) && (perform(argc, argv) != 0)) { /* normal command */ printf("%s: %s\n", argv[0], command_errmsg); if (!(sp->flags & SL_IGNOREERR)) { res=CMD_ERROR; break; } } free(argv); argv = NULL; } else { printf("%s line %d: parse error\n", filename, sp->line); res=CMD_ERROR; break; } } if (argv != NULL) free(argv); while(script != NULL) { se = script; script = script->next; free(se); } return(res); } struct interp boot_interp_simple = { .init = interp_simple_init, .run = interp_simple_run, .incl = interp_simple_incl, .load_configs = default_load_config, .context = NULL };