Module Name: src
Committed By: martin
Date: Mon Dec 1 13:13:15 UTC 2014
Modified Files:
src/sys/modules/lua [netbsd-7]: lua.c
Log Message:
Pull up following revision(s) (requested by lneto in ticket #283):
sys/modules/lua/lua.c: revision 1.15
lua(4): fixed require
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.2.1 src/sys/modules/lua/lua.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/lua/lua.c
diff -u src/sys/modules/lua/lua.c:1.13 src/sys/modules/lua/lua.c:1.13.2.1
--- src/sys/modules/lua/lua.c:1.13 Fri Jul 25 08:10:40 2014
+++ src/sys/modules/lua/lua.c Mon Dec 1 13:13:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: lua.c,v 1.13 2014/07/25 08:10:40 dholland Exp $ */
+/* $NetBSD: lua.c,v 1.13.2.1 2014/12/01 13:13:15 martin Exp $ */
/*
* Copyright (c) 2014 by Lourival Vieira Neto <ln...@netbsd.org>.
@@ -367,7 +367,11 @@ luaioctl(dev_t dev, u_long cmd, void *da
m->mod_name,
s->lua_name);
klua_lock(s->K);
- m->open(s->K->L);
+ luaL_requiref(
+ s->K->L,
+ m->mod_name,
+ m->open,
+ 1);
klua_unlock(s->K);
m->refcount++;
LIST_INSERT_HEAD(
@@ -507,7 +511,8 @@ lua_require(lua_State *L)
device_printf(sc_self,
"require module %s\n",
md->mod_name);
- md->open(L);
+ luaL_requiref(L, md->mod_name, md->open, 0);
+
md->refcount++;
LIST_INSERT_HEAD(&s->lua_modules, md, mod_next);
return 1;
