diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2018-04-07 15:08:12 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2018-04-07 15:08:12 +0200 |
| commit | 77cb6b99a436c20bb171e6cdad7b8b8b5ce3692c (patch) | |
| tree | d00b5b460baa99be5547a2236790dbea31f90a5d /loginutils | |
| parent | 2f094ae82106e91cb210e79ddc2e5285377b549e (diff) | |
| download | busybox-77cb6b99a436c20bb171e6cdad7b8b8b5ce3692c.tar.gz | |
libbb: rename bb_ask -> bb_ask_noecho, bb_ask_confirmation -> bb_ask_y_confirmation
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'loginutils')
| -rw-r--r-- | loginutils/cryptpw.c | 2 | ||||
| -rw-r--r-- | loginutils/passwd.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c index 76138a61f..3ca7eda4a 100644 --- a/loginutils/cryptpw.c +++ b/loginutils/cryptpw.c @@ -134,7 +134,7 @@ int cryptpw_main(int argc UNUSED_PARAM, char **argv) /* Only mkpasswd, and only from tty, prompts. * Otherwise it is a plain read. */ password = (ENABLE_MKPASSWD && isatty(STDIN_FILENO) && applet_name[0] == 'm') - ? bb_ask_stdin("Password: ") + ? bb_ask_noecho_stdin("Password: ") : xmalloc_fgetline(stdin) ; /* may still be NULL on EOF/error */ diff --git a/loginutils/passwd.c b/loginutils/passwd.c index 3e1ef9abf..02303b575 100644 --- a/loginutils/passwd.c +++ b/loginutils/passwd.c @@ -52,7 +52,7 @@ static char* new_password(const struct passwd *pw, uid_t myuid, const char *algo if (myuid != 0 && pw->pw_passwd[0]) { char *encrypted; - orig = bb_ask_stdin("Old password: "); /* returns ptr to static */ + orig = bb_ask_noecho_stdin("Old password: "); /* returns ptr to static */ if (!orig) goto err_ret; encrypted = pw_encrypt(orig, pw->pw_passwd, 1); /* returns malloced str */ @@ -65,11 +65,11 @@ static char* new_password(const struct passwd *pw, uid_t myuid, const char *algo if (ENABLE_FEATURE_CLEAN_UP) free(encrypted); } - orig = xstrdup(orig); /* or else bb_ask_stdin() will destroy it */ - newp = bb_ask_stdin("New password: "); /* returns ptr to static */ + orig = xstrdup(orig); /* or else bb_ask_noecho_stdin() will destroy it */ + newp = bb_ask_noecho_stdin("New password: "); /* returns ptr to static */ if (!newp) goto err_ret; - newp = xstrdup(newp); /* we are going to bb_ask_stdin() again, so save it */ + newp = xstrdup(newp); /* we are going to bb_ask_noecho_stdin() again, so save it */ if (ENABLE_FEATURE_PASSWD_WEAK_CHECK && obscure(orig, newp, pw) && myuid != 0 @@ -77,7 +77,7 @@ static char* new_password(const struct passwd *pw, uid_t myuid, const char *algo goto err_ret; /* non-root is not allowed to have weak passwd */ } - cp = bb_ask_stdin("Retype password: "); + cp = bb_ask_noecho_stdin("Retype password: "); if (!cp) goto err_ret; if (strcmp(cp, newp) != 0) { |