From df4cb9bafc66c3d88945b70389e0cb87cbcecf15 Mon Sep 17 00:00:00 2001
From: William Wilgus <me.theuser@yahoo.com>
Date: Tue, 23 Oct 2018 00:11:34 -0400
Subject: Lua fix strip_extension and create_numbered_filename

Both of these functions modified the string in the lua stack

per lua manual:
'When a C function receives a string argument from Lua,
there are only two rules that it must observe: Not to pop the string
from the stack while accessing it and never to modify the string'

strip_extension will still work with old parameters
and is thus backwards compatible
strip_extension("filename")

create_numbered_filename has changed slightly and IS NOT backwards compatible

create_numbered_filename(path, prefix, suffix, [number])
(number defaults to -1)

Change-Id: I34cf7e2f6f691f33d5ac2b2e995855a171fb99b3
---
 apps/plugins/lua/rocklib.c      | 36 ++++++++++++++++++++++++++++++++++++
 apps/plugins/lua/rocklib_aux.pl |  2 ++
 2 files changed, 38 insertions(+)

(limited to 'apps/plugins/lua')

diff --git a/apps/plugins/lua/rocklib.c b/apps/plugins/lua/rocklib.c
index 82a03ab6b4..64394b8728 100644
--- a/apps/plugins/lua/rocklib.c
+++ b/apps/plugins/lua/rocklib.c
@@ -363,6 +363,39 @@ RB_WRAP(get_plugin_action)
     return 1;
 }
 
+RB_WRAP(strip_extension)
+{
+    const char* filename = luaL_checkstring(L, -1);
+    const char* pos = rb->strrchr(filename, '.');
+    if(pos != NULL)
+        lua_pushlstring (L, filename, pos - filename);
+
+    return 1;
+}
+
+RB_WRAP(create_numbered_filename)
+{
+    luaL_Buffer b;
+    luaL_buffinit(L, &b);
+    char *buffer = luaL_prepbuffer(&b);
+    buffer[0] = '\0';
+
+    const char * path = luaL_checkstring(L, 1);
+    const char * prefix = luaL_checkstring(L, 2);
+    const char * suffix = luaL_checkstring(L, 3);
+    int numberlen = luaL_optint(L, 4, -1);
+
+    if(rb->create_numbered_filename(buffer, path, prefix, suffix, numberlen))
+    {
+        luaL_addstring(&b, buffer);
+        luaL_pushresult(&b);
+    }
+    else
+        return 0;
+
+    return 1;
+}
+
 #define RB_FUNC(func) {#func, rock_##func}
 static const luaL_Reg rocklib[] =
 {
@@ -410,6 +443,9 @@ static const luaL_Reg rocklib[] =
 
     RB_FUNC(get_plugin_action),
 
+    RB_FUNC(strip_extension),
+    RB_FUNC(create_numbered_filename),
+
     {NULL, NULL}
 };
 #undef RB_FUNC
diff --git a/apps/plugins/lua/rocklib_aux.pl b/apps/plugins/lua/rocklib_aux.pl
index f04457f189..085a191ee3 100755
--- a/apps/plugins/lua/rocklib_aux.pl
+++ b/apps/plugins/lua/rocklib_aux.pl
@@ -65,6 +65,8 @@ my @forbidden_functions = ('^open$',
                            '^fdprintf$',
                            '^read_line$',
                            '^[a-z]+dir$',
+                           '^strip_extension$',
+                           '^create_numbered_filename$',
                            '^s?+rand$',
                            '^strl?+cpy$',
                            '^strl?+cat$',
-- 
cgit v1.2.3