X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fask-password-api.c;h=9f7023e32847ae14fb40e37f4ca949623738dd5b;hp=2441df3d24d35767584419bbbeaf4d42bcfc1830;hb=71656790d6540f817661cc22b8bc1d33720ce96a;hpb=7f4e08056de0184b205a20632e62db73d299937e diff --git a/src/ask-password-api.c b/src/ask-password-api.c index 2441df3d2..9f7023e32 100644 --- a/src/ask-password-api.c +++ b/src/ask-password-api.c @@ -76,7 +76,7 @@ int ask_password_tty( loop_write(ttyfd, "\x1B[1m", 4, false); loop_write(ttyfd, message, strlen(message), false); - loop_write(ttyfd, ": ", 2, false); + loop_write(ttyfd, " ", 1, false); loop_write(ttyfd, "\x1B[0m", 4, false); new_termios = old_termios; @@ -480,3 +480,13 @@ finish: return r; } + +int ask_password_auto(const char *message, const char *icon, usec_t until, char **_passphrase) { + assert(message); + assert(_passphrase); + + if (isatty(STDIN_FILENO)) + return ask_password_tty(message, until, NULL, _passphrase); + else + return ask_password_agent(message, icon, until, _passphrase); +}