quota: do not pull in quota tools for mounts that do not originate in neither /etc...

[elogind.git] / src / ask-password-api.c

diff --git a/src/ask-password-api.c b/src/ask-password-api.c
index 022f1cae8caddff65f28a8fbecff8fc1a19449e6..da967ab7a1a638b10163fef471755a2652809d05 100644 (file)
--- a/src/ask-password-api.c
+++ b/src/ask-password-api.c
@@ -36,6 +36,18 @@
 
 #include "ask-password-api.h"
 
+static void backspace_chars(int ttyfd, size_t p) {
+
+        if (ttyfd < 0)
+                return;
+
+        while (p > 0) {
+                p--;
+
+                loop_write(ttyfd, "\b \b", 3, false);
+        }
+}
+
 int ask_password_tty(
                 const char *message,
                 usec_t until,
@@ -49,6 +61,7 @@ int ask_password_tty(
         struct pollfd pollfd[2];
         bool reset_tty = false;
         bool silent_mode = false;
+        bool dirty = false;
         enum {
                 POLL_TTY,
                 POLL_INOTIFY
@@ -156,29 +169,50 @@ int ask_password_tty(
 
                 if (c == '\n')
                         break;
-                else if (c == 21) {
-                        while (p > 0) {
-                                p--;
+                else if (c == 21) { /* C-u */
 
-                                if (ttyfd >= 0)
-                                        loop_write(ttyfd, "\b \b", 3, false);
-                        }
+                        if (!silent_mode)
+                                backspace_chars(ttyfd, p);
+                        p = 0;
 
                 } else if (c == '\b' || c == 127) {
-                        if (p == 0 && !silent_mode) {
-                                silent_mode = true;
-                                loop_write(ttyfd, "(no echo) ", 10, false);
-                        } else if (p > 0) {
+
+                        if (p > 0) {
+
+                                if (!silent_mode)
+                                        backspace_chars(ttyfd, 1);
+
                                 p--;
+                        } else if (!dirty && !silent_mode) {
+
+                                silent_mode = true;
 
+                                /* There are two ways to enter silent
+                                 * mode. Either by pressing backspace
+                                 * as first key (and only as first key),
+                                 * or ... */
                                 if (ttyfd >= 0)
-                                        loop_write(ttyfd, "\b \b", 3, false);
-                        }
+                                        loop_write(ttyfd, "(no echo) ", 10, false);
+
+                        } else if (ttyfd >= 0)
+                                loop_write(ttyfd, "\a", 1, false);
+
+                } else if (c == '\t' && !silent_mode) {
+
+                        backspace_chars(ttyfd, p);
+                        silent_mode = true;
+
+                        /* ... or by pressing TAB at any time. */
+
+                        if (ttyfd >= 0)
+                                loop_write(ttyfd, "(no echo) ", 10, false);
                 } else {
                         passphrase[p++] = c;
 
                         if (!silent_mode && ttyfd >= 0)
                                 loop_write(ttyfd, "*", 1, false);
+
+                        dirty = true;
                 }
         }