From 47625967d22a1f2f44dbeff87194360e5ba7b41e Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Thu, 19 Aug 2021 10:02:07 +0800
Subject: [PATCH] Feature/sangshuduo/td 5844 cmdline parameters align (#7442)

* [TD-5844]<feature>: make cmd line parameter similar.

* fix test case align with taosdemo change.

* fix windows stack overflow issue.

* fix mac compile error.

* fix taosdemo cmdline parameter in tests/pytest/tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanoInsert.py

* fix windows compiler options.

* make taos.exe use mysql style password input.

* make taos shell and taosdump use mysql style password input.

* determine scanf return value.

* make console echo off during password input.
---
 src/kit/taosdemo/taosdemo.c      |  4 +++-
 src/kit/taosdump/taosdump.c      |  2 ++
 src/os/inc/osSystem.h            |  2 ++
 src/os/src/darwin/darwinSystem.c | 26 ++++++++++++++++++++++++++
 src/os/src/linux/osSystem.c      | 24 ++++++++++++++++++++++++
 src/os/src/windows/wSystem.c     | 14 ++++++++++++++
 6 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index 7cee96b54b..a1c68b2f3c 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -866,10 +866,12 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
             arguments->user = argv[++i];
         } else if (strncmp(argv[i], "-p", 2) == 0) {
             if (strlen(argv[i]) == 2) {
-                printf("Enter password:");
+                printf("Enter password: ");
+                taosSetConsoleEcho(false);
                 if (scanf("%s", arguments->password) > 1) {
                     fprintf(stderr, "password read error!\n");
                 }
+                taosSetConsoleEcho(true);
             } else {
                 tstrncpy(arguments->password, (char *)(argv[i] + 2), MAX_PASSWORD_SIZE);
             }
diff --git a/src/kit/taosdump/taosdump.c b/src/kit/taosdump/taosdump.c
index b7073c28a7..c54b8da1b7 100644
--- a/src/kit/taosdump/taosdump.c
+++ b/src/kit/taosdump/taosdump.c
@@ -561,9 +561,11 @@ static void parse_password(
         if (strncmp(argv[i], "-p", 2) == 0) {
             if (strlen(argv[i]) == 2) {
                 printf("Enter password: ");
+                taosSetConsoleEcho(false);
                 if(scanf("%20s", arguments->password) > 1) {
                     errorPrint("%s() LN%d, password read error!\n", __func__, __LINE__);
                 }
+                taosSetConsoleEcho(true);
             } else {
                 tstrncpy(arguments->password, (char *)(argv[i] + 2), MAX_PASSWORD_SIZE);
             }
diff --git a/src/os/inc/osSystem.h b/src/os/inc/osSystem.h
index e7a3ec13ae..4b79250740 100644
--- a/src/os/inc/osSystem.h
+++ b/src/os/inc/osSystem.h
@@ -24,6 +24,8 @@ void* taosLoadDll(const char *filename);
 void* taosLoadSym(void* handle, char* name);
 void taosCloseDll(void *handle);
 
+int taosSetConsoleEcho(bool on);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/os/src/darwin/darwinSystem.c b/src/os/src/darwin/darwinSystem.c
index 17cafdd664..6f296c9fef 100644
--- a/src/os/src/darwin/darwinSystem.c
+++ b/src/os/src/darwin/darwinSystem.c
@@ -29,4 +29,30 @@ void* taosLoadSym(void* handle, char* name) {
 void taosCloseDll(void *handle) {
 }
 
+int taosSetConsoleEcho(bool on)
+{
+#if 0
+#define ECHOFLAGS (ECHO | ECHOE | ECHOK | ECHONL)
+    int err;
+    struct termios term;
+
+    if (tcgetattr(STDIN_FILENO, &term) == -1) {
+        perror("Cannot get the attribution of the terminal");
+        return -1;
+    }
+
+    if (on)
+        term.c_lflag|=ECHOFLAGS;
+    else
+        term.c_lflag &=~ECHOFLAGS;
+
+    err = tcsetattr(STDIN_FILENO,TCSAFLUSH,&term);
+    if (err == -1 && err == EINTR) {
+        perror("Cannot set the attribution of the terminal");
+        return -1;
+    }
+
+#endif
+    return 0;
+}
 
diff --git a/src/os/src/linux/osSystem.c b/src/os/src/linux/osSystem.c
index 052b7a22a8..0cdb20dbdb 100644
--- a/src/os/src/linux/osSystem.c
+++ b/src/os/src/linux/osSystem.c
@@ -51,4 +51,28 @@ void taosCloseDll(void *handle) {
   }
 }
 
+int taosSetConsoleEcho(bool on)
+{
+#define ECHOFLAGS (ECHO | ECHOE | ECHOK | ECHONL)
+    int err;
+    struct termios term;
+
+    if (tcgetattr(STDIN_FILENO, &term) == -1) {
+        perror("Cannot get the attribution of the terminal");
+        return -1;
+    }
+
+    if (on)
+        term.c_lflag|=ECHOFLAGS;
+    else
+        term.c_lflag &=~ECHOFLAGS;
+
+    err = tcsetattr(STDIN_FILENO,TCSAFLUSH,&term);
+    if (err == -1 && err == EINTR) {
+        perror("Cannot set the attribution of the terminal");
+        return -1;
+    }
+
+    return 0;
+}
 
diff --git a/src/os/src/windows/wSystem.c b/src/os/src/windows/wSystem.c
index 17cafdd664..564005f79b 100644
--- a/src/os/src/windows/wSystem.c
+++ b/src/os/src/windows/wSystem.c
@@ -30,3 +30,17 @@ void taosCloseDll(void *handle) {
 }
 
 
+int taosSetConsoleEcho(bool on)
+{
+    HANDLE hStdin = GetStdHandle(STD_INPUT_HANDLE); 
+    DWORD mode = 0;
+    GetConsoleMode(hStdin, &mode );
+    if (on) {
+        mode |= ENABLE_ECHO_INPUT;
+    } else {
+        mode &= ~ENABLE_ECHO_INPUT;
+    }
+    SetConsoleMode(hStdin, mode);
+
+    return 0;
+}
-- 
GitLab