From 70a6f00c9ce83b4ad7ae542acb7d590fcc18385c Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Thu, 9 Sep 2021 09:20:44 +0800
Subject: [PATCH] Feature/sangshuduo/td 5844 cmdline parameters align (#7832)

* [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.

* use one macro to define password length.

* fix --password. change taos shell '-z' for timezone

* fix password echo on darwin.
---
 src/kit/shell/src/shellDarwin.c  | 1 +
 src/os/src/darwin/darwinSystem.c | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/kit/shell/src/shellDarwin.c b/src/kit/shell/src/shellDarwin.c
index 9161860f07..a1413be1ce 100644
--- a/src/kit/shell/src/shellDarwin.c
+++ b/src/kit/shell/src/shellDarwin.c
@@ -98,6 +98,7 @@ void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
             tstrncpy(g_password, (char *)(argv[i] + 2), SHELL_MAX_PASSWORD_LEN);
         }
         arguments->password = g_password;
+        arguments->is_use_passwd = true;
         strcpy(argv[i], "");
         argc -= 1;
     }
diff --git a/src/os/src/darwin/darwinSystem.c b/src/os/src/darwin/darwinSystem.c
index 6f296c9fef..f152e36d7b 100644
--- a/src/os/src/darwin/darwinSystem.c
+++ b/src/os/src/darwin/darwinSystem.c
@@ -31,7 +31,6 @@ void taosCloseDll(void *handle) {
 
 int taosSetConsoleEcho(bool on)
 {
-#if 0
 #define ECHOFLAGS (ECHO | ECHOE | ECHOK | ECHONL)
     int err;
     struct termios term;
@@ -52,7 +51,6 @@ int taosSetConsoleEcho(bool on)
         return -1;
     }
 
-#endif
     return 0;
 }
 
-- 
GitLab