summaryrefslogtreecommitdiff
path: root/connect.c
diff options
context:
space:
mode:
authorFrank Li <lznuaa@gmail.com>2010-03-04 19:59:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-05 06:05:13 (GMT)
commitf206063b4b201ff48c87b886cbe21a068fcf6d49 (patch)
treeb26d68a8e97744309a87e381a80f87607a354db3 /connect.c
parent56a853b62c0ae7ebaad0a7a0a704f5ef561eb795 (diff)
downloadgit-f206063b4b201ff48c87b886cbe21a068fcf6d49.zip
git-f206063b4b201ff48c87b886cbe21a068fcf6d49.tar.gz
git-f206063b4b201ff48c87b886cbe21a068fcf6d49.tar.bz2
git-core: Support retrieving passwords with GIT_ASKPASS
git tries to read a password from the terminal in imap-send and when talking to a http server that requires authentication. When a GUI is driving git, however, the end user is not paying attention to the terminal (there may not even be a terminal). GUI would appear to hang forever. Fix this problem by allowing a password-retrieving command to be specified in GIT_ASKPASS Signed-off-by: Frank Li <lznuaa@gmail.com> Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'connect.c')
-rw-r--r--connect.c37
1 files changed, 37 insertions, 0 deletions
diff --git a/connect.c b/connect.c
index a37cf6a..e570aaf 100644
--- a/connect.c
+++ b/connect.c
@@ -647,3 +647,40 @@ int finish_connect(struct child_process *conn)
free(conn);
return code;
}
+
+char *git_getpass(const char *prompt)
+{
+ char *askpass;
+ struct child_process pass;
+ const char *args[3];
+ static struct strbuf buffer = STRBUF_INIT;
+
+ askpass = getenv("GIT_ASKPASS");
+
+ if (!askpass || !(*askpass))
+ return getpass(prompt);
+
+ args[0] = askpass;
+ args[1] = prompt;
+ args[2] = NULL;
+
+ memset(&pass, 0, sizeof(pass));
+ pass.argv = args;
+ pass.out = -1;
+
+ if (start_command(&pass))
+ exit(1);
+
+ strbuf_reset(&buffer);
+ if (strbuf_read(&buffer, pass.out, 20) < 0)
+ die("failed to read password from %s\n", askpass);
+
+ close(pass.out);
+
+ if (finish_command(&pass))
+ exit(1);
+
+ strbuf_setlen(&buffer, strcspn(buffer.buf, "\r\n"));
+
+ return buffer.buf;
+}