Browse Source

Merge branch 'bw/maint-1.7.9-solaris-getpass'

The recent update to terminal I/O interface to get passwords &c
interactively didn't quite work on Solaris.

* bw/maint-1.7.9-solaris-getpass:
  Enable HAVE_DEV_TTY for Solaris
  terminal: seek when switching between reading and writing
maint
Junio C Hamano 12 years ago
parent
commit
e5acacfb48
  1. 1
      Makefile
  2. 1
      compat/terminal.c

1
Makefile

@ -1014,6 +1014,7 @@ ifeq ($(uname_S),SunOS) @@ -1014,6 +1014,7 @@ ifeq ($(uname_S),SunOS)
NO_REGEX = YesPlease
NO_FNMATCH_CASEFOLD = YesPlease
NO_MSGFMT_EXTENDED_OPTIONS = YesPlease
HAVE_DEV_TTY = YesPlease
ifeq ($(uname_R),5.6)
SOCKLEN_T = int
NO_HSTRERROR = YesPlease

1
compat/terminal.c

@ -59,6 +59,7 @@ char *git_terminal_prompt(const char *prompt, int echo) @@ -59,6 +59,7 @@ char *git_terminal_prompt(const char *prompt, int echo)

r = strbuf_getline(&buf, fh, '\n');
if (!echo) {
fseek(fh, SEEK_CUR, 0);
putc('\n', fh);
fflush(fh);
}

Loading…
Cancel
Save