From aeda9da29923d4f2d9db63b3171ae9c108599559 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 9 Mar 2022 23:34:29 +0800 Subject: update tbox --- core/src/tbox/tbox | 2 +- core/src/xmake/path/translate.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/core/src/tbox/tbox b/core/src/tbox/tbox index b763252ce..da64671b8 160000 --- a/core/src/tbox/tbox +++ b/core/src/tbox/tbox @@ -1 +1 @@ -Subproject commit b763252ce256ca4a3459024072833c51d7534fc7 +Subproject commit da64671b833ba8a7a56d882b9e170388504b70d2 diff --git a/core/src/xmake/path/translate.c b/core/src/xmake/path/translate.c index 1eabc2a79..87059c85c 100644 --- a/core/src/xmake/path/translate.c +++ b/core/src/xmake/path/translate.c @@ -39,7 +39,8 @@ tb_int_t xm_path_translate(lua_State* lua) tb_assert_and_check_return_val(lua, 0); // get the path - tb_char_t const* path = luaL_checkstring(lua, 1); + size_t path_size = 0; + tb_char_t const* path = luaL_checklstring(lua, 1, &path_size); tb_check_return_val(path, 0); // get the option argument, e.g. {reduce_dot2 = true} @@ -53,12 +54,9 @@ tb_int_t xm_path_translate(lua_State* lua) lua_pop(lua, 1); } - // copy path - tb_char_t data[TB_PATH_MAXN]; - tb_strlcpy(data, path, sizeof(data)); - // do path:translate() - tb_size_t size = tb_path_translate(data, 0, sizeof(data) - 1, reduce_dot2); + tb_char_t data[TB_PATH_MAXN]; + tb_size_t size = tb_path_translate_to(path, (tb_size_t)path_size, data, sizeof(data), reduce_dot2); if (size) lua_pushlstring(lua, data, (size_t)size); else lua_pushnil(lua); return 1; -- cgit v1.3.1