Browse Source

move git_getpass to its own source file

This is currently in connect.c, but really has nothing to
do with the git protocol itself. Let's make a new source
file all about prompting the user, which will make it
cleaner to refactor.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 13 years ago committed by Junio C Hamano
parent
commit
d3c58b83ae
  1. 2
      Makefile
  2. 1
      cache.h
  3. 44
      connect.c
  4. 1
      credential.c
  5. 1
      imap-send.c
  6. 48
      prompt.c
  7. 6
      prompt.h

2
Makefile

@ -563,6 +563,7 @@ LIB_H += parse-options.h @@ -563,6 +563,7 @@ LIB_H += parse-options.h
LIB_H += patch-ids.h
LIB_H += pkt-line.h
LIB_H += progress.h
LIB_H += prompt.h
LIB_H += quote.h
LIB_H += reflog-walk.h
LIB_H += refs.h
@ -669,6 +670,7 @@ LIB_OBJS += pkt-line.o @@ -669,6 +670,7 @@ LIB_OBJS += pkt-line.o
LIB_OBJS += preload-index.o
LIB_OBJS += pretty.o
LIB_OBJS += progress.o
LIB_OBJS += prompt.o
LIB_OBJS += quote.o
LIB_OBJS += reachable.o
LIB_OBJS += read-cache.o

1
cache.h

@ -1024,7 +1024,6 @@ struct ref { @@ -1024,7 +1024,6 @@ struct ref {
extern struct ref *find_ref_by_name(const struct ref *list, const char *name);

#define CONNECT_VERBOSE (1u << 0)
extern char *git_getpass(const char *prompt);
extern struct child_process *git_connect(int fd[2], const char *url, const char *prog, int flags);
extern int finish_connect(struct child_process *conn);
extern int git_connection_is_socket(struct child_process *conn);

44
connect.c

@ -619,47 +619,3 @@ int finish_connect(struct child_process *conn) @@ -619,47 +619,3 @@ int finish_connect(struct child_process *conn)
free(conn);
return code;
}

char *git_getpass(const char *prompt)
{
const char *askpass;
struct child_process pass;
const char *args[3];
static struct strbuf buffer = STRBUF_INIT;

askpass = getenv("GIT_ASKPASS");
if (!askpass)
askpass = askpass_program;
if (!askpass)
askpass = getenv("SSH_ASKPASS");
if (!askpass || !(*askpass)) {
char *result = getpass(prompt);
if (!result)
die_errno("Could not read password");
return result;
}

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;
}

1
credential.c

@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
#include "string-list.h"
#include "run-command.h"
#include "url.h"
#include "prompt.h"

void credential_init(struct credential *c)
{

1
imap-send.c

@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
#include "cache.h"
#include "exec_cmd.h"
#include "run-command.h"
#include "prompt.h"
#ifdef NO_OPENSSL
typedef void *SSL;
#else

48
prompt.c

@ -0,0 +1,48 @@ @@ -0,0 +1,48 @@
#include "cache.h"
#include "run-command.h"
#include "strbuf.h"
#include "prompt.h"

char *git_getpass(const char *prompt)
{
const char *askpass;
struct child_process pass;
const char *args[3];
static struct strbuf buffer = STRBUF_INIT;

askpass = getenv("GIT_ASKPASS");
if (!askpass)
askpass = askpass_program;
if (!askpass)
askpass = getenv("SSH_ASKPASS");
if (!askpass || !(*askpass)) {
char *result = getpass(prompt);
if (!result)
die_errno("Could not read password");
return result;
}

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;
}

6
prompt.h

@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
#ifndef PROMPT_H
#define PROMPT_H

char *git_getpass(const char *prompt);

#endif /* PROMPT_H */
Loading…
Cancel
Save