From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 15 Apr 2020 09:59:30 +0000 (+0200)
Subject: ask-password: prefix password questions with lock and key emoji
X-Git-Tag: v246-rc1~587^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52d199e318b8fc0428f5753d999899a55ebbb2b4;p=thirdparty%2Fsystemd.git

ask-password: prefix password questions with lock and key emoji

It's pretty, and it highlights that the pw prompt is kinda special and
needs user input.

We suppress the emoji entirel if there's no emoji support (i.e. this
means we suppress the ASCII replacement), since it carries no additional
information, it is just decoration to highlight a line.
---

diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index b64663bd1e0..3a76ea4f670 100644
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -27,6 +27,7 @@
 #include "format-util.h"
 #include "fs-util.h"
 #include "io-util.h"
+#include "locale-util.h"
 #include "log.h"
 #include "macro.h"
 #include "memory-util.h"
@@ -430,6 +431,9 @@ int ask_password_tty(
         if (!message)
                 message = "Password:";
 
+        if (emoji_enabled())
+                message = strjoina(special_glyph(SPECIAL_GLYPH_LOCK_AND_KEY), " ", message);
+
         if (flag_file || ((flags & ASK_PASSWORD_ACCEPT_CACHED) && keyname)) {
                 notify = inotify_init1(IN_CLOEXEC|IN_NONBLOCK);
                 if (notify < 0)