TD-1244

src/os/inc/osWindows.h

@@ -39,6 +39,7 @@
 #include <Winsock2.h>
 #include <time.h>
 #include <inttypes.h>
+#include <conio.h>
 #include "msvcProcess.h"
 #include "msvcDirect.h"
 #include "msvcFcntl.h"

src/os/src/windows/wString.c

@@ -58,11 +58,20 @@ char *strsep(char **stringp, const char *delim) {
 
 char *getpass(const char *prefix) {
   static char passwd[TSDB_KEY_LEN] = {0};
-
+  memset(passwd, 0, TSDB_KEY_LEN);
   printf("%s", prefix);
-  scanf("%s", passwd);
 
-  char n = getchar();
+  int32_t index = 0;
+  char    ch;
+  while (index < TSDB_KEY_LEN) {
+    ch = getch();
+    if (ch == '\n' || ch == '\r') {
+      break;
+    } else {
+      passwd[index++] = ch;
+    }
+  }
+
   return passwd;
 }
 
@@ -131,11 +140,11 @@ int tasoUcs4Compare(void *f1_ucs4, void *f2_ucs4, int bytes) {
 }
 
 
-/* Copy memory to memory until the specified number of bytes
-has been copied, return pointer to following byte.
-Overlap is NOT handled correctly. */
-void *mempcpy(void *dest, const void *src, size_t len) {
-  return (char*)memcpy(dest, src, len) + len;
+/* Copy memory to memory until the specified number of bytes
+has been copied, return pointer to following byte.
+Overlap is NOT handled correctly. */
+void *mempcpy(void *dest, const void *src, size_t len) {
+  return (char*)memcpy(dest, src, len) + len;
 }
 
 /* Copy SRC to DEST, returning the address of the terminating '\0' in DEST.  */