mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

credential: use git_prompt instead of git_getpass

Browse Source 
We use git_getpass to retrieve the username and password
from the terminal. However, git_getpass will not echo the
username as the user types. We can fix this by using the
more generic git_prompt, which underlies git_getpass but
lets us specify an "echo" option.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2011-12-10 05:41:23 -05:00
committed by Junio C Hamano
parent a50902590e
commit ce77aa4813
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
credential.c
View File

@ -109,7 +109,8 @@ static void credential_describe(struct credential *c, struct strbuf *out)
strbuf_addf(out, "/%s", c->path); strbuf_addf(out, "/%s", c->path);
} }
static char *credential_ask_one(const char *what, struct credential *c) static char *credential_ask_one(const char *what, struct credential *c,
int flags)
{ {
struct strbuf desc = STRBUF_INIT; struct strbuf desc = STRBUF_INIT;
struct strbuf prompt = STRBUF_INIT; struct strbuf prompt = STRBUF_INIT;
@ -121,11 +122,7 @@ static char *credential_ask_one(const char *what, struct credential *c)
else else
strbuf_addf(&prompt, "%s: ", what); strbuf_addf(&prompt, "%s: ", what);
/* FIXME: for usernames, we should do something less magical that r = git_prompt(prompt.buf, flags);
* actually echoes the characters. However, we need to read from
* /dev/tty and not stdio, which is not portable (but getpass will do
* it for us). http.c uses the same workaround. */
r = git_getpass(prompt.buf);
strbuf_release(&desc); strbuf_release(&desc);
strbuf_release(&prompt); strbuf_release(&prompt);
@ -135,9 +132,11 @@ static char *credential_ask_one(const char *what, struct credential *c)
static void credential_getpass(struct credential *c) static void credential_getpass(struct credential *c)
{ {
if (!c->username) if (!c->username)
c->username = credential_ask_one("Username", c); c->username = credential_ask_one("Username", c,
PROMPT_ASKPASS|PROMPT_ECHO);
if (!c->password) if (!c->password)
c->password = credential_ask_one("Password", c); c->password = credential_ask_one("Password", c,
PROMPT_ASKPASS);
} }
int credential_read(struct credential *c, FILE *fp) int credential_read(struct credential *c, FILE *fp)