Apply Pi-hole Lua patches
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
parent
08a8a11a51
commit
866ca4b657
|
@ -48,9 +48,9 @@ index 454ce12f..a363925c 100644
|
|||
+ ftl_lua_init(L);
|
||||
+ /***************************************************/
|
||||
+
|
||||
if (!runargs(L, argv, script)) /* execute arguments -e and -l */
|
||||
if (!runargs(L, argv, optlim)) /* execute arguments -e and -l */
|
||||
return 0; /* something failed */
|
||||
if (script < argc && /* execute main script (if there is one) */
|
||||
if (script > 0) { /* execute main script (if there is one) */
|
||||
@@ -616,7 +622,9 @@ static int pmain (lua_State *L) {
|
||||
}
|
||||
|
||||
|
|
|
@ -50,6 +50,9 @@ static const luaL_Reg loadedlibs[] = {
|
|||
{LUA_MATHLIBNAME, luaopen_math},
|
||||
{LUA_UTF8LIBNAME, luaopen_utf8},
|
||||
{LUA_DBLIBNAME, luaopen_debug},
|
||||
/****** Pi-hole modification ******/
|
||||
{LUA_PIHOLELIBNAME, luaopen_pihole},
|
||||
/**********************************/
|
||||
{NULL, NULL}
|
||||
};
|
||||
|
||||
|
|
|
@ -20,6 +20,10 @@
|
|||
#include "lauxlib.h"
|
||||
#include "lualib.h"
|
||||
|
||||
/** Pi-hole modification **/
|
||||
#include "ftl_lua.h"
|
||||
/**************************/
|
||||
|
||||
|
||||
#if !defined(LUA_PROGNAME)
|
||||
#define LUA_PROGNAME "lua"
|
||||
|
@ -211,7 +215,9 @@ static int dostring (lua_State *L, const char *s, const char *name) {
|
|||
/*
|
||||
** Receives 'globname[=modname]' and runs 'globname = require(modname)'.
|
||||
*/
|
||||
static int dolibrary (lua_State *L, char *globname) {
|
||||
/************** Pi-hole modification ***************/
|
||||
int dolibrary (lua_State *L, char *globname) {
|
||||
/***************************************************/
|
||||
int status;
|
||||
char *modname = strchr(globname, '=');
|
||||
if (modname == NULL) /* no explicit name? */
|
||||
|
@ -639,6 +645,12 @@ static int pmain (lua_State *L) {
|
|||
if (handle_luainit(L) != LUA_OK) /* run LUA_INIT */
|
||||
return 0; /* error running LUA_INIT */
|
||||
}
|
||||
|
||||
/************** Pi-hole modification ***************/
|
||||
// Load and enable libraries bundled with Pi-hole
|
||||
ftl_lua_init(L);
|
||||
/***************************************************/
|
||||
|
||||
if (!runargs(L, argv, optlim)) /* execute arguments -e and -l */
|
||||
return 0; /* something failed */
|
||||
if (script > 0) { /* execute main script (if there is one) */
|
||||
|
@ -659,7 +671,9 @@ static int pmain (lua_State *L) {
|
|||
}
|
||||
|
||||
|
||||
int main (int argc, char **argv) {
|
||||
/******* Pi-hole modification ********/
|
||||
int lua_main (int argc, char **argv) {
|
||||
/*************************************/
|
||||
int status, result;
|
||||
lua_State *L = luaL_newstate(); /* create state */
|
||||
if (L == NULL) {
|
||||
|
|
|
@ -193,7 +193,9 @@ static int pmain(lua_State* L)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int main(int argc, char* argv[])
|
||||
/******* Pi-hole modification ********/
|
||||
int luac_main(int argc, char* argv[])
|
||||
/*************************************/
|
||||
{
|
||||
lua_State* L;
|
||||
int i=doargs(argc,argv);
|
||||
|
|
|
@ -44,6 +44,10 @@ LUAMOD_API int (luaopen_debug) (lua_State *L);
|
|||
#define LUA_LOADLIBNAME "package"
|
||||
LUAMOD_API int (luaopen_package) (lua_State *L);
|
||||
|
||||
/************ Pi-hole modification *************/
|
||||
#define LUA_PIHOLELIBNAME "pihole"
|
||||
LUAMOD_API int (luaopen_pihole) (lua_State *L);
|
||||
/***********************************************/
|
||||
|
||||
/* open all previous libraries */
|
||||
LUALIB_API void (luaL_openlibs) (lua_State *L);
|
||||
|
|
Loading…
Reference in New Issue