IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge #8228 from mhinz/fix-fgets

Browse Source
This commit is contained in:
Justin M. Keyes 2018-04-05 00:54:58 +02:00 committed by GitHub
commit d49c1dda8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/fileio.c
View File

@ -4452,7 +4452,7 @@ char *modname(const char *fname, const char *ext, bool prepend_dot)
/// @param size size of the buffer /// @param size size of the buffer
/// @param fp file to read from /// @param fp file to read from
/// ///
/// @return true for end-of-file. /// @return true for EOF or error
bool vim_fgets(char_u *buf, int size, FILE *fp) FUNC_ATTR_NONNULL_ALL bool vim_fgets(char_u *buf, int size, FILE *fp) FUNC_ATTR_NONNULL_ALL
{ {
char *retval; char *retval;
@ -4463,7 +4463,7 @@ bool vim_fgets(char_u *buf, int size, FILE *fp) FUNC_ATTR_NONNULL_ALL
do { do {
errno = 0; errno = 0;
retval = fgets((char *)buf, size, fp); retval = fgets((char *)buf, size, fp);
} while (retval == NULL && errno == EINTR); } while (retval == NULL && errno == EINTR && ferror(fp));
if (buf[size - 2] != NUL && buf[size - 2] != '\n') { if (buf[size - 2] != NUL && buf[size - 2] != '\n') {
char tbuf[200]; char tbuf[200];
@ -4475,12 +4475,12 @@ bool vim_fgets(char_u *buf, int size, FILE *fp) FUNC_ATTR_NONNULL_ALL
tbuf[sizeof(tbuf) - 2] = NUL; tbuf[sizeof(tbuf) - 2] = NUL;
errno = 0; errno = 0;
retval = fgets((char *)tbuf, sizeof(tbuf), fp); retval = fgets((char *)tbuf, sizeof(tbuf), fp);
if (retval == NULL && errno != EINTR) { if (retval == NULL && (feof(fp) || errno != EINTR)) {
break; break;
} }
} while (tbuf[sizeof(tbuf) - 2] != NUL && tbuf[sizeof(tbuf) - 2] != '\n'); } while (tbuf[sizeof(tbuf) - 2] != NUL && tbuf[sizeof(tbuf) - 2] != '\n');
} }
return retval ? false : feof(fp); return retval == NULL;
} }
/// Read 2 bytes from "fd" and turn them into an int, MSB first. /// Read 2 bytes from "fd" and turn them into an int, MSB first.