Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[RDY] win: Fix reading content from stdin #8267

Merged
merged 1 commit into from Apr 14, 2018
Merged

[RDY] win: Fix reading content from stdin #8267

merged 1 commit into from Apr 14, 2018

Conversation

b-r-o-c-k
Copy link
Contributor

Fixes #6890

@justinmk
Copy link
Member

Wonderful, this should allow us to nudge #6299

@janlazo
Copy link
Contributor

janlazo commented Apr 13, 2018 •
edited

@b-r-o-c-k I needed this bc43d25 for my PR since your msbuild workaround for lastexitcode didn't work for MINGW (or something else is happening). Does it need stderr redirected to stdout?

justinmk
justinmk reviewed Apr 13, 2018
View reviewed changes
src/nvim/fileio.c
close(0);
#ifndef WIN32
// On Unix, use stderr for stdin, makes shell commands work.
ignored = dup(2);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In Vim this is guarded by HAVE_DUP, which is defined for Windows (src/os_dos.h in Vim's source).

https://github.com/vim/vim/blob/e7499ddc33508d3d341e96f84a0e7b95b2d6927c/src/fileio.c#L2397-L2398

I wonder why it doesn't work in Nvim.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't really work in Vim either. When it fails to read from stdin it falls back to reading from the Windows console input buffer.

https://github.com/vim/vim/blob/e7499ddc33508d3d341e96f84a0e7b95b2d6927c/src/os_win32.c#L1703-L1714

@justinmk justinmk added this to the 0.3 milestone Apr 13, 2018
@justinmk justinmk mentioned this pull request Apr 13, 2018
Merged
@b-r-o-c-k b-r-o-c-k changed the title win: Fix reading content from stdin [RDY] win: Fix reading content from stdin Apr 13, 2018
@marvim marvim added the RDY label Apr 13, 2018
b-r-o-c-k
b-r-o-c-k commented Apr 14, 2018
View reviewed changes
src/nvim/tui/input.c Outdated
FILE_SHARE_READ, (LPSECURITY_ATTRIBUTES)NULL,
OPEN_EXISTING, 0, (HANDLE)NULL);
const int conin_fd = _open_osfhandle(conin_handle, _O_RDONLY);
uv_tty_init(loop, &input->tty_in, conin_fd, true);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's a better idea to move this patch to here because it's going to be less redundant. The patch won't need to be duplicated in #6299 if it's moved to here.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@b-r-o-c-k seems reasonable, but then it won't work for --headless (TUI is not started then). So some duplication or refactoring might still be needed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, this doesn't work for headless mode and I'm not sure if there's a good way to avoid the duplication so I'll just change it back to the way it was.

@justinmk
Copy link
Member

can you include your explanation from #8267 (comment) in the commit message?

@b-r-o-c-k
win: Fix reading content from stdin
f1e8510 
Fixes neovim#6890 by reading from the Windows console input buffer after
stdin has been closed. Vim normally reads from this buffer when it
fails to read from stdin:
https://github.com/vim/vim/blob/e7499ddc33508d3d341e96f84a0e7b95b2d6927c/src/os_win32.c#L1703-L1714
b-r-o-c-k added a commit to b-r-o-c-k/neovim that referenced this pull request Apr 14, 2018
@b-r-o-c-k
win: Fix reading from stdin
72091f6 
* Reading from stdin on Windows is fixed in the same way as it was in
  neovim#8267.
* The file_read function was returning without filling the
  destination buffer when it was called with a non-blocking file
  descriptor.
b-r-o-c-k added a commit to b-r-o-c-k/neovim that referenced this pull request Apr 14, 2018
@b-r-o-c-k
win: Fix reading from stdin
387fbcd 
* Reading from stdin on Windows is fixed in the same way as it was in
  neovim#8267.
* The file_read function was returning without filling the
  destination buffer when it was called with a non-blocking file
  descriptor.
@justinmk justinmk merged commit ee4e1fd into neovim:master Apr 14, 2018
@justinmk justinmk removed the RDY label Apr 14, 2018
@b-r-o-c-k b-r-o-c-k deleted the fix-win-stdin branch April 14, 2018 20:00
b-r-o-c-k added a commit to b-r-o-c-k/neovim that referenced this pull request Apr 14, 2018
@b-r-o-c-k
win: Fix reading from stdin
d0fa556 
* Reading from stdin on Windows is fixed in the same way as it was in
  neovim#8267.
* The file_read function was returning without filling the
  destination buffer when it was called with a non-blocking file
  descriptor.
