aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFerenc Wágner <wferi@niif.hu>2014-10-13 11:26:47 +0200
committerFerenc Wágner <wferi@niif.hu>2014-10-13 12:44:15 +0200
commit7952d37662a5738ba22eef45b5eae4f2ff41e909 (patch)
treede3049dc91b95d4f5eb38affba04993de59ef322
parentd202cd8f6064ce29e90a9a4c07beb1ea6fc36872 (diff)
downloadsyslinux-7952d37662a5738ba22eef45b5eae4f2ff41e909.tar.gz
syslinux-7952d37662a5738ba22eef45b5eae4f2ff41e909.tar.xz
syslinux-7952d37662a5738ba22eef45b5eae4f2ff41e909.zip
lua: return the modified object from the initramfs methods
Signed-off-by: Ferenc Wágner <wferi@niif.hu>
-rw-r--r--com32/lua/doc/syslinux.asc6
-rw-r--r--com32/lua/src/syslinux.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/com32/lua/doc/syslinux.asc b/com32/lua/doc/syslinux.asc
index 95e0e44e..6475d42f 100644
--- a/com32/lua/doc/syslinux.asc
+++ b/com32/lua/doc/syslinux.asc
@@ -94,10 +94,12 @@ initramfs()::
Return an empty _initramfs_ object. Its methods are:
load(filename):::
-Load contents of +filename+ into an _initramfs_.
+Load contents of +filename+ into an _initramfs_ and return the
+extended object.
add_file(filename[,data[,do_mkdir[,mode]]]):::
-Add +filename+ of +mode+ containing +data+ to an _initramfs_.
+Add +filename+ of +mode+ containing +data+ to an _initramfs_ and
+return the extended object.
If +do_mkdir+, create parent directories, too. +mode+ defaults
to 7*64+5*8+5 (which is 0755 in octal).
diff --git a/com32/lua/src/syslinux.c b/com32/lua/src/syslinux.c
index 18934e18..9a2998b9 100644
--- a/com32/lua/src/syslinux.c
+++ b/com32/lua/src/syslinux.c
@@ -296,7 +296,8 @@ static int sl_initramfs_load_archive(lua_State * L)
if (initramfs_load_archive (luaL_checkudata(L, 1, SYSLINUX_INITRAMFS), filename))
return luaL_error (L, "Loading initramfs %s failed", filename);
- return 0;
+ lua_settop (L, 1);
+ return 1;
}
static int sl_initramfs_add_file(lua_State * L)
@@ -315,7 +316,8 @@ static int sl_initramfs_add_file(lua_State * L)
data, file_len, file_len, filename,
luaL_optint (L, 4, 0), luaL_optint (L, 5, 0755)))
return luaL_error (L, "Adding file %s to initramfs failed", filename);
- return 0;
+ lua_settop (L, 1);
+ return 1;
}
static int sl_initramfs_size (lua_State *L)