From bce784ab5100d27c40e514b38ccf7f21d229aac9 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Thu, 21 Apr 2022 21:11:02 +0800
Subject: [PATCH] refactor(tools): refact shell codes

---
 tools/shell/src/shellArguments.c |  1 -
 tools/shell/src/shellEngine.c    | 19 +++++++------------
 tools/shell/src/shellMain.c      |  5 +++--
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/tools/shell/src/shellArguments.c b/tools/shell/src/shellArguments.c
index 8960d7e36d..fb5dadc60c 100644
--- a/tools/shell/src/shellArguments.c
+++ b/tools/shell/src/shellArguments.c
@@ -207,7 +207,6 @@ static struct argp_option shellOptions[] = {
 
 static error_t shellParseOpt(int32_t key, char *arg, struct argp_state *state) {
   SShellArgs *arguments = &shell.args;
-  wordexp_t   full_path = {0};
 
   switch (key) {
     case 'h':
diff --git a/tools/shell/src/shellEngine.c b/tools/shell/src/shellEngine.c
index b0928e1e4e..6af4bbb424 100644
--- a/tools/shell/src/shellEngine.c
+++ b/tools/shell/src/shellEngine.c
@@ -177,12 +177,11 @@ int32_t shellRunCommand(char *command) {
 }
 
 void shellRunSingleCommandImp(char *command) {
-  int64_t   st, et;
-  wordexp_t full_path;
-  char     *sptr = NULL;
-  char     *cptr = NULL;
-  char     *fname = NULL;
-  bool      printMode = false;
+  int64_t st, et;
+  char   *sptr = NULL;
+  char   *cptr = NULL;
+  char   *fname = NULL;
+  bool    printMode = false;
 
   if ((sptr = strstr(command, ">>")) != NULL) {
     cptr = strstr(command, ";");
@@ -250,10 +249,6 @@ void shellRunSingleCommandImp(char *command) {
 
   printf("\n");
 
-  if (fname != NULL) {
-    wordfree(&full_path);
-  }
-
   atomic_store_64(&shell.result, 0);
 }
 
@@ -396,7 +391,7 @@ int32_t shellDumpResultToFile(const char *fname, TAOS_RES *tres) {
     row = taos_fetch_row(tres);
   } while (row != NULL);
 
-  shell.result = 0;
+  atomic_store_64(&shell.result, 0);
   taosCloseFile(&pFile);
 
   return numOfRows;
@@ -862,7 +857,7 @@ void shellGetGrantInfo() {
               taos_get_server_info(shell.conn), expiretime);
     }
 
-    shell.result = 0;
+    atomic_store_64(&shell.result, 0);
     taos_free_result(tres);
   }
 
diff --git a/tools/shell/src/shellMain.c b/tools/shell/src/shellMain.c
index 366702c6fc..8c4f8d3b2e 100644
--- a/tools/shell/src/shellMain.c
+++ b/tools/shell/src/shellMain.c
@@ -20,11 +20,11 @@ SShellObj shell = {0};
 
 int main(int argc, char *argv[]) {
   if (shellCheckIntSize() != 0) {
-    return 0;
+    return -1;
   }
 
   if (shellParseArgs(argc, argv) != 0) {
-    return 0;
+    return -1;
   }
 
   if (shell.args.is_version) {
@@ -38,6 +38,7 @@ int main(int argc, char *argv[]) {
   }
 
   if (shell.args.is_help) {
+    shellPrintVersion();
     return 0;
   }
 
-- 
GitLab