mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-26 04:00:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

getchar: Use fileio instead of fdopen

Browse Source 
Problem: as fileio is cached and reads blocks this is going to wait
until either EOF or reading enough characters to fill rbuffer. This is
not good when reading user input from stdin as script.
This commit is contained in:
ZyX
2017-03-19 16:55:37 +03:00
parent fdfa1ed578
commit bd798a3267
7 changed files with 115 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/nvim/main.c
View File

@@ -1056,14 +1056,20 @@ scripterror:
mch_errmsg("\"\n");
mch_exit(2);
}
int error;
if (STRCMP(argv[0], "-") == 0) {
const int stdin_dup_fd = os_dup(STDIN_FILENO);
FILE *const stdin_dup = fdopen(stdin_dup_fd, "r");
const int stdin_dup_fd = os_dup(OS_STDIN_FILENO);
FileDescriptor *const stdin_dup = file_open_fd_new(
&error, stdin_dup_fd, false, 0);
assert(stdin_dup != NULL);
scriptin[0] = stdin_dup;
} else if ((scriptin[0] = mch_fopen(argv[0], READBIN)) == NULL) {
} else if ((scriptin[0] = file_open_new(
&error, argv[0], kFileReadOnly, 0)) == NULL) {
mch_errmsg(_("Cannot open for reading: \""));
mch_errmsg(argv[0]);
mch_errmsg("\"\n");
mch_errmsg("\": ");
mch_errmsg(os_strerror(error));
mch_errmsg("\n");
mch_exit(2);
}
save_typebuf();