credential: use git_prompt instead of git_getpass
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>
Jeff King committed
Dec 10, 2011 at 05:41 UTC
ce77aa4813c8a3980283c0a1e760f51f3a405154
1 file changed
+7
-8
credential.c
+7
-8
@@ -109,7 +109,8 @@ static void credential_describe(struct credential *c, struct strbuf *out)
109
strbuf_addf(out, "/%s", c->path);
110
}
111
112
-static char *credential_ask_one(const char *what, struct credential *c)
112
+static char *credential_ask_one(const char *what, struct credential *c,
113
+ int flags)
114
{
115
struct strbuf desc = STRBUF_INIT;
116
struct strbuf prompt = STRBUF_INIT;
@@ -121,11 +122,7 @@ static char *credential_ask_one(const char *what, struct credential *c)
122
else
123
strbuf_addf(&prompt, "%s: ", what);
124
124
- /* FIXME: for usernames, we should do something less magical that
125
- * actually echoes the characters. However, we need to read from
126
- * /dev/tty and not stdio, which is not portable (but getpass will do
127
- * it for us). http.c uses the same workaround. */
128
- r = git_getpass(prompt.buf);
125
+ r = git_prompt(prompt.buf, flags);
126
127
strbuf_release(&desc);
128
strbuf_release(&prompt);
@@ -135,9 +132,11 @@ static char *credential_ask_one(const char *what, struct credential *c)
132
static void credential_getpass(struct credential *c)
133
{
134
if (!c->username)
138
- c->username = credential_ask_one("Username", c);
135
+ c->username = credential_ask_one("Username", c,
136
+ PROMPT_ASKPASS|PROMPT_ECHO);
137
if (!c->password)
140
- c->password = credential_ask_one("Password", c);
138
+ c->password = credential_ask_one("Password", c,
139
+ PROMPT_ASKPASS);
140
}
141
142
int credential_read(struct credential *c, FILE *fp)