[Fix] Link lpeg to rspamd lua library

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 19da2632dc796d35cdd39a0fbc30f582d5f3ba1e..219fdce41a7e41af9217d40487eeb50d905a8c2e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -486,6 +486,7 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/src"
                "${CMAKE_SOURCE_DIR}/contrib/librdns"
                "${CMAKE_SOURCE_DIR}/contrib/aho-corasick"
                "${CMAKE_SOURCE_DIR}/contrib/lc-btrie"
+               "${CMAKE_SOURCE_DIR}/contrib/lpeg"
                "${CMAKE_BINARY_DIR}/src" #Stored in the binary dir
                "${CMAKE_BINARY_DIR}/src/libcryptobox")
 

diff --git a/contrib/lpeg/lptree.c b/contrib/lpeg/lptree.c
index ac5f51503233b54b6cac91a4d82ea400e67846e9..bc82ae8da2ac78dc0bd1019324728233fbe284f2 100644 (file)
--- a/contrib/lpeg/lptree.c
+++ b/contrib/lpeg/lptree.c
@@ -21,7 +21,7 @@
 /* number of siblings for each tree */
 const byte numsiblings[] = {
   0, 0, 0,     /* char, set, any */
-  0, 0,                /* true, false */       
+  0, 0,                /* true, false */
   1,           /* rep */
   2, 2,                /* seq, choice */
   1, 1,                /* not, and */
@@ -1280,8 +1280,6 @@ static struct luaL_Reg metareg[] = {
   {NULL, NULL}
 };
 
-
-int luaopen_lpeg (lua_State *L);
 int luaopen_lpeg (lua_State *L) {
   luaL_newmetatable(L, PATTERN_T);
   lua_pushnumber(L, MAXBACK);  /* initialize maximum backtracking */

diff --git a/contrib/lpeg/lptree.h b/contrib/lpeg/lptree.h
index b69528a6f38726bf1c2622cf37660e521862e542..38a668e9ffab394ab09ef1ef602dffc9aaa1c9da 100644 (file)
--- a/contrib/lpeg/lptree.h
+++ b/contrib/lpeg/lptree.h
@@ -1,4 +1,4 @@
-/*  
+/*
 ** $Id: lptree.h,v 1.2 2013/03/24 13:51:12 roberto Exp $
 */
 
@@ -6,7 +6,7 @@
 #define lptree_h
 
 
-#include "lptypes.h" 
+#include "lptypes.h"
 
 
 /*
@@ -69,7 +69,7 @@ extern const byte numsiblings[];
 #define sib2(t)         ((t) + (t)->u.ps)
 
 
-
+int luaopen_lpeg (lua_State *L);
 
 
 

diff --git a/src/lua/lua_common.c b/src/lua/lua_common.c
index ad77b0602f35438dc81656195ff2910b381afca8..4c5051aeb915968ad2fffdb785dedf73b6cb7dc3 100644 (file)
--- a/src/lua/lua_common.c
+++ b/src/lua/lua_common.c
@@ -15,6 +15,7 @@
  */
 #include "lua_common.h"
 #include "lua/global_functions.lua.h"
+#include "lptree.h"
 
 /* Lua module init function */
 #define MODULE_INIT_FUNC "module_init"
@@ -242,6 +243,7 @@ rspamd_lua_init ()
        luaopen_fann (L);
        luaopen_sqlite3 (L);
        luaopen_cryptobox (L);
+       luaopen_lpeg (L);
 
        rspamd_lua_add_preload (L, "ucl", luaopen_ucl);