Changeset 34999

Timestamp:

Jan 20, 2013, 7:07:04 AM (13 years ago)

Author:

eugene

Message:

add in-line password for tests

File:

• branches/eam_branches/ipp-20121219/Ohana/src/opihi/cmd.data/dbconnect.c (modified) (2 diffs)

branches/eam_branches/ipp-20121219/Ohana/src/opihi/cmd.data/dbconnect.c

@@ -8 +8 @@
 int dbconnect (int argc, char **argv) {
   
+  int N;
   char query[256];
-  char password[1024];
   MYSQL_RES *result;
+
+  char *password = NULL;
+  if ((N = get_argument (argc, argv, "-p"))) {
+    remove_argument (N, &argc, argv);
+    password = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
 
   if (argc != 4) {
@@ -17 +24 @@
   }
 
-  fprintf (stdout, "Enter password: ");
-  scan_line (stdin, password);
+  if (!password) {
+      ALLOCATE (password, char, 1024);
+      fprintf (stdout, "Enter password: ");
+      scan_line (stdin, password);
 
 # if (0)
-  int i;
-  char c;
+      int i;
+      char c;
 
-  initscr();
-  noecho();
-  i = 0;
-  while (((c = getch()) != EOF) && (c != '\n')) {
-    password[i] = c;
-    i++;
+      initscr();
+      noecho();
+      i = 0;
+      while (((c = getch()) != EOF) && (c != '\n')) {
+          password[i] = c;
+          i++;
+      }
+      password[i] = 0;
+# endif
   }
-  password[i] = 0;
-# endif
 
   // XXX do I need to call mysql_library_init()?