From ab6151cd9016ab7f0710bc49130369a43ae4551d Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Sat, 8 Aug 2020 17:52:48 +0800
Subject: [PATCH] TD-1057

---
 src/common/src/tglobal.c      | 6 +++---
 src/os/src/alpine/alpineEnv.c | 5 ++++-
 src/os/src/darwin/darwinEnv.c | 5 ++++-
 src/os/src/linux64/linuxEnv.c | 5 ++++-
 src/os/src/windows/w64Env.c   | 5 ++++-
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c
index 386ea2f9a7..0d7df38b83 100644
--- a/src/common/src/tglobal.c
+++ b/src/common/src/tglobal.c
@@ -147,12 +147,12 @@ int32_t tsMonitorInterval = 30;  // seconds
 
 // internal
 int32_t tscEmbedded = 0;
-char    configDir[TSDB_FILENAME_LEN] = "/etc/taos";
+char    configDir[TSDB_FILENAME_LEN] = {0};
 char    tsVnodeDir[TSDB_FILENAME_LEN] = {0};
 char    tsDnodeDir[TSDB_FILENAME_LEN] = {0};
 char    tsMnodeDir[TSDB_FILENAME_LEN] = {0};
-char    tsDataDir[TSDB_FILENAME_LEN] = "/var/lib/taos";
-char    tsScriptDir[TSDB_FILENAME_LEN] = "/etc/taos";
+char    tsDataDir[TSDB_FILENAME_LEN] = {0};
+char    tsScriptDir[TSDB_FILENAME_LEN] = {0};
 char    tsVnodeBakDir[TSDB_FILENAME_LEN] = {0};
 
 /*
diff --git a/src/os/src/alpine/alpineEnv.c b/src/os/src/alpine/alpineEnv.c
index 4f84412075..811d98ad7f 100644
--- a/src/os/src/alpine/alpineEnv.c
+++ b/src/os/src/alpine/alpineEnv.c
@@ -18,7 +18,10 @@
 #include "tglobal.h"
 
 void osInit() {
-  strcpy(configDir, "/etc/taos");
+  if (configDir[0] == 0) {
+    strcpy(configDir, "/etc/taos");
+  }
+
   strcpy(tsVnodeDir, "");
   strcpy(tsDnodeDir, "");
   strcpy(tsMnodeDir, "");
diff --git a/src/os/src/darwin/darwinEnv.c b/src/os/src/darwin/darwinEnv.c
index 7e1031a5af..6adebabec0 100644
--- a/src/os/src/darwin/darwinEnv.c
+++ b/src/os/src/darwin/darwinEnv.c
@@ -18,7 +18,10 @@
 #include "tglobal.h"
 
 void osInit() {
-  strcpy(configDir, "~/TDengine/cfg");
+  if (configDir[0] == 0) {
+    strcpy(configDir, "~/TDengine/cfg");
+  }
+
   strcpy(tsVnodeDir, "");
   strcpy(tsDnodeDir, "");
   strcpy(tsMnodeDir, "");
diff --git a/src/os/src/linux64/linuxEnv.c b/src/os/src/linux64/linuxEnv.c
index 4f84412075..811d98ad7f 100644
--- a/src/os/src/linux64/linuxEnv.c
+++ b/src/os/src/linux64/linuxEnv.c
@@ -18,7 +18,10 @@
 #include "tglobal.h"
 
 void osInit() {
-  strcpy(configDir, "/etc/taos");
+  if (configDir[0] == 0) {
+    strcpy(configDir, "/etc/taos");
+  }
+
   strcpy(tsVnodeDir, "");
   strcpy(tsDnodeDir, "");
   strcpy(tsMnodeDir, "");
diff --git a/src/os/src/windows/w64Env.c b/src/os/src/windows/w64Env.c
index 333871e96c..c6046ecae7 100644
--- a/src/os/src/windows/w64Env.c
+++ b/src/os/src/windows/w64Env.c
@@ -21,7 +21,10 @@
 extern void taosWinSocketInit();
 
 void osInit() {
-  strcpy(configDir, "C:/TDengine/cfg");
+  if (configDir[0] == 0) {
+    strcpy(configDir, "~/TDengine/cfg");
+  }
+
   strcpy(tsVnodeDir, "C:/TDengine/data");
   strcpy(tsDnodeDir, "");
   strcpy(tsMnodeDir, "");
-- 
GitLab