@justinmk justinmk added the gsoc community: Google Summer of Code project label Apr 24, 2018
justinmk added a commit that referenced this pull request Jun 11, 2018
@justinmk
NVIM v0.3.0
44c6deb 
FEATURES:
3cc7ebf #7234 built-in VimL expression parser
6a7c904 #4419 implement <Cmd> key to invoke command in any mode
b836328 #7679 'startup: treat stdin as text instead of commands'
58b210e :digraphs : highlight with hl-SpecialKey #2690
7a13611 #8276 'startup: Let `-s -` read from stdin'
1e71978 events: VimSuspend, VimResume #8280
1e7d5e8 #6272 'stdpath()'
f96d99a #8247 server: introduce --listen
e8c39f7 #8226 insert-mode: interpret unmapped META as ESC
98e7112 msg: do not scroll entire screen (#8088)
f72630b #8055 let negative 'writedelay' show all redraws
5d2dd2e win: has("wsl") on Windows Subsystem for Linux #7330
a4f6cec cmdline: CmdlineEnter and CmdlineLeave autocommands (#7422)
207b7ca #6844 channels: support buffered output and bytes sockets/stdio

API:
f85cbea #7917 API: buffer updates
418abfc #6743 API: list information about all channels/jobs.
36b2e3f #8375 API: nvim_get_commands
273d2cd #8329 API: Make nvim_set_option() update `:verbose set …`
8d40b36 #8371 API: more reliable/descriptive VimL errors
ebb1acb #8353 API: nvim_call_dict_function
9f994bb #8004 API: nvim_list_uis
3405704 #7520 API/UI: forward option updates to UIs
911b1e4 #7821 API: improve nvim_command_output

WINDOWS OS:
9cefd83 #8084, #8516 build/win: support MSVC
ee4e1fd win: Fix reading content from stdin (#8267)

TUI:
ffb8904 #8309 TUI: add support for mouse release events in urxvt
8d5a46e #8081 TUI: implement "standout" attribute
6071637 TUI: support TERM=konsole-256color
67848c0 #7653 TUI: report TUI info with -V3 ('verbose' >= 3)
3d0ee17 TUI/rxvt: enable focus-reporting
d109f56 #7640 TUI: 'term' option: reflect effective terminal behavior

FIXES:
ed6a113 #8273 'job-control: avoid kill-timer race'
4e02f1a #8107 'jobs: separate process-group'
451c48a terminal: flush vterm output buffer on pty output #8486
5d6732f :checkhealth fixes #8335
53f11dc #8218 'Fix errors reported by PVS'
d05712f inccommand: pause :terminal redraws (#8307)
51af911 inccommand: do not execute trailing commands #8256
84359a4 terminal: resize to the max dimensions (#8249)
d49c1dd #8228 Make vim_fgets() return the same values as in Vim
60e96a4 screen: winhl=Normal:Background should not override syntax (#8093)
0c59ac1 #5908 'shada: Also save numbered marks'
ba87a2c cscope: ignore EINTR while reading the prompt (#8079)
b1412dc #7971 ':terminal Enter/Leave should not increment jumplist'
3a5721e TUI: libtermkey: force CSI driver for mouse input #7948
6ff13d7 #7720 TUI: faster startup
1c6e956 #7862 TUI: fix resize-related segfaults
a58c909 #7676 TUI: always hide cursor when flushing, never flush buffers during unibilium output
303e1df #7624 TUI: disable BCE almost always
249bdb0 #7761 mark: Make sure that jumplist item will not have zero lnum
6f41ce0 #7704 macOS: Set $LANG based on the system locale
a043899 #7633 'Retry fgets on EINTR'

CHANGES:
ad60927 #8304 default to 'nofsync'
f3f1970 #8035 defaults: 'fillchars'
a6052c7 #7984 defaults: sidescroll=1
b69fa86 #7888 defaults: enable cscopeverbose
7c4bb23 defaults: do :filetype stuff unless explicitly "off"
2aa308c #5658 'Apply :lmap in macros'
8ce6393 terminal: Leave 'relativenumber' alone (#8360)
e46534b #4486 refactor: Remove maxmem, maxmemtot options
131aad9 win: defaults: 'shellcmdflag', 'shellxquote' #7343
c57d315 #8031 jobwait(): return -2 on interrupt also with timeout
6452831 clipboard: macOS: fallback to tmux if pbcopy is broken #7940
300d365 #7919 Make 'langnoremap' apply directly after a map
ada1956 #7880 'lua/executor: Remove lightuserdata'

INTERNAL:
de0a954 #7806 internal statistics for list impl
dee78a4 #7708 rewrite internal list impl
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@justinmk justinmk justinmk left review comments

Assignees
No one assigned
Labels
gsoc community: Google Summer of Code project platform:windows
Projects
None yet
Milestone
0.3
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@b-r-o-c-k @justinmk @janlazo @marvim