From b89054644f05a27574812be94d603a028f0e339e Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 26 Jan 2021 10:58:49 +0800
Subject: [PATCH 1/3] [TD-2845]<fix>: new -V option to taos.exe

---
 src/kit/shell/src/shellWindows.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/kit/shell/src/shellWindows.c b/src/kit/shell/src/shellWindows.c
index 7cb6c75302..bb3d91d8ff 100644
--- a/src/kit/shell/src/shellWindows.c
+++ b/src/kit/shell/src/shellWindows.c
@@ -19,6 +19,10 @@
 
 extern char configDir[];
 
+void printVersion() {
+  printf("version: %s\n", version);
+}
+
 void printHelp() {
   char indent[10] = "        ";
   printf("taos shell is used to test the TDengine database\n");
@@ -51,6 +55,8 @@ void printHelp() {
   printf("%s%s%s\n", indent, indent, "Net role when network connectivity test, default is startup, options: client|server|rpc|startup.");
   printf("%s%s\n", indent, "-l");
   printf("%s%s%s\n", indent, indent, "Packet length used for net test, default is 1000 bytes.");
+  printf("%s%s\n", indent, "-V");
+  printf("%s%s%s\n", indent, indent, "Print program version.");
 
   exit(EXIT_SUCCESS);
 }
@@ -145,7 +151,6 @@ void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
         exit(EXIT_FAILURE);
       }
     }
-    // For time zone
     else if (strcmp(argv[i], "-n") == 0) {
       if (i < argc - 1) {
         arguments->netTestRole = argv[++i];
@@ -154,7 +159,6 @@ void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
         exit(EXIT_FAILURE);
       }
     }
-    // For time zone
     else if (strcmp(argv[i], "-l") == 0) {
       if (i < argc - 1) {
         arguments->pktLen = atoi(argv[++i]);
@@ -163,6 +167,10 @@ void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
         exit(EXIT_FAILURE);
       }
     }
+    else if (strcmp(argv[i], "-V") == 0) {
+      printVersion();
+      exit(EXIT_SUCCESS);
+    }
     // For temperory command TODO
     else if (strcmp(argv[i], "--help") == 0) {
       printHelp();

From 8fe4e9ca40954a2017a065827bb4efd6f29bc118 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 26 Jan 2021 11:02:22 +0800
Subject: [PATCH 2/3] taos shell: exit --help option with EXIT_SUCCESS

---
 src/kit/shell/src/shellWindows.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/kit/shell/src/shellWindows.c b/src/kit/shell/src/shellWindows.c
index bb3d91d8ff..8e8b541246 100644
--- a/src/kit/shell/src/shellWindows.c
+++ b/src/kit/shell/src/shellWindows.c
@@ -174,7 +174,7 @@ void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
     // For temperory command TODO
     else if (strcmp(argv[i], "--help") == 0) {
       printHelp();
-      exit(EXIT_FAILURE);
+      exit(EXIT_SUCCESS);
     } else {
       fprintf(stderr, "wrong options\n");
       printHelp();

From 7e1b6b610d63082c2d07d116a8255228c056f4ed Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 26 Jan 2021 13:07:27 +0800
Subject: [PATCH 3/3] [TD-2793]<fix>: fix -p <password> option of taos.exe

MUST have a space between -p and <password
---
 src/kit/shell/src/shellWindows.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/kit/shell/src/shellWindows.c b/src/kit/shell/src/shellWindows.c
index 8e8b541246..73216f9ca3 100644
--- a/src/kit/shell/src/shellWindows.c
+++ b/src/kit/shell/src/shellWindows.c
@@ -75,6 +75,9 @@ void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
     // for password
     else if (strcmp(argv[i], "-p") == 0) {
       arguments->is_use_passwd = true;
+      if (i < argc - 1 && argv[i + 1][0] != '-') {
+        arguments->password = argv[++i];
+      }
     }
     // for management port
     else if (strcmp(argv[i], "-P") == 0) {