lua: additionally return name when looking up sections

Return the resolved name in addition to the type when looking up sections
through `get()` - for example a `cursor:get("firewall", "@rule[0]")` will
now return two values in the form ("rule", "cfg0a92bd") instead of only
the type name.

This is mainly useful to resolve extended section names without having to
reimplement the section count logic in Lua code.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 5beb95da3dbec6db11a6bdfaab7807ee2daf41e6)

diff --git a/lua/uci.c b/lua/uci.c
index 54892b1..f2a5549 100644 (file)
--- a/lua/uci.c
+++ b/lua/uci.c
@@ -375,6 +375,7 @@ uci_lua_get_any(lua_State *L, bool all)
        struct uci_element *e = NULL;
        struct uci_ptr ptr;
        int offset = 0;
        struct uci_element *e = NULL;
        struct uci_ptr ptr;
        int offset = 0;

+       int nret = 1;

        char *s = NULL;
        int err = UCI_ERR_NOTFOUND;
 
        char *s = NULL;
        int err = UCI_ERR_NOTFOUND;
 


@@ -400,10 +401,14 @@ uci_lua_get_any(lua_State *L, bool all)
                        uci_push_package(L, ptr.p);
                        break;
                case UCI_TYPE_SECTION:
                        uci_push_package(L, ptr.p);
                        break;
                case UCI_TYPE_SECTION:

-                       if (all)
+                       if (all) {

                                uci_push_section(L, ptr.s, -1);
                                uci_push_section(L, ptr.s, -1);

-                       else
+                       }
+                       else {

                                lua_pushstring(L, ptr.s->type);
                                lua_pushstring(L, ptr.s->type);

+                               lua_pushstring(L, ptr.s->e.name);
+                               nret++;
+                       }

                        break;
                case UCI_TYPE_OPTION:
                        uci_push_option(L, ptr.o);
                        break;
                case UCI_TYPE_OPTION:
                        uci_push_option(L, ptr.o);


@@ -415,7 +420,7 @@ uci_lua_get_any(lua_State *L, bool all)
        if (s)
                free(s);
        if (!err)
        if (s)
                free(s);
        if (!err)

-               return 1;
+               return nret;

 
 error:
        if (s)
 
 error:
        if (s)