Hotfix/sangshuduo/td 5844 cmdline parameters align for master (#7444)

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

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

src/kit/shell/src/shellDarwin.c

@@ -64,6 +64,10 @@ void printHelp() {
   exit(EXIT_SUCCESS);
 }
 
+char      DARWINCLIENT_VERSION[] = "Welcome to the TDengine shell from %s, Client Version:%s\n"
+                             "Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.\n\n";
+char g_password[MAX_PASSWORD_SIZE];
+
 void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
   wordexp_t full_path;
   for (int i = 1; i < argc; i++) {
@@ -77,10 +81,21 @@ void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
       }
     }
       // for password
-    else if (strcmp(argv[i], "-p") == 0) {
-      arguments->is_use_passwd = true;
+    else if (strncmp(argv[i], "-p", 2) == 0) {
+        strcpy(tsOsName, "Darwin");
+        printf(DARWINCLIENT_VERSION, tsOsName, taos_get_client_info());
+        if (strlen(argv[i]) == 2) {
+            printf("Enter password: ");
+            if (scanf("%s", g_password) > 1) {
+                fprintf(stderr, "password read error\n");
+            }
+            getchar();
+        } else {
+            tstrncpy(g_password, (char *)(argv[i] + 2), MAX_PASSWORD_SIZE);
+        }
+        arguments->password = g_password;
     }
-      // for management port
+    // for management port
     else if (strcmp(argv[i], "-P") == 0) {
       if (i < argc - 1) {
         arguments->port = atoi(argv[++i]);
@@ -98,7 +113,7 @@ void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
         exit(EXIT_FAILURE);
       }
     } else if (strcmp(argv[i], "-c") == 0) {
-      if (i < argc - 1) { 
+      if (i < argc - 1) {
         if (strlen(argv[++i]) >= TSDB_FILENAME_LEN) {
           fprintf(stderr, "config file path: %s overflow max len %d\n", argv[i], TSDB_FILENAME_LEN - 1);
           exit(EXIT_FAILURE);

src/kit/shell/src/shellEngine.c

@@ -65,7 +65,15 @@ extern TAOS *taos_connect_auth(const char *ip, const char *user, const char *aut
  */
 TAOS *shellInit(SShellArguments *_args) {
   printf("\n");
-  printf(CLIENT_VERSION, tsOsName, taos_get_client_info());
+  if (!_args->is_use_passwd) {
+#ifdef TD_WINDOWS
+    strcpy(tsOsName, "Windows");
+#elif defined(TD_DARWIN)
+    strcpy(tsOsName, "Darwin");
+#endif
+    printf(CLIENT_VERSION, tsOsName, taos_get_client_info());
+  }
+
   fflush(stdout);
 
   // set options before initializing
@@ -73,9 +81,7 @@ TAOS *shellInit(SShellArguments *_args) {
     taos_options(TSDB_OPTION_TIMEZONE, _args->timezone);
   }
 
-  if (_args->is_use_passwd) {
-    if (_args->password == NULL) _args->password = getpass("Enter password: ");
-  } else {
+  if (!_args->is_use_passwd) {
     _args->password = TSDB_DEFAULT_PASS;
   }
 
@@ -170,7 +176,7 @@ static int32_t shellRunSingleCommand(TAOS *con, char *command) {
     system("clear");
     return 0;
   }
-  
+
   if (regex_match(command, "^[\t ]*set[ \t]+max_binary_display_width[ \t]+(default|[1-9][0-9]*)[ \t;]*$", REG_EXTENDED | REG_ICASE)) {
     strtok(command, " \t");
     strtok(NULL, " \t");
@@ -182,7 +188,7 @@ static int32_t shellRunSingleCommand(TAOS *con, char *command) {
     }
     return 0;
   }
-  
+
   if (regex_match(command, "^[ \t]*source[\t ]+[^ ]+[ \t;]*$", REG_EXTENDED | REG_ICASE)) {
     /* If source file. */
     char *c_ptr = strtok(command, " ;");
@@ -247,7 +253,7 @@ int32_t shellRunCommand(TAOS* con, char* command) {
       esc = false;
       continue;
     }
-    
+
     if (c == '\\') {
       esc = true;
       continue;
@@ -336,8 +342,8 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
   }
 
   if (!tscIsUpdateQuery(pSql)) {  // select and show kinds of commands
-    int error_no = 0;    
-  
+    int error_no = 0;
+
     int numOfRows = shellDumpResult(pSql, fname, &error_no, printMode);
     if (numOfRows < 0) {
       atomic_store_64(&result, 0);
@@ -530,7 +536,7 @@ static int dumpResultToFile(const char* fname, TAOS_RES* tres) {
     fprintf(fp, "%s", fields[col].name);
   }
   fputc('\n', fp);
-  
+
   int numOfRows = 0;
   do {
     int32_t* length = taos_fetch_lengths(tres);
@@ -716,7 +722,7 @@ static int verticalPrintResult(TAOS_RES* tres) {
 
   int numOfRows = 0;
   int showMore = 1;
-  do {  
+  do {
     if (numOfRows < resShowMaxNum) {
       printf("*************************** %d.row ***************************\n", numOfRows + 1);
 
@@ -851,7 +857,7 @@ static int horizontalPrintResult(TAOS_RES* tres) {
 
   int numOfRows = 0;
   int showMore = 1;
- 
+
   do {
     int32_t* length = taos_fetch_lengths(tres);
     if (numOfRows < resShowMaxNum) {
@@ -867,7 +873,7 @@ static int horizontalPrintResult(TAOS_RES* tres) {
         printf("[You can add limit statement to show more or redirect results to specific file to get all.]\n");
         showMore = 0;
     }
-    
+
     numOfRows++;
     row = taos_fetch_row(tres);
   } while(row != NULL);
@@ -909,7 +915,7 @@ void read_history() {
     if (errno != ENOENT) {
       fprintf(stderr, "Failed to open file %s, reason:%s\n", f_history, strerror(errno));
     }
-#endif    
+#endif
     return;
   }
 
@@ -934,9 +940,9 @@ void write_history() {
 
   FILE *f = fopen(f_history, "w");
   if (f == NULL) {
-#ifndef WINDOWS    
+#ifndef WINDOWS
     fprintf(stderr, "Failed to open file %s for write, reason:%s\n", f_history, strerror(errno));
-#endif    
+#endif
     return;
   }
 
@@ -982,13 +988,13 @@ void source_file(TAOS *con, char *fptr) {
   /*
   if (access(fname, F_OK) != 0) {
     fprintf(stderr, "ERROR: file %s is not exist\n", fptr);
-    
+
     wordfree(&full_path);
     free(cmd);
     return;
   }
   */
-  
+
   FILE *f = fopen(fname, "r");
   if (f == NULL) {
     fprintf(stderr, "ERROR: failed to open file %s\n", fname);

src/kit/shell/src/shellLinux.c

@@ -34,7 +34,7 @@ static char doc[] = "";
 static char args_doc[] = "";
 static struct argp_option options[] = {
   {"host",       'h', "HOST",       0,                   "TDengine server FQDN to connect. The default host is localhost."},
-  {"password",   'p', "PASSWORD",   OPTION_ARG_OPTIONAL, "The password to use when connecting to the server."},
+  {"password",   'p', 0,   0,                   "The password to use when connecting to the server."},
   {"port",       'P', "PORT",       0,                   "The TCP/IP port number to use for the connection."},
   {"user",       'u', "USER",       0,                   "The user name to use when connecting to the server."},
   {"auth",       'A', "Auth",       0,                   "The auth string to use when connecting to the server."},
@@ -63,8 +63,6 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
       arguments->host = arg;
       break;
     case 'p':
-      arguments->is_use_passwd = true;
-      if (arg) arguments->password = arg;
       break;
     case 'P':
       if (arg) {
@@ -160,12 +158,41 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
 /* Our argp parser. */
 static struct argp argp = {options, parse_opt, args_doc, doc};
 
+char      LINUXCLIENT_VERSION[] = "Welcome to the TDengine shell from %s, Client Version:%s\n"
+                             "Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.\n\n";
+char g_password[MAX_PASSWORD_SIZE];
+
+static void parse_password(
+        int argc, char *argv[], SShellArguments *arguments) {
+    for (int i = 1; i < argc; i++) {
+        if (strncmp(argv[i], "-p", 2) == 0) {
+            strcpy(tsOsName, "Linux");
+            printf(LINUXCLIENT_VERSION, tsOsName, taos_get_client_info());
+            if (strlen(argv[i]) == 2) {
+                printf("Enter password: ");
+                if (scanf("%20s", g_password) > 1) {
+                    fprintf(stderr, "password reading error\n");
+                }
+                getchar();
+            } else {
+                tstrncpy(g_password, (char *)(argv[i] + 2), MAX_PASSWORD_SIZE);
+            }
+            arguments->password = g_password;
+            arguments->is_use_passwd = true;
+        }
+    }
+}
+
 void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
   static char verType[32] = {0};
   sprintf(verType, "version: %s\n", version);
 
   argp_program_version = verType;
-  
+
+  if (argc > 1) {
+    parse_password(argc, argv, arguments);
+  }
+
   argp_parse(&argp, argc, argv, 0, 0, arguments);
   if (arguments->abort) {
     #ifndef _ALPINE

src/kit/shell/src/shellMain.c

@@ -71,7 +71,9 @@ int checkVersion() {
 // Global configurations
 SShellArguments args = {
   .host = NULL,
+#ifndef TD_WINDOWS
   .password = NULL,
+#endif
   .user = NULL,
   .database = NULL,
   .timezone = NULL,

src/kit/shell/src/shellWindows.c

@@ -19,6 +19,9 @@
 
 extern char configDir[];
 
+char      WINCLIENT_VERSION[] = "Welcome to the TDengine shell from %s, Client Version:%s\n"
+                             "Copyright (c) 2020 by TAOS Data, Inc. All rights reserved.\n\n";
+
 void printVersion() {
   printf("version: %s\n", version);
 }
@@ -61,6 +64,8 @@ void printHelp() {
   exit(EXIT_SUCCESS);
 }
 
+char g_password[MAX_PASSWORD_SIZE];
+
 void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
   for (int i = 1; i < argc; i++) {
     // for host
@@ -73,11 +78,20 @@ 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];
-      }
+    else if (strncmp(argv[i], "-p", 2) == 0) {
+        arguments->is_use_passwd = true;
+        strcpy(tsOsName, "Windows");
+        printf(WINCLIENT_VERSION, tsOsName, taos_get_client_info());
+        if (strlen(argv[i]) == 2) {
+            printf("Enter password: ");
+            if (scanf("%s", g_password) > 1) {
+                fprintf(stderr, "password read error!\n");
+            }
+            getchar();
+        } else {
+            tstrncpy(g_password, (char *)(argv[i] + 2), MAX_PASSWORD_SIZE);
+        }
+        arguments->password = g_password;
     }
     // for management port
     else if (strcmp(argv[i], "-P") == 0) {
@@ -104,7 +118,7 @@ void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
         exit(EXIT_FAILURE);
       }
     } else if (strcmp(argv[i], "-c") == 0) {
-      if (i < argc - 1) {   
+      if (i < argc - 1) {
         char *tmp = argv[++i];
         if (strlen(tmp) >= TSDB_FILENAME_LEN) {
           fprintf(stderr, "config file path: %s overflow max len %d\n", tmp, TSDB_FILENAME_LEN - 1);
@@ -265,7 +279,7 @@ void *shellLoopQuery(void *arg) {
   if (command == NULL) return NULL;
 
   int32_t err = 0;
-  
+
   do {
     memset(command, 0, MAX_COMMAND_SIZE);
     shellPrintPrompt();
@@ -274,7 +288,7 @@ void *shellLoopQuery(void *arg) {
     err = shellReadCommand(con, command);
     if (err) {
       break;
-    }    
+    }
   } while (shellRunCommand(con, command) == 0);
 
   return NULL;

src/kit/taosdemo/taosdemo.c

@@ -866,8 +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:");
-                scanf("%s", arguments->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);
             }

src/kit/taosdump/taosdump.c

@@ -206,9 +206,9 @@ static struct argp_option options[] = {
     {"host", 'h', "HOST",    0,  "Server host dumping data from. Default is localhost.", 0},
     {"user", 'u', "USER",    0,  "User name used to connect to server. Default is root.", 0},
 #ifdef _TD_POWER_
-    {"password", 'p', "PASSWORD",    0,  "User password to connect to server. Default is powerdb.", 0},
+    {"password", 'p', 0,    0,  "User password to connect to server. Default is powerdb.", 0},
 #else
-    {"password", 'p', "PASSWORD",    0,  "User password to connect to server. Default is taosdata.", 0},
+    {"password", 'p', 0,    0,  "User password to connect to server. Default is taosdata.", 0},
 #endif
     {"port", 'P', "PORT",        0,  "Port to connect", 0},
     {"cversion",      'v', "CVERION",     0,  "client version", 0},
@@ -248,12 +248,14 @@ static struct argp_option options[] = {
     {0}
 };
 
+#define MAX_PASSWORD_SIZE   20
+
 /* Used by main to communicate with parse_opt. */
 typedef struct arguments {
     // connection option
     char    *host;
     char    *user;
-    char    *password;
+    char    password[MAX_PASSWORD_SIZE];
     uint16_t port;
     char     cversion[12];
     uint16_t mysqlFlag;
@@ -376,7 +378,6 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
             g_args.user = arg;
             break;
         case 'p':
-            g_args.password = arg;
             break;
         case 'P':
             g_args.port = atoi(arg);
@@ -554,6 +555,25 @@ static void parse_precision_first(
     }
 }
 
+static void parse_password(
+        int argc, char *argv[], SArguments *arguments) {
+    for (int i = 1; i < argc; i++) {
+        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);
+            }
+            argv[i] = "";
+        }
+    }
+}
+
 static void parse_timestamp(
         int argc, char *argv[], SArguments *arguments) {
     for (int i = 1; i < argc; i++) {
@@ -616,9 +636,10 @@ int main(int argc, char *argv[]) {
     int ret = 0;
     /* Parse our arguments; every option seen by parse_opt will be
        reflected in arguments. */
-    if (argc > 2) {
+    if (argc > 1) {
         parse_precision_first(argc, argv, &g_args);
         parse_timestamp(argc, argv, &g_args);
+        parse_password(argc, argv, &g_args);
     }
 
     argp_parse(&argp, argc, argv, 0, 0, &g_args);

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

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;
+}
 

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;
+}
 

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;
+}