D43902.id134411.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D43902.id134411.diff
View Options

	diff --git a/stand/common/interp_lua.c b/stand/common/interp_lua.c
	--- a/stand/common/interp_lua.c
	+++ b/stand/common/interp_lua.c
	@@ -97,6 +97,31 @@
	{NULL, NULL}
	};

	+static void
	+interp_init_md(lua_State *L)
	+{
	+ luaL_requiref(L, "gfx", luaopen_gfx, 1);
	+ lua_pop(L, 1); /* Remove lib */
	+
	+ /*
	+ * Add in the comparability references in the loader table. Doing it with
	+ * a pseudo-embedded script is easier than the raw calls.
	+ */
	+ if (luaL_dostring(L,
	+ "loader.fb_bezier = gfx.fb_bezier\n"
	+ "loader.fb_drawrect = gfx.fb_drawrect\n"
	+ "loader.fb_line = gfx.fb_line\n"
	+ "loader.fb_putimage = gfx.fb_putimage\n"
	+ "loader.fb_setpixel = gfx.fb_setpixel\n"
	+ "loader.term_drawrect = gfx.term_drawrect\n"
	+ "loader.term_putimage = gfx.term_putimage") != 0) {
	+ lua_pop(L, 1);
	+ const char *errstr = lua_tostring(L, -1);
	+ errstr = errstr == NULL ? "unknown" : errstr;
	+ printf("Error adding compat loader bindings: %s.\n", errstr);
	+ }
	+}
	+
	void
	interp_init(void)
	{
	@@ -123,6 +148,8 @@
	lua_pop(luap, 1); /* remove lib */
	}

	+ interp_init_md(luap);
	+
	filename = getenv("loader_lua");
	if (filename == NULL)
	filename = LOADER_LUA;
	diff --git a/stand/liblua/lutils.c b/stand/liblua/lutils.c
	--- a/stand/liblua/lutils.c
	+++ b/stand/liblua/lutils.c
	@@ -439,7 +439,6 @@
	luaopen_loader(lua_State *L)
	{
	luaL_newlib(L, loaderlib);
	- luaopen_gfx(L);
	/* Add loader.machine and loader.machine_arch properties */
	lua_pushstring(L, MACHINE);
	lua_setfield(L, -2, "machine");