undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* bw/maint-1.7.9-solaris-getpass:
  Enable HAVE_DEV_TTY for Solaris
  terminal: seek when switching between reading and writing
This commit is contained in:
Junio C Hamano 2012-08-24 12:05:11 -07:00
commit 3f988231ae
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

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

1
compat/terminal.c
View File

@ -59,6 +59,7 @@ char *git_terminal_prompt(const char *prompt, int echo)
r = strbuf_getline(&buf, fh, '\n'); r = strbuf_getline(&buf, fh, '\n');
if (!echo) { if (!echo) {
fseek(fh, SEEK_CUR, 0);
putc('\n', fh); putc('\n', fh);
fflush(fh); fflush(fh);
} }