WIP: Lua interpreter in augtool

.travis.yml

@@ -4,6 +4,7 @@ addons:
     packages:
       - libxml2-dev
       - libreadline-dev
+      - liblua5.2-dev
       - valgrind
 install:
   - ./autogen.sh

configure.ac

@@ -65,6 +65,7 @@ if test x"$enable_debug" = x"yes"; then
 fi
 
 dnl Version info in libtool's notation
+AC_SUBST([LIBAUGLUA_VERSION_INFO], [0:0:0])
 AC_SUBST([LIBAUGEAS_VERSION_INFO], [20:0:20])
 AC_SUBST([LIBFA_VERSION_INFO], [5:1:4])
 
@@ -110,12 +111,39 @@ gl_INIT
 PKG_PROG_PKG_CONFIG
 PKG_CHECK_MODULES([LIBXML], [libxml-2.0])
 
+LUA_SUBDIRS=
+LUA_MAKEFILES=
+m4_foreach_w([LUAPKG], [lua5.1 lua5.2 lua5.3 lua], [
+  AC_MSG_CHECKING([for LUAPKG])
+  PKG_CHECK_EXISTS(LUAPKG, [
+    AC_MSG_RESULT([yes])
+    LIBLUA_CFLAGS=$($PKG_CONFIG --cflags LUAPKG)
+    LIBLUA_LIBS=$($PKG_CONFIG --libs LUAPKG)
+    LUA_SUBDIRS="$LUA_SUBDIRS LUAPKG"
+
+    LUA_SUBDIR=src/LUAPKG
+    AS_MKDIR_P([$LUA_SUBDIR])
+
+    LUA_MAKEFILE=$LUA_SUBDIR/Makefile
+    ln -fs ../Makefile.luamod $LUA_MAKEFILE.am
+    eval $AUTOMAKE $LUA_MAKEFILE
+    LUA_MAKEFILES="$LUA_MAKEFILES $LUA_MAKEFILE"
+  ], [AC_MSG_RESULT([no])])
+])
+if test -z "$LIBLUA_LIBS"; then
+  AC_MSG_ERROR([no Lua libraries found])
+fi
+AC_SUBST([LIBLUA_CFLAGS])
+AC_SUBST([LIBLUA_LIBS])
+AC_SUBST([LUA_SUBDIRS])
+
 AC_CHECK_FUNCS([strerror_r fsync])
 
 AC_OUTPUT(Makefile \
           gnulib/lib/Makefile \
           gnulib/tests/Makefile \
           src/Makefile \
+	  $LUA_MAKEFILES \
           man/Makefile \
           tests/Makefile \
           examples/Makefile \

src/Makefile.am

@@ -1,7 +1,9 @@
+SUBDIRS = . $(LUA_SUBDIRS)
+
 GNULIB= ../gnulib/lib/libgnu.la
 GNULIB_CFLAGS= -I $(top_builddir)/gnulib/lib -I $(top_srcdir)/gnulib/lib
 
-AM_CFLAGS = @AUGEAS_CFLAGS@ @WARN_CFLAGS@ $(GNULIB_CFLAGS) $(LIBXML_CFLAGS)
+AM_CFLAGS = @AUGEAS_CFLAGS@ @WARN_CFLAGS@ $(GNULIB_CFLAGS) $(LIBXML_CFLAGS) $(LIBLUA_CFLAGS)
 
 AM_YFLAGS=-d -p spec_
 
@@ -11,7 +13,7 @@ BUILT_SOURCES = datadir.h
 
 DISTCLEANFILES = datadir.h
 
-lib_LTLIBRARIES = libfa.la libaugeas.la
+lib_LTLIBRARIES = libfa.la libaugeas.la libauglua.la
 noinst_LTLIBRARIES = liblexer.la
 
 bin_PROGRAMS = augtool augparse
@@ -26,9 +28,11 @@ libaugeas_la_SOURCES = augeas.h augeas.c augrun.c pathx.c \
     info.c info.h errcode.c errcode.h jmt.h jmt.c
 
 if USE_VERSION_SCRIPT
+  AUGLUA_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/auglua_sym.version
   AUGEAS_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/augeas_sym.version
   FA_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/fa_sym.version
 else
+  AUGLUA_VERSION_SCRIPT =
   AUGEAS_VERSION_SCRIPT =
   FA_VERSION_SCRIPT =
 endif
@@ -37,11 +41,16 @@ libaugeas_la_LDFLAGS = $(AUGEAS_VERSION_SCRIPT) \
     -version-info $(LIBAUGEAS_VERSION_INFO)
 libaugeas_la_LIBADD = liblexer.la libfa.la $(LIB_SELINUX) $(LIBXML_LIBS) $(GNULIB)
 
+libauglua_la_LDFLAGS = $(AUGLUA_VERSION_SCRIPT) \
+    -version-info $(LIBAUGLUA_VERSION_INFO)
+libauglua_la_SOURCES = augeas.h auglua.c auglua.h internal.h luamod.c luamod.h
+libauglua_la_LIBADD = libaugeas.la $(LIBLUA_LIBS)
+
 augtool_SOURCES = augtool.c
-augtool_LDADD = libaugeas.la $(READLINE_LIBS) $(LIBXML_LIBS) $(GNULIB)
+augtool_LDADD = libaugeas.la libauglua.la $(READLINE_LIBS) $(GNULIB)
 
 augparse_SOURCES = augparse.c
-augparse_LDADD = libaugeas.la $(LIBXML_LIBS) $(GNULIB)
+augparse_LDADD = libaugeas.la $(LIBXML_LIBS) $(LIBLUA_LIBS) $(GNULIB)
 
 libfa_la_SOURCES = fa.c fa.h hash.c hash.h memory.c memory.h ref.h ref.c
 libfa_la_LIBADD = $(LIB_SELINUX) $(GNULIB)

src/Makefile.luamod

@@ -0,0 +1,13 @@
+# Copyright (C) 2016 Kaarle Ritvanen
+
+AUTOMAKE_OPTIONS = subdir-objects
+
+LUA_PACKAGE = $(notdir $(CURDIR))
+
+luadir = $(libdir)/lua/$(shell $(PKG_CONFIG) --variable=V $(LUA_PACKAGE))
+lua_LTLIBRARIES = augeas.la
+
+augeas_la_SOURCES = ../augeas.h ../luamod.c ../luamod.h
+augeas_la_CFLAGS = $(AM_CFLAGS) $(LIBXML_CFLAGS) $(shell $(PKG_CONFIG) --cflags $(LUA_PACKAGE))
+augeas_la_LIBADD = ../libaugeas.la
+augeas_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version -module -shared

src/auglua.c

@@ -0,0 +1,139 @@
+/*
+ * auglua.c: lua integration for augtool
+ *
+ * Copyright (C) 2015 Raphaël Pinson
+ * Copyright (C) 2016 Kaarle Ritvanen
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ *
+ * Author: Raphaël Pinson <[email protected]>
+ */
+
+#include <config.h>
+#include "internal.h"
+#include "augeas.h"
+#include "luamod.h"
+#include "auglua.h"
+#include <lua.h>
+#include <lualib.h>
+#include <lauxlib.h>
+#include <stdbool.h>
+
+
+#define REG_KEY_MODULE "augeas-module"
+#define REG_KEY_INSTANCE "augeas-instance"
+
+static void push_reg_value(lua_State *L, const char *key) {
+    lua_pushstring(L, key);
+    lua_gettable(L, LUA_REGISTRYINDEX);
+}
+
+static int call_function(lua_State *L, const char *name) {
+    push_reg_value(L, REG_KEY_MODULE);
+    lua_pushstring(L, name);
+    lua_gettable(L, -2);
+    lua_insert(L, 1);
+
+    push_reg_value(L, REG_KEY_INSTANCE);
+    lua_insert(L, 2);
+
+    lua_call(L, lua_gettop(L) - 1, LUA_MULTRET);
+    return lua_gettop(L);
+}
+
+static int call_bound_function(lua_State *L) {
+    int vals = call_function(L, lua_tostring(L, lua_upvalueindex(1)));
+    if (lua_isnil(L, 1) && lua_isstring(L, 2)) {
+        lua_pushvalue(L, 2);
+        lua_error(L);
+    }
+    return vals;
+}
+
+static int bind_function(lua_State *L) {
+    lua_pushcclosure(L, call_bound_function, 1);
+    return 1;
+}
+
+static int lua_aug_save(lua_State *L) {
+    int n;
+
+    call_function(L, "save");
+
+    if (lua_isnil(L, 1)) {
+        lua_pushstring(L, "saving failed (run 'errors' for details)");
+        lua_error(L);
+    } else {
+        lua_settop(L, 0);
+        lua_pushliteral(L, "/augeas/events/saved");
+        call_function(L, "match");
+
+        if (!lua_isnil(L, 1)) {
+            n = (int) lua_tointeger(L, 2);
+            if (n > 0)
+                printf("Saved %d file(s)\n", n);
+        }
+    }
+
+    return 0;
+}
+
+struct lua_State *setup_lua(augeas *a) {
+    lua_State *L = luaL_newstate();
+    luaL_openlibs(L);
+
+    lua_pushliteral(L, REG_KEY_MODULE);
+    luaopen_augeas(L);
+    lua_settable(L, LUA_REGISTRYINDEX);
+
+    lua_pushliteral(L, REG_KEY_INSTANCE);
+    luamod_push_augeas(L, a);
+    lua_settable(L, LUA_REGISTRYINDEX);
+
+    static const luaL_Reg augfuncs[] = {
+        //{ "span", lua_aug_span },
+        { "save", lua_aug_save },
+        //{ "escape_name", lua_aug_escape_name },
+        //{ "to_xml", lua_aug_to_xml },
+        //{ "errors", lua_aug_errors },
+        { NULL, NULL }
+    };
+
+    luaL_newlib(L, augfuncs);
+
+    static const luaL_Reg meta[] = {{"__index", bind_function}, {NULL, NULL}};
+    luaL_newlib(L, meta);
+    lua_setmetatable(L, -2);
+
+    lua_setglobal(L, "aug");
+
+    return L;
+}
+
+int aug_lua(lua_State *L, const char *text) {
+    int code = luaL_loadbuffer(L, text, strlen(text), "line") || lua_pcall(L, 0, 0, 0);
+    return code;
+}
+
+
+/*
+ * Local variables:
+ *  indent-tabs-mode: nil
+ *  c-indent-level: 4
+ *  c-basic-offset: 4
+ *  tab-width: 4
+ * End:
+ */
+

src/auglua.h

@@ -0,0 +1,48 @@
+/*
+ * auglua.h: Lua helper lib for Augeas
+ *
+ * Copyright (C) 2015 Raphaël Pinson
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ *
+ * Author: Raphaël Pinson <[email protected]>
+ */
+#include <lua.h>
+
+#ifndef AUGLUA_H_
+#define AUGLUA_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct lua_State *setup_lua(augeas *a);
+
+int aug_lua(lua_State *L, const char *text);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+/*
+ * Local variables:
+ *  indent-tabs-mode: nil
+ *  c-indent-level: 4
+ *  c-basic-offset: 4
+ *  tab-width: 4
+ * End:
+ */

src/auglua_sym.version

@@ -0,0 +1,6 @@
+AUGLUA_0.0.0 {
+    global:
+      setup_lua;
+      aug_lua;
+    local: *;
+};