From 0286fab538f17d33ed2b5e44e461a14131328661 Mon Sep 17 00:00:00 2001 From: Zhiqiang Wang <1296468573@qq.com> Date: Sat, 22 Oct 2022 20:23:38 +0800 Subject: [PATCH] fix: func basename error (#17547) * fix: func basename error * chore: add cargo update Co-authored-by: Shuduo Sang --- packaging/tools/post.sh | 1 + source/os/src/osDir.c | 11 +++++++++-- tools/CMakeLists.txt | 6 ++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/packaging/tools/post.sh b/packaging/tools/post.sh index 708a93c4fa..37307f0543 100755 --- a/packaging/tools/post.sh +++ b/packaging/tools/post.sh @@ -118,6 +118,7 @@ function kill_taosd() { } function install_include() { + ${csudo}mkdir -p ${inc_link_dir} ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h ${inc_link_dir}/taosudf.h || : [ -f ${inc_link_dir}/taosws.h ] && ${csudo}rm -f ${inc_link_dir}/taosws.h ||: diff --git a/source/os/src/osDir.c b/source/os/src/osDir.c index 2902f90f7b..ca99742773 100644 --- a/source/os/src/osDir.c +++ b/source/os/src/osDir.c @@ -388,8 +388,15 @@ char *taosDirEntryBaseName(char *name) { _splitpath(name, NULL, NULL, Filename1, Ext1); return name + (strlen(name) - strlen(Filename1) - strlen(Ext1)); #else - char *pPoint = strchr(name, '.'); - if (pPoint != NULL) pPoint = 0; + if (name == NULL || (name[0] == '/' && name[1] == '\0')) return name; + char *pPoint = strrchr(name, '/'); + if (pPoint != NULL) { + if (*(pPoint + 1) == '\0') { + *pPoint = '\0'; + return taosDirEntryBaseName(name); + } + return pPoint + 1; + } return name; #endif } diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 98d21a4f2c..c6a5e33735 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -17,7 +17,8 @@ IF (TD_WEBSOCKET) PATCH_COMMAND COMMAND git clean -f -d BUILD_COMMAND - COMMAND cargo build --release -p taos-ws-sys + COMMAND cargo update + COMMAND cargo build --release -p taos-ws-sys --features native-tls-vendored COMMAND ./taos-ws-sys/ci/package.sh INSTALL_COMMAND COMMAND cmake -E copy target/libtaosws/${websocket_lib_file} ${CMAKE_BINARY_DIR}/build/lib @@ -36,7 +37,8 @@ IF (TD_WEBSOCKET) PATCH_COMMAND COMMAND git clean -f -d BUILD_COMMAND - COMMAND cargo build --release -p taos-ws-sys + COMMAND cargo update + COMMAND cargo build --release -p taos-ws-sys --features native-tls-vendored COMMAND ./taos-ws-sys/ci/package.sh INSTALL_COMMAND COMMAND cmake -E copy target/libtaosws/${websocket_lib_file} ${CMAKE_BINARY_DIR}/build/lib