elua lib: add elua_state_setup_modules + use

1 files changed, 27 insertions, 2 deletions

diff --git a/src/lib/elua/elua.c b/src/lib/elua/elua.c
index 3bda98b30f..c124b20afc 100644
--- a/src/lib/elua/elua.c
+++ b/src/lib/elua/elua.c
@@ -295,9 +295,9 @@ elua_state_setup_i18n(const Elua_State *es)
    EINA_SAFETY_ON_NULL_RETURN_VAL(es, EINA_FALSE);
    EINA_SAFETY_ON_NULL_RETURN_VAL(es->luastate, EINA_FALSE);
    EINA_SAFETY_ON_NULL_RETURN_VAL(es->coredir, EINA_FALSE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(es->progname, EINA_FALSE);
    snprintf(buf, sizeof(buf), "%s/gettext.lua", es->coredir);
-   if (elua_report_error(es, elua_state_prog_name_get(es),
-       elua_io_loadfile(es, buf)))
+   if (elua_report_error(es, es->progname, elua_io_loadfile(es, buf)))
      return EINA_FALSE;
    lua_createtable(es->luastate, 0, 0);
    luaL_register(es->luastate, NULL, gettextlib);
@@ -311,6 +311,31 @@ elua_state_setup_i18n(const Elua_State *es)
    return EINA_TRUE;
 }
 
+const luaL_reg _elua_cutillib[] =
+{
+   { "init_module", elua_module_init },
+   { "popenv"     , elua_io_popen    },
+   { NULL         , NULL             }
+};
+
+EAPI Eina_Bool
+elua_state_setup_modules(const Elua_State *es)
+{
+   char buf[PATH_MAX];
+   EINA_SAFETY_ON_NULL_RETURN_VAL(es, EINA_FALSE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(es->luastate, EINA_FALSE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(es->coredir, EINA_FALSE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(es->progname, EINA_FALSE);
+   snprintf(buf, sizeof(buf), "%s/module.lua", es->coredir);
+   if (elua_report_error(es, es->progname, elua_io_loadfile(es, buf)))
+     return EINA_FALSE;
+   lua_pushcfunction(es->luastate, elua_module_system_init);
+   lua_createtable(es->luastate, 0, 0);
+   luaL_register(es->luastate, NULL, _elua_cutillib);
+   lua_call(es->luastate, 2, 0);
+   return EINA_TRUE;
+}
+
 EAPI int
 elua_module_init(lua_State *L)
 {