CLI: added the possibility to interrupt hanging commands with CTRL+C.

[ngadmin] / cli / com_password.c

diff --git a/cli/com_password.c b/cli/com_password.c
index f93412ef79ae82219b68c134757571b29ece58fb..92e96c6067c22c61c8ad2cb89351aa4564fe0a4a 100644 (file)
--- a/cli/com_password.c
+++ b/cli/com_password.c
@@ -32,15 +32,36 @@ bool do_password_change (int nb, const char **com, struct ngadmin *nga) {
 bool do_password_set (int nb, const char **com, struct ngadmin *nga) {
  
  int i;
+ char buf[64];
+ const char *pass;
  
  
- if ( nb!=1 ) {
-  printf("Usage: password set <value>\n");
+ if ( nb>1 ) {
+  printf("Usage: password set [<value>]\n");
   return false;
  }
  
- i=ngadmin_setPassword(nga, com[0]);
- printErrCode(i);
+ 
+ if ( nb==0 ) {
+  printf("Enter password: ");
+  fflush(stdout);
+  current_term.c_lflag&=~ECHO;
+  tcsetattr(STDIN_FILENO, TCSANOW, &current_term);
+  pass=fgets(buf, sizeof(buf), stdin);
+  trim(buf, strlen(buf));
+  current_term.c_lflag|=ECHO;
+  tcsetattr(STDIN_FILENO, TCSANOW, &current_term);
+  putchar('\n');
+ } else {
+  pass=com[0];
+ }
+ 
+ 
+ if ( pass!=NULL ) {
+  i=ngadmin_setPassword(nga, pass);
+  printErrCode(i);
+ }
+ 
  
  
  return true;