From dc86d5d78e76aa8cfe97eef046157783b5c95388 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Thu, 9 Sep 2021 09:20:57 +0800 Subject: [PATCH] Hotfix/sangshuduo/td 5844 cmdline parameters align for master (#7833) * [TD-5844]: 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 * make taos.exe use mysql style password input. * make taos shell and taosdump use mysql style password input. * determine scanf return value. * cherry pick from develop/feature branch. * cherry pick with ab6cde02626bd8ba496b98a65e37e1f98c9ff596 * cherry pick with d6bfe443fd21ded247bd8509fb77b7b18e112357 * fix password echo on darwin. Co-authored-by: Shuduo Sang --- 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