imap-send and authority http connect reads passwords from an interactive
terminal. This behavious cause GUIs to hang waiting for git complete.
Fix this problem by allowing a password-retrieving command
to be specified in GIT_ASKPASS
Signed-off-by: Frank Li <lznuaa@xxxxxxxxx>
---
connect.c | 40 ++++++++++++++++++++++++++++++++++++++++
http.c | 4 ++--
imap-send.c | 2 +-
3 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/connect.c b/connect.c
index a37cf6a..6a8e3ab 100644
--- a/connect.c
+++ b/connect.c
@@ -647,3 +647,43 @@ int finish_connect(struct child_process *conn)
free(conn);
return code;
}
+
+char *git_getpass(char *prompt)
+{
+ char *askpass;
+ struct child_process pass;
+ const char *args[3];
+ struct strbuf buffer = STRBUF_INIT;
+ int i = 0;
+
+ askpass = getenv("GIT_ASKPASS");
+ if (askpass && strlen(askpass) != 0) {
+ args[0] = getenv("GIT_ASKPASS");
+ args[1] = prompt;
+ args[2] = NULL;
+
+ memset(&pass, 0, sizeof(pass));
+ pass.argv = args;
+ pass.out = -1;
+ pass.no_stdin = 1;
+ pass.no_stderr = 1;
+
+ if (start_command(&pass)) {
+ error("could not run %s\n", askpass);
+ return getpass(prompt);
+ }
+
+ strbuf_read(&buffer, pass.out, 20);
+ close(pass.out);
+ for (i = 0; i < buffer.len; i++)
+ if (buffer.buf[i] == '\n' || buffer.buf[i] == '\r') {
+ buffer.buf[i] = '\0';
+ buffer.len = i;
+ }
+ return strbuf_detach(&buffer, NULL);
+
+ } else {
+ return getpass(prompt);
+ }
+ return NULL;
+}
diff --git a/http.c b/http.c
index deab595..4814217 100644
--- a/http.c
+++ b/http.c
@@ -204,7 +204,7 @@ static void init_curl_http_auth(CURL *result)
if (user_name) {
struct strbuf up = STRBUF_INIT;
if (!user_pass)
- user_pass = xstrdup(getpass("Password: "));
+ user_pass = xstrdup(git_getpass("Password: "));
strbuf_addf(&up, "%s:%s", user_name, user_pass);
curl_easy_setopt(result, CURLOPT_USERPWD,
strbuf_detach(&up, NULL));
@@ -219,7 +219,7 @@ static int has_cert_password(void)
return 0;
/* Only prompt the user once. */
ssl_cert_password_required = -1;
- ssl_cert_password = getpass("Certificate Password: ");
+ ssl_cert_password = git_getpass("Certificate Password: ");
if (ssl_cert_password != NULL) {
ssl_cert_password = xstrdup(ssl_cert_password);
return 1;
diff --git a/imap-send.c b/imap-send.c
index 5631930..5254b2a 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -1107,7 +1107,7 @@ static struct store *imap_open_store(struct imap_server_conf *srvc)
if (!srvc->pass) {
char prompt[80];
sprintf(prompt, "Password (%s@%s): ", srvc->user, srvc->host);
- arg = getpass(prompt);
+ arg = git_getpass(prompt);
if (!arg) {
perror("getpass");
exit(1);
--
1.7.0.85.g37fda.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html