Better MSys PTY detection #102
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 04cde24. The MSYS_TTY_HANDLES trick doesn't work in a second shell window. Additionally, #undef'ing 'isatty()' at the top of mingw.c breaks yes / no questions (ask_yes_no_if_possible()) and probably other uses of isatty() in mingw.c. Signed-off-by: Karsten Blees <blees@dcon.de>
MSys2 emulates pseudo terminals via named pipes, and isatty() returns 0
for such file descriptors. Therefore, some interactive functionality (such
as launching a pager, asking if a failed unlink should be repeated etc.)
doesn't work when run in a terminal emulator that uses MSys ptys (such as
mintty).
However, MSys uses special names for its pty pipes ('msys-*-pty*'), which
allows us to distinguish them from normal piped input / output.
On startup, check if stdin / stdout / stderr are connected to such pipes
using the NtQueryObject API from NTDll.dll. If the names match, adjust the
flags in MSVCRT's ioinfo structure accordingly.
Signed-off-by: Karsten Blees <blees@dcon.de>
|
Sorry about the amount of comments, but I am pretty jazzed about your approach: it makes much more sense than my original code. |
|
See master...dscho:kb/msys-tty for my suggested changes. @kblees don't worry if you do not have time to review or comment, I'll just go with what I have, perform a merging rebase onto 2.3.6 and then we'll take it from there, okay? |
dscho
added a commit
that referenced
this pull request
Apr 22, 2015
Better MSys PTY detection Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho
added this to the First release of Git for Windows generated using the new SDK milestone
@dscho Thanks, I've been AFK for the past two weeks, still working off the backlog... |
|
No worries! Hope you had a good time. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes issue #85 and part of issue #74