xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

enh: minor changes

This commit is contained in:
Shengliang Guan 2024-12-09 09:06:24 +00:00
parent 68558b0116
commit a231748687
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/os/src/osDir.c
View File

@ -336,18 +336,26 @@ void taosRemoveOldFiles(const char *dirname, int32_t keepDays) {
int32_t taosExpandDir(const char *dirname, char *outname, int32_t maxlen) { int32_t taosExpandDir(const char *dirname, char *outname, int32_t maxlen) {
OS_PARAM_CHECK(dirname); OS_PARAM_CHECK(dirname);
OS_PARAM_CHECK(outname); OS_PARAM_CHECK(outname);
outname[0] = 0; if (dirname[0] == 0) return 0;
wordexp_t full_path = {0}; wordexp_t full_path = {0};
int32_t code = wordexp(dirname, &full_path, 0); int32_t code = wordexp(dirname, &full_path, 0);
if (code == 0 && full_path.we_wordv[0] != NULL) { switch (code) {
case 0:
break;
case WRDE_NOSPACE:
wordfree(&full_path);
// FALL THROUGH
default:
return terrno = TSDB_CODE_INVALID_PARA;
}
if (full_path.we_wordv != NULL && full_path.we_wordv[0] != NULL) {
tstrncpy(outname, full_path.we_wordv[0], maxlen); tstrncpy(outname, full_path.we_wordv[0], maxlen);
wordfree(&full_path);
return 0;
} }
wordfree(&full_path); wordfree(&full_path);
return terrno = TSDB_CODE_INVALID_PARA; return 0;
} }
int32_t taosRealPath(char *dirname, char *realPath, int32_t maxlen) { int32_t taosRealPath(char *dirname, char *realPath, int32_t maxlen) {

2
source/os/test/osDirTests.cpp
View File

@ -269,7 +269,7 @@ TEST(osDirTests, taosExpandDir) {
EXPECT_EQ(ret, 0); EXPECT_EQ(ret, 0);
ret = taosExpandDir("", fullpath, 1024); ret = taosExpandDir("", fullpath, 1024);
EXPECT_NE(ret, 0); EXPECT_EQ(ret, 0);
char dir2[2048] = {0}; char dir2[2048] = {0};
for (int32_t i = 0; i < 2047; ++i) { for (int32_t i = 0; i < 2047; ++i) {