From a50902590e703878e888fd8a33ec5a22d5347481 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sat, 10 Dec 2011 05:41:08 -0500 Subject: [PATCH] prompt: use git_terminal_prompt Our custom implementation of git_terminal_prompt has many advantages over regular getpass(), as described in the prior commit. This also lets us implement a PROMPT_ECHO flag for callers who want it. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- prompt.c | 3 ++- prompt.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/prompt.c b/prompt.c index 20026444c018d0..72ab9de2f94be3 100644 --- a/prompt.c +++ b/prompt.c @@ -2,6 +2,7 @@ #include "run-command.h" #include "strbuf.h" #include "prompt.h" +#include "compat/terminal.h" static char *do_askpass(const char *cmd, const char *prompt) { @@ -50,7 +51,7 @@ char *git_prompt(const char *prompt, int flags) return do_askpass(askpass, prompt); } - r = getpass(prompt); + r = git_terminal_prompt(prompt, flags & PROMPT_ECHO); if (!r) die_errno("could not read '%s'", prompt); return r; diff --git a/prompt.h b/prompt.h index 9ab85a78a24db8..04f321a781d37a 100644 --- a/prompt.h +++ b/prompt.h @@ -2,6 +2,7 @@ #define PROMPT_H #define PROMPT_ASKPASS (1<<0) +#define PROMPT_ECHO (1<<1) char *git_prompt(const char *prompt, int flags); char *git_getpass(const char *prompt);