Index: head/stand/common/interp_lua.c =================================================================== --- head/stand/common/interp_lua.c (revision 329655) +++ head/stand/common/interp_lua.c (revision 329656) @@ -1,187 +1,190 @@ /*- * 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" #define lua_c #include "lstd.h" #include #include #include #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 static void * interp_lua_realloc(void *ud __unused, void *ptr, size_t osize __unused, size_t nsize) { if (nsize == 0) { free(ptr); return NULL; } return realloc(ptr, nsize); } /* * The libraries commented out below either lack the proper * support from libsa, or they are unlikely to be useful * in the bootloader, so have been commented out. */ static const luaL_Reg loadedlibs[] = { {"_G", luaopen_base}, {LUA_LOADLIBNAME, luaopen_package}, // {LUA_COLIBNAME, luaopen_coroutine}, // {LUA_TABLIBNAME, luaopen_table}, {LUA_STRLIBNAME, luaopen_string}, // {LUA_IOLIBNAME, luaopen_io}, // {LUA_OSLIBNAME, luaopen_os}, // {LUA_MATHLIBNAME, luaopen_math}, // {LUA_UTF8LIBNAME, luaopen_utf8}, // {LUA_DBLIBNAME, luaopen_debug}, + {"errno", luaopen_errno}, {"io", luaopen_io}, {"lfs", luaopen_lfs}, {"loader", luaopen_loader}, {NULL, NULL} }; void interp_init(void) { lua_State *luap; struct interp_lua_softc *softc = &lua_softc; const char *filename; const luaL_Reg *lib; setenv("script.lang", "lua", 1); LDBG("creating context"); luap = lua_newstate(interp_lua_realloc, NULL); if (luap == NULL) { printf("problem initializing the Lua interpreter\n"); abort(); } softc->luap = luap; /* "require" functions from 'loadedlibs' and set results to global table */ for (lib = loadedlibs; lib->func; lib++) { luaL_requiref(luap, lib->name, lib->func, 1); lua_pop(luap, 1); /* remove lib */ } filename = "/boot/lua/loader.lua"; if (interp_include(filename) != 0) { const char *errstr = lua_tostring(luap, -1); errstr = errstr == NULL ? "unknown" : errstr; printf("Startup errorr in %s:\nLUA ERROR: %s.\n", filename, errstr); lua_pop(luap, 1); } } int interp_run(const char *line) { int argc, nargc; char **argv; lua_State *luap; struct interp_lua_softc *softc = &lua_softc; int status; luap = softc->luap; LDBG("executing line..."); if ((status = luaL_dostring(luap, line)) != 0) { lua_pop(luap, 1); /* * The line wasn't executable as lua; run it through parse to * to get consistent parsing of command line arguments, then * run it through cli_execute. If that fails, then we'll try it * as a builtin. */ if (parse(&argc, &argv, line) == 0) { lua_getglobal(luap, "cli_execute"); for (nargc = 0; nargc < argc; ++nargc) { lua_pushstring(luap, argv[nargc]); } status = lua_pcall(luap, argc, 1, 0); lua_pop(luap, 1); if (status != 0) { /* * Lua cli_execute will pass the function back * through loader.command, which is a proxy to * interp_builtin_cmd. If we failed to interpret * the command, though, then there's a chance * that didn't happen. Call interp_builtin_cmd * directly if our lua_pcall was not successful. */ status = interp_builtin_cmd(argc, argv); } if (status != 0) { printf("Command failed\n"); status = CMD_ERROR; } free(argv); } else { printf("Failed to parse \'%s\'\n", line); status = CMD_ERROR; } } return (status == 0 ? CMD_OK : CMD_ERROR); } int interp_include(const char *filename) { struct interp_lua_softc *softc = &lua_softc; LDBG("loading file %s", filename); return (luaL_dofile(softc->luap, filename)); } Index: head/stand/liblua/Makefile =================================================================== --- head/stand/liblua/Makefile (revision 329655) +++ head/stand/liblua/Makefile (revision 329656) @@ -1,38 +1,38 @@ # $FreeBSD$ .include .PATH: ${LUASRC} .PATH: ${LIBLUASRC} LIB= lua INTERNALLIB= # Core Lua. SRCS= lapi.c lcode.c lctype.c ldebug.c ldo.c ldump.c lfunc.c lgc.c llex.c \ lmem.c lobject.c lopcodes.c lparser.c lstate.c lstring.c ltable.c \ ltm.c lundump.c lvm.c lzio.c SRCS+= lauxlib.c lbaselib.c lstrlib.c loadlib.c # These aren't yet included, but link now, omitting them saves 15k #SRCS+= lcorolib.c ldblib.c lutf8lib.c # These aren't yet compatible with the boot environment, and some may never be #SRCS+= lbitlib.c liolib.c lmathlib.c loslib.c ltablib.c # Our utilities. -SRCS+= lfs.c lstd.c lutils.c +SRCS+= lerrno.c lfs.c lstd.c lutils.c WARNS= 3 CFLAGS+= -DLUA_FLOAT_TYPE=LUA_FLOAT_INT64 CFLAGS+= -DLUA_PATH_DEFAULT=\"/boot/lua/\?.lua\" CFLAGS+= -ffreestanding -nostdlib -DBOOT_LUA -DLUA_USE_POSIX CFLAGS+= -fno-stack-protector -D__BSD_VISIBLE CFLAGS+= -I${BOOTSRC}/include -I${LIBLUASRC} -I${LUASRC} -I${LDRSRC} .if ${MACHINE_CPUARCH} == "amd64" && ${DO32:U0} == 0 CFLAGS+= -fPIC .endif .include Index: head/stand/liblua/lerrno.c =================================================================== --- head/stand/liblua/lerrno.c (nonexistent) +++ head/stand/liblua/lerrno.c (revision 329656) @@ -0,0 +1,180 @@ +/*- + * Copyright (c) 2018 Conrad Meyer + * 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$"); + +#define _WANT_KERNEL_ERRNO 1 +#include + +#include +#include "lauxlib.h" +#include "lerrno.h" + +#ifndef nitems +#define nitems(x) (sizeof((x)) / sizeof((x)[0])) +#endif + +/* + * Populated with: + * $ egrep "^#define.E" sys/sys/errno.h | \ + * awk '{ print "\tENTRY(" $2 ")," }' >> lerrno.c + */ +#define ENTRY(name) { #name, name } +static const struct err_name_number { + const char *err_name; + int err_num; +} errnoconstants[] = { + ENTRY(EPERM), + ENTRY(ENOENT), + ENTRY(ESRCH), + ENTRY(EINTR), + ENTRY(EIO), + ENTRY(ENXIO), + ENTRY(E2BIG), + ENTRY(ENOEXEC), + ENTRY(EBADF), + ENTRY(ECHILD), + ENTRY(EDEADLK), + ENTRY(ENOMEM), + ENTRY(EACCES), + ENTRY(EFAULT), + ENTRY(ENOTBLK), + ENTRY(EBUSY), + ENTRY(EEXIST), + ENTRY(EXDEV), + ENTRY(ENODEV), + ENTRY(ENOTDIR), + ENTRY(EISDIR), + ENTRY(EINVAL), + ENTRY(ENFILE), + ENTRY(EMFILE), + ENTRY(ENOTTY), + ENTRY(ETXTBSY), + ENTRY(EFBIG), + ENTRY(ENOSPC), + ENTRY(ESPIPE), + ENTRY(EROFS), + ENTRY(EMLINK), + ENTRY(EPIPE), + ENTRY(EDOM), + ENTRY(ERANGE), + ENTRY(EAGAIN), + ENTRY(EWOULDBLOCK), + ENTRY(EINPROGRESS), + ENTRY(EALREADY), + ENTRY(ENOTSOCK), + ENTRY(EDESTADDRREQ), + ENTRY(EMSGSIZE), + ENTRY(EPROTOTYPE), + ENTRY(ENOPROTOOPT), + ENTRY(EPROTONOSUPPORT), + ENTRY(ESOCKTNOSUPPORT), + ENTRY(EOPNOTSUPP), + ENTRY(ENOTSUP), + ENTRY(EPFNOSUPPORT), + ENTRY(EAFNOSUPPORT), + ENTRY(EADDRINUSE), + ENTRY(EADDRNOTAVAIL), + ENTRY(ENETDOWN), + ENTRY(ENETUNREACH), + ENTRY(ENETRESET), + ENTRY(ECONNABORTED), + ENTRY(ECONNRESET), + ENTRY(ENOBUFS), + ENTRY(EISCONN), + ENTRY(ENOTCONN), + ENTRY(ESHUTDOWN), + ENTRY(ETOOMANYREFS), + ENTRY(ETIMEDOUT), + ENTRY(ECONNREFUSED), + ENTRY(ELOOP), + ENTRY(ENAMETOOLONG), + ENTRY(EHOSTDOWN), + ENTRY(EHOSTUNREACH), + ENTRY(ENOTEMPTY), + ENTRY(EPROCLIM), + ENTRY(EUSERS), + ENTRY(EDQUOT), + ENTRY(ESTALE), + ENTRY(EREMOTE), + ENTRY(EBADRPC), + ENTRY(ERPCMISMATCH), + ENTRY(EPROGUNAVAIL), + ENTRY(EPROGMISMATCH), + ENTRY(EPROCUNAVAIL), + ENTRY(ENOLCK), + ENTRY(ENOSYS), + ENTRY(EFTYPE), + ENTRY(EAUTH), + ENTRY(ENEEDAUTH), + ENTRY(EIDRM), + ENTRY(ENOMSG), + ENTRY(EOVERFLOW), + ENTRY(ECANCELED), + ENTRY(EILSEQ), + ENTRY(ENOATTR), + ENTRY(EDOOFUS), + ENTRY(EBADMSG), + ENTRY(EMULTIHOP), + ENTRY(ENOLINK), + ENTRY(EPROTO), + ENTRY(ENOTCAPABLE), + ENTRY(ECAPMODE), + ENTRY(ENOTRECOVERABLE), + ENTRY(EOWNERDEAD), + ENTRY(ELAST), + ENTRY(ERESTART), + ENTRY(EJUSTRETURN), + ENTRY(ENOIOCTL), + ENTRY(EDIRIOCTL), + ENTRY(ERELOOKUP), +}; +#undef ENTRY + +static void +lerrno_register(lua_State *L) +{ + size_t i; + + for (i = 0; i < nitems(errnoconstants); i++) { + lua_pushinteger(L, errnoconstants[i].err_num); + lua_setfield(L, -2, errnoconstants[i].err_name); + } +} + +static const struct luaL_Reg errnolib[] = { + /* Extra bogus entry required by luaL_newlib API */ + { NULL, NULL }, +}; + +int +luaopen_errno(lua_State *L) +{ + luaL_newlib(L, errnolib); + lerrno_register(L); + return 1; +} Property changes on: head/stand/liblua/lerrno.c ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/stand/liblua/lerrno.h =================================================================== --- head/stand/liblua/lerrno.h (nonexistent) +++ head/stand/liblua/lerrno.h (revision 329656) @@ -0,0 +1,33 @@ +/*- + * Copyright (c) 2018 Conrad Meyer + * 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$ + */ + +#pragma once + +#include + +int luaopen_errno(lua_State *L); Property changes on: head/stand/liblua/lerrno.h ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property