diff options
author | Jo-Philipp Wich <jo@mein.io> | 2018-04-17 15:38:28 +0200 |
---|---|---|
committer | Jo-Philipp Wich <jo@mein.io> | 2018-04-18 16:21:27 +0200 |
commit | 1d5a3123ed63777e2d40250fba99cf8cf2f58476 (patch) | |
tree | e81b138521354ed42e5dfaf9f88af703d9652699 /modules/luci-base/src/template_lualib.c | |
parent | 59dea0230cbbea75459c4e61d1da64629d1da31b (diff) |
Revert "luci-base: add urldecode() and urlencode() C implementations"
This reverts commit ad7dc4a4928e77ae142d0fe040f9e9e64b530e82.
Since we're using liblucihttp now, that library is the appropriate place to
add such decoding helper functions.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'modules/luci-base/src/template_lualib.c')
-rw-r--r-- | modules/luci-base/src/template_lualib.c | 49 |
1 files changed, 1 insertions, 48 deletions
diff --git a/modules/luci-base/src/template_lualib.c b/modules/luci-base/src/template_lualib.c index 45e23966e9..d5c8dd6b4c 100644 --- a/modules/luci-base/src/template_lualib.c +++ b/modules/luci-base/src/template_lualib.c @@ -1,7 +1,7 @@ /* * LuCI Template - Lua binding * - * Copyright (C) 2009-2018 Jo-Philipp Wich <jo@mein.io> + * Copyright (C) 2009 Jo-Philipp Wich <jow@openwrt.org> * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -110,51 +110,6 @@ int template_L_striptags(lua_State *L) return 0; } -int template_L_urlencode(lua_State *L) -{ - size_t len = 0; - const char *str = luaL_checkstring(L, 1); - char *res = urlencode(str, &len); - - if (res != NULL) - { - lua_pushlstring(L, res, len); - free(res); - - return 1; - } - else if (len == 0) - { - lua_pushvalue(L, 1); - return 1; - } - - return 0; -} - -int template_L_urldecode(lua_State *L) -{ - size_t len = 0; - const char *str = luaL_checkstring(L, 1); - int keep_plus = lua_toboolean(L, 2); - char *res = urldecode(str, &len, keep_plus == 1); - - if (res != NULL) - { - lua_pushlstring(L, res, len); - free(res); - - return 1; - } - else if (len == 0) - { - lua_pushvalue(L, 1); - return 1; - } - - return 0; -} - static int template_L_load_catalog(lua_State *L) { const char *lang = luaL_optstring(L, 1, "en"); const char *dir = luaL_optstring(L, 2, NULL); @@ -210,8 +165,6 @@ static const luaL_reg R[] = { { "utf8", template_L_utf8 }, { "pcdata", template_L_pcdata }, { "striptags", template_L_striptags }, - { "urlencode", template_L_urlencode }, - { "urldecode", template_L_urldecode }, { "load_catalog", template_L_load_catalog }, { "close_catalog", template_L_close_catalog }, { "change_catalog", template_L_change_catalog }, |