mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-02 15:28:21 +01:00
Code Activity

Merge branch 'jk/prompt-fallback-to-tty'

Browse source 
* jk/prompt-fallback-to-tty:
  prompt: fall back to terminal if askpass fails
  prompt: clean up strbuf usage
This commit is contained in:
Junio C Hamano 2012-02-12 22:43:34 -08:00
commit 974e978b09
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
prompt.c
View file

@ -9,6 +9,7 @@ static char *do_askpass(const char *cmd, const char *prompt)
struct child_process pass; struct child_process pass;
const char *args[3]; const char *args[3];
static struct strbuf buffer = STRBUF_INIT; static struct strbuf buffer = STRBUF_INIT;
int err = 0;
args[0] = cmd; args[0] = cmd;
args[1] = prompt; args[1] = prompt;
@ -19,25 +20,30 @@ static char *do_askpass(const char *cmd, const char *prompt)
pass.out = -1; pass.out = -1;
if (start_command(&pass)) if (start_command(&pass))
exit(1); return NULL;
strbuf_reset(&buffer);
if (strbuf_read(&buffer, pass.out, 20) < 0) if (strbuf_read(&buffer, pass.out, 20) < 0)
die("failed to get '%s' from %s\n", prompt, cmd); err = 1;
close(pass.out); close(pass.out);
if (finish_command(&pass)) if (finish_command(&pass))
exit(1); err = 1;
if (err) {
error("unable to read askpass response from '%s'", cmd);
strbuf_release(&buffer);
return NULL;
}
strbuf_setlen(&buffer, strcspn(buffer.buf, "\r\n")); strbuf_setlen(&buffer, strcspn(buffer.buf, "\r\n"));
return buffer.buf; return strbuf_detach(&buffer, NULL);
} }
char *git_prompt(const char *prompt, int flags) char *git_prompt(const char *prompt, int flags)
{ {
char *r; char *r = NULL;
if (flags & PROMPT_ASKPASS) { if (flags & PROMPT_ASKPASS) {
const char *askpass; const char *askpass;
@ -48,12 +54,15 @@ char *git_prompt(const char *prompt, int flags)
if (!askpass) if (!askpass)
askpass = getenv("SSH_ASKPASS"); askpass = getenv("SSH_ASKPASS");
if (askpass && *askpass) if (askpass && *askpass)
return do_askpass(askpass, prompt); r = do_askpass(askpass, prompt);
} }
r = git_terminal_prompt(prompt, flags & PROMPT_ECHO);
if (!r) if (!r)
die_errno("could not read '%s'", prompt); r = git_terminal_prompt(prompt, flags & PROMPT_ECHO);
if (!r) {
/* prompts already contain ": " at the end */
die("could not read %s%s", prompt, strerror(errno));
}
return r; return r;
} }