MB-43453: mcctl: Use passwd from env or stdin

Use a password stored in CB_PASSWORD if no password
is provided on the command line. If '-' is specified
as the password it'll read password from standard
input.

Make sure that the other command line utilities use
the same order to fetch password from standard input
or environment variable.

(Cherry-pick of f01365b to alice branch.)

Change-Id: I0f4a093de8b00a038a031c1f2e90872a8fa3ee1f
Reviewed-on: http://review.couchbase.org/c/kv_engine/+/142926
Reviewed-by: James Harrison <[email protected]>
Reviewed-by: Trond Norbye <[email protected]>
Well-Formed: Build Bot <[email protected]>
Tested-by: Trond Norbye <[email protected]>

Author: trondn

programs/mcctl/CMakeLists.txt

@@ -1,5 +1,6 @@
 ADD_EXECUTABLE(mcctl mcctl.cc)
 TARGET_LINK_LIBRARIES(mcctl
+                      getpass
                       mc_client_connection
                       mcd_util
                       mcutils

programs/mcctl/mcctl.cc

@@ -27,16 +27,16 @@
 #include <memcached/util.h>
 #include <platform/cb_malloc.h>
 #include <platform/platform.h>
+#include <programs/getpass.h>
 #include <programs/hostname_utils.h>
 #include <protocol/connection/client_connection.h>
 #include <protocol/connection/client_mcbp_commands.h>
 #include <utilities/protocol2text.h>
 #include <utilities/terminate_handler.h>
 
+#include <cstdio>
+#include <cstdlib>
 #include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <strings.h>
 
 /**
  * Get the verbosity level on the server.
@@ -187,6 +187,15 @@ int main(int argc, char** argv) {
         }
     }
 
+    if (password == "-") {
+        password.assign(getpass());
+    } else if (password.empty()) {
+        const char* env_password = std::getenv("CB_PASSWORD");
+        if (env_password) {
+            password = env_password;
+        }
+    }
+
     if (optind + 1 >= argc) {
          usage();
     }

programs/mctimings/mctimings.cc

@@ -506,17 +506,15 @@ int main(int argc, char** argv) {
         }
     }
 
-    if (password.empty()) {
+    if (password == "-") {
+        password.assign(getpass());
+    } else if (password.empty()) {
         const char* env_password = std::getenv("CB_PASSWORD");
         if (env_password) {
             password = env_password;
         }
     }
 
-    if (password == "-") {
-        password.assign(getpass());
-    }
-
     try {
         in_port_t in_port;
         sa_family_t fam;