mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-07-22 09:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(fileio.c): avoid downcasting in {read,write}_eintr() (#37323)

Browse Source 
(cherry picked from commit 272ec9627c)
This commit is contained in:
zeertzjq
2026-01-09 11:54:22 +08:00
committed by github-actions[bot]
parent 5e7af0ba01
commit 2c9f1317de
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/bufwrite.c
View File

@@ -346,7 +346,7 @@ static int buf_write_bytes(struct bw_info *ip)
// Only checking conversion, which is OK if we get here.
return OK;
}
int wlen = write_eintr(ip->bw_fd, buf, (size_t)len);
int wlen = (int)write_eintr(ip->bw_fd, buf, (size_t)len);
return (wlen < len) ? FAIL : OK;
}

26
src/nvim/fileio.c
View File

@@ -3805,39 +3805,49 @@ char *file_pat_to_reg_pat(const char *pat, const char *pat_end, char *allow_dirs
#if defined(EINTR)
// Type of buffer size argument of read() and write() is platform-dependent.
# ifdef MSWIN
# define BUFSIZE(x) (unsigned)(x)
# else
# define BUFSIZE(x) (x)
# endif
/// Version of read() that retries when interrupted by EINTR (possibly
/// by a SIGWINCH).
int read_eintr(int fd, void *buf, size_t bufsize)
ssize_t read_eintr(int fd, void *buf, size_t bufsize)
{
ssize_t ret;
while (true) {
ret = read(fd, buf, (unsigned)bufsize);
ret = read(fd, buf, BUFSIZE(bufsize));
if (ret >= 0 || errno != EINTR) {
break;
}
}
return (int)ret;
return ret;
}
/// Version of write() that retries when interrupted by EINTR (possibly
/// by a SIGWINCH).
int write_eintr(int fd, void *buf, size_t bufsize)
ssize_t write_eintr(int fd, void *buf, size_t bufsize)
{
int ret = 0;
ssize_t ret = 0;
// Repeat the write() so long it didn't fail, other than being interrupted
// by a signal.
while (ret < (int)bufsize) {
ssize_t wlen = write(fd, (char *)buf + ret, (unsigned)(bufsize - (size_t)ret));
while ((size_t)ret < bufsize) {
ssize_t wlen = write(fd, (char *)buf + ret, BUFSIZE(bufsize - (size_t)ret));
if (wlen < 0) {
if (errno != EINTR) {
break;
}
} else {
ret += (int)wlen;
ret += wlen;
}
}
return ret;
}
# undef BUFSIZE
#endif