From d44f08a8d072d9234bea34376434113fa5963949 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 2 Feb 2021 10:55:38 +0800
Subject: [PATCH] TD-1207

---
 deps/MsvcLibX/include/msvcUnistd.h | 5 +++--
 src/common/src/tglobal.c           | 2 +-
 src/tfs/src/tfs.c                  | 2 +-
 src/util/src/tconfig.c             | 5 +++++
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/deps/MsvcLibX/include/msvcUnistd.h b/deps/MsvcLibX/include/msvcUnistd.h
index 9ad60625e0..9b59bae7f0 100644
--- a/deps/MsvcLibX/include/msvcUnistd.h
+++ b/deps/MsvcLibX/include/msvcUnistd.h
@@ -89,11 +89,12 @@ pid_t getppid(void);	/* Get parent PID */
 
 /* Path management */
 #if defined(_WIN32)
-#if defined(_UTF8_SOURCE) || defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
 #define realpath realpathU
+#if defined(_UTF8_SOURCE) || defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+// #define realpath realpathU
 #define CompactPath CompactPathU
 #else /* _ANSI_SOURCE */
-#define realpath realpathA
+// #define realpath realpathA
 #define CompactPath CompactPathA
 #endif
 #endif /* defined(_WIN32) */
diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c
index 980524be96..3d88cf8312 100644
--- a/src/common/src/tglobal.c
+++ b/src/common/src/tglobal.c
@@ -59,7 +59,6 @@ char    tsLocale[TSDB_LOCALE_LEN] = {0};
 char    tsCharset[TSDB_LOCALE_LEN] = {0};  // default encode string
 int8_t  tsEnableCoreFile = 0;
 int32_t tsMaxBinaryDisplayWidth = 30;
-char    tsTempDir[TSDB_FILENAME_LEN] = "/tmp/";
 
 /*
  * denote if the server needs to compress response message at the application layer to client, including query rsp,
@@ -182,6 +181,7 @@ char   tsDnodeDir[TSDB_FILENAME_LEN] = {0};
 char   tsMnodeDir[TSDB_FILENAME_LEN] = {0};
 char   tsDataDir[TSDB_FILENAME_LEN] = {0};
 char   tsScriptDir[TSDB_FILENAME_LEN] = {0};
+char   tsTempDir[TSDB_FILENAME_LEN] = "/tmp/";
 
 int32_t  tsDiskCfgNum = 0;
 
diff --git a/src/tfs/src/tfs.c b/src/tfs/src/tfs.c
index d942151843..7b7c9b6127 100644
--- a/src/tfs/src/tfs.c
+++ b/src/tfs/src/tfs.c
@@ -593,7 +593,7 @@ void taosGetDisk() {
     tsAvailLogDirGB = (float)(diskSize.avail / unit);
   }
 
-  if (taosGetDiskSize("/tmp", &diskSize) == 0) {
+  if (taosGetDiskSize(tsTempDir, &diskSize) == 0) {
     tsTotalTmpDirGB = (float)(diskSize.tsize / unit);
     tsAvailTmpDirectorySpace = (float)(diskSize.avail / unit);
   }
diff --git a/src/util/src/tconfig.c b/src/util/src/tconfig.c
index eb96f81b33..7a92750f8f 100644
--- a/src/util/src/tconfig.c
+++ b/src/util/src/tconfig.c
@@ -134,6 +134,11 @@ static bool taosReadDirectoryConfig(SGlobalCfg *cfg, char *input_value) {
 
       wordfree(&full_path);
 
+      char tmp[1025] = {0};
+      if (realpath(option, tmp) != NULL) {
+        strcpy(option, tmp);
+      }
+
       int code = taosMkDir(option, 0755);
       if (code != 0) {
         terrno = TAOS_SYSTEM_ERROR(errno);
-- 
GitLab