chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ask-password: use TAB instead of backspace to disable asterisk password echo
[elogind.git]
/
src
/
ask-password-api.c
diff --git
a/src/ask-password-api.c
b/src/ask-password-api.c
index 022f1cae8caddff65f28a8fbecff8fc1a19449e6..cb0559065d8ed4808ede95a3fd3d7e07d896823a 100644
(file)
--- a/
src/ask-password-api.c
+++ b/
src/ask-password-api.c
@@
-36,6
+36,18
@@
#include "ask-password-api.h"
#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,
int ask_password_tty(
const char *message,
usec_t until,
@@
-156,24
+168,30
@@
int ask_password_tty(
if (c == '\n')
break;
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) {
} 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--;
p--;
+ } else if (ttyfd >= 0)
+ loop_write(ttyfd, "\a", 1, false);
- if (ttyfd >= 0)
- loop_write(ttyfd, "\b \b", 3, false);
- }
+ } else if (c == '\t' && !silent_mode) {
+
+ backspace_chars(ttyfd, p);
+ silent_mode = true;
+
+ if (ttyfd >= 0)
+ loop_write(ttyfd, "(no echo) ", 10, false);
} else {
passphrase[p++] = c;
} else {
passphrase[p++] = c;