diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2020-01-17 12:59:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-17 12:59:50 +0100 |
| commit | fd89ad7bfb1534c42c99b36ca025ea42ccbee7e1 (patch) | |
| tree | e9a50ea156867a93c3031e09c6d85573d8c397e7 /src/nvim/main.c | |
| parent | 8fe0635e7338e32e8aedeb8f2e2c0f246876375c (diff) | |
| parent | 1e4f29069146cbab0be0559d87e399aefa433a29 (diff) | |
| download | rneovim-fd89ad7bfb1534c42c99b36ca025ea42ccbee7e1.tar.gz rneovim-fd89ad7bfb1534c42c99b36ca025ea42ccbee7e1.tar.bz2 rneovim-fd89ad7bfb1534c42c99b36ca025ea42ccbee7e1.zip | |
Merge pull request #11390 from erw7/feature-conpty
win/Terminal: Change to use ConPTY, if available
Diffstat (limited to 'src/nvim/main.c')
| -rw-r--r-- | src/nvim/main.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index c7011f4f4e..be279b449a 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -64,6 +64,9 @@ #include "nvim/os/os.h" #include "nvim/os/time.h" #include "nvim/os/fileio.h" +#ifdef WIN32 +# include "nvim/os/os_win_console.h" +#endif #include "nvim/event/loop.h" #include "nvim/os/signal.h" #include "nvim/event/process.h" @@ -1120,13 +1123,7 @@ scripterror: const int stdin_dup_fd = os_dup(STDIN_FILENO); #ifdef WIN32 // Replace the original stdin with the console input handle. - close(STDIN_FILENO); - const HANDLE conin_handle = - CreateFile("CONIN$", GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ, (LPSECURITY_ATTRIBUTES)NULL, - OPEN_EXISTING, 0, (HANDLE)NULL); - const int conin_fd = _open_osfhandle(conin_handle, _O_RDONLY); - assert(conin_fd == STDIN_FILENO); + os_replace_stdin_to_conin(); #endif FileDescriptor *const stdin_dup = file_open_fd_new( &error, stdin_dup_fd, kFileReadOnly|kFileNonBlocking); |