q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=4a1bfdeb4d771f39c49f9d8fc65aa0cde2700de0
commit 4a1bfdeb4d771f39c49f9d8fc65aa0cde2700de0 Author: Daniel Kolesa <[email protected]> Date: Fri Dec 12 12:04:10 2014 +0000 elua: move io extensions to library --- src/Makefile_Elua.am | 7 ++++--- src/bin/elua/main.c | 4 +--- src/lib/elua/Elua.h | 2 ++ src/lib/elua/elua.c | 2 -- src/{bin => lib}/elua/io.c | 11 ++++------- 5 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/Makefile_Elua.am b/src/Makefile_Elua.am index cd30251..65792b6 100644 --- a/src/Makefile_Elua.am +++ b/src/Makefile_Elua.am @@ -7,7 +7,9 @@ dist_installed_eluamainheaders_DATA = \ lib/elua/Elua.h lib_elua_libelua_la_SOURCES = \ -lib/elua/elua.c + lib/elua/elua_private.h \ + lib/elua/elua.c \ + lib/elua/io.c lib_elua_libelua_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ELUA_CFLAGS@ \ -DLOCALE_DIR=\"@LOCALE_DIR@\" \ @@ -28,8 +30,7 @@ bin_PROGRAMS += bin/elua/elua bin_elua_elua_SOURCES = \ bin/elua/main.h \ bin/elua/cache.c \ - bin/elua/main.c \ - bin/elua/io.c + bin/elua/main.c bin_elua_elua_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ELUA_CFLAGS@ \ -DLOCALE_DIR=\"@LOCALE_DIR@\" \ diff --git a/src/bin/elua/main.c b/src/bin/elua/main.c index 789ee06..5ff7487 100644 --- a/src/bin/elua/main.c +++ b/src/bin/elua/main.c @@ -316,13 +316,11 @@ struct Main_Data int status; }; -int elua_popen(lua_State *L); - const luaL_reg cutillib[] = { { "init_module" , elua_init_module }, { "register_callbacks", elua_register_callbacks }, - { "popenv" , elua_popen }, + { "popenv" , elua_io_popen }, { NULL , NULL } }; diff --git a/src/lib/elua/Elua.h b/src/lib/elua/Elua.h index 7b8387e..bba00e9 100644 --- a/src/lib/elua/Elua.h +++ b/src/lib/elua/Elua.h @@ -63,6 +63,8 @@ EAPI int elua_shutdown(void); EAPI void elua_state_setup_i18n(lua_State *L); +EAPI int elua_io_popen(lua_State *L); + #endif #ifdef __cplusplus diff --git a/src/lib/elua/elua.c b/src/lib/elua/elua.c index ea23bc6..f4411ae 100644 --- a/src/lib/elua/elua.c +++ b/src/lib/elua/elua.c @@ -1,5 +1,3 @@ -#include <Eina.h> - #include "Elua.h" #include "elua_private.h" diff --git a/src/bin/elua/io.c b/src/lib/elua/io.c similarity index 98% rename from src/bin/elua/io.c rename to src/lib/elua/io.c index 9d4ad17..4b73a3b 100644 --- a/src/bin/elua/io.c +++ b/src/lib/elua/io.c @@ -1,8 +1,5 @@ -#include "config.h" - -/* elua io extras, largely taken from lua io lib source */ - -#include "main.h" +#include "Elua.h" +#include "elua_private.h" /* expand fname to full path name (so that PATH is ignored) plus turn * stuff into a command, and also verify whether the path exists */ @@ -344,8 +341,8 @@ elua_newfile(lua_State *L) return f; } -int -elua_popen(lua_State *L) +EAPI int +elua_io_popen(lua_State *L) { const char *fname = luaL_checkstring(L, 1); const char *mode = luaL_optstring(L, 2, "r"); --
