[PATCHv2 6/9] prompt: use git_terminal_prompt
- From
Jeff King <peff@peff.net>
- Date
- Dec 10, 2011, 10:41 UTC
- Message-ID
- <20111210104108.GF16648@sigill.intra.peff.net>
- In-Reply-To
- <20111210103943.GA16478@sigill.intra.peff.net>
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 <peff@peff.net> --- prompt.c | 3 ++- prompt.h | 1 + 2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/prompt.c b/prompt.c index 2002644..72ab9de 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 @@ 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 9ab85a7..04f321a 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);
-- 1.7.8.rc2.40.gaf387