updated for version 7.3.083
Problem: When a read() or write() is interrupted by a signal it fails.
Solution: Add read_eintr() and write_eintr().
diff --git a/src/fileio.c b/src/fileio.c
index b6127d9..2828aa7 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -918,7 +918,7 @@
{
/* Read the first line (and a bit more). Immediately rewind to
* the start of the file. If the read() fails "len" is -1. */
- len = vim_read(fd, firstline, 80);
+ len = read_eintr(fd, firstline, 80);
lseek(fd, (off_t)0L, SEEK_SET);
for (p = firstline; p < firstline + len; ++p)
if (*p >= 0x80)
@@ -1373,7 +1373,7 @@
/*
* Read bytes from the file.
*/
- size = vim_read(fd, ptr, size);
+ size = read_eintr(fd, ptr, size);
}
if (size <= 0)
@@ -4000,7 +4000,7 @@
#ifdef HAS_BW_FLAGS
write_info.bw_flags = FIO_NOCONVERT;
#endif
- while ((write_info.bw_len = vim_read(fd, copybuf,
+ while ((write_info.bw_len = read_eintr(fd, copybuf,
BUFSIZE)) > 0)
{
if (buf_write_bytes(&write_info) == FAIL)
@@ -4813,7 +4813,7 @@
#ifdef HAS_BW_FLAGS
write_info.bw_flags = FIO_NOCONVERT;
#endif
- while ((write_info.bw_len = vim_read(fd, smallbuf,
+ while ((write_info.bw_len = read_eintr(fd, smallbuf,
SMBUFSIZE)) > 0)
if (buf_write_bytes(&write_info) == FAIL)
break;
@@ -5330,7 +5330,7 @@
/*
* Call write() to write a number of bytes to the file.
- * Also handles encryption and 'encoding' conversion.
+ * Handles encryption and 'encoding' conversion.
*
* Return FAIL for failure, OK otherwise.
*/
@@ -5702,16 +5702,8 @@
crypt_encode(buf, len, buf);
#endif
- /* Repeat the write(), it may be interrupted by a signal. */
- while (len > 0)
- {
- wlen = vim_write(ip->bw_fd, buf, len);
- if (wlen <= 0) /* error! */
- return FAIL;
- len -= wlen;
- buf += wlen;
- }
- return OK;
+ wlen = write_eintr(ip->bw_fd, buf, len);
+ return (wlen < len) ? FAIL : OK;
}
#ifdef FEAT_MBYTE
@@ -6662,8 +6654,8 @@
return -1;
}
- while ((n = vim_read(fd_in, buffer, BUFSIZE)) > 0)
- if (vim_write(fd_out, buffer, n) != n)
+ while ((n = read_eintr(fd_in, buffer, BUFSIZE)) > 0)
+ if (write_eintr(fd_out, buffer, n) != n)
{
errmsg = _("E208: Error writing to \"%s\"");
break;
@@ -10304,3 +10296,55 @@
}
return reg_pat;
}
+
+#if defined(EINTR) || defined(PROTO)
+/*
+ * Version of read() that retries when interrupted by EINTR (possibly
+ * by a SIGWINCH).
+ */
+ long
+read_eintr(fd, buf, bufsize)
+ int fd;
+ void *buf;
+ size_t bufsize;
+{
+ long ret;
+
+ for (;;)
+ {
+ ret = vim_read(fd, buf, bufsize);
+ if (ret >= 0 || errno != EINTR)
+ break;
+ }
+ return ret;
+}
+
+/*
+ * Version of write() that retries when interrupted by EINTR (possibly
+ * by a SIGWINCH).
+ */
+ long
+write_eintr(fd, buf, bufsize)
+ int fd;
+ void *buf;
+ size_t bufsize;
+{
+ long ret = 0;
+ long wlen;
+
+ /* Repeat the write() so long it didn't fail, other than being interrupted
+ * by a signal. */
+ while (ret < (long)bufsize)
+ {
+ wlen = vim_write(fd, buf + ret, bufsize - ret);
+ if (wlen < 0)
+ {
+ if (errno != EINTR)
+ break;
+ }
+ else
+ ret += wlen;
+ }
+ return ret;
+}
+#endif
diff --git a/src/memfile.c b/src/memfile.c
index c6f5fdf..e9fe314 100644
--- a/src/memfile.c
+++ b/src/memfile.c
@@ -1049,7 +1049,7 @@
PERROR(_("E294: Seek error in swap file read"));
return FAIL;
}
- if ((unsigned)vim_read(mfp->mf_fd, hp->bh_data, size) != size)
+ if ((unsigned)read_eintr(mfp->mf_fd, hp->bh_data, size) != size)
{
PERROR(_("E295: Read error in swap file"));
return FAIL;
@@ -1168,7 +1168,7 @@
}
#endif
- if ((unsigned)vim_write(mfp->mf_fd, data, size) != size)
+ if ((unsigned)write_eintr(mfp->mf_fd, data, size) != size)
result = FAIL;
#ifdef FEAT_CRYPT
diff --git a/src/memline.c b/src/memline.c
index e4e5bad..7393324 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -2062,7 +2062,7 @@
fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0);
if (fd >= 0)
{
- if (read(fd, (char *)&b0, sizeof(b0)) == sizeof(b0))
+ if (read_eintr(fd, &b0, sizeof(b0)) == sizeof(b0))
{
if (STRNCMP(b0.b0_version, "VIM 3.0", 7) == 0)
{
@@ -4392,7 +4392,7 @@
fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0);
if (fd >= 0)
{
- if (read(fd, (char *)&b0, sizeof(b0)) == sizeof(b0))
+ if (read_eintr(fd, &b0, sizeof(b0)) == sizeof(b0))
{
/*
* If the swapfile has the same directory as the
diff --git a/src/os_unix.c b/src/os_unix.c
index 9fcebd6..ba86dbf 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -4454,7 +4454,7 @@
++noread_cnt;
while (RealWaitForChar(fromshell_fd, 10L, NULL))
{
- len = read(fromshell_fd, (char *)buffer
+ len = read_eintr(fromshell_fd, buffer
# ifdef FEAT_MBYTE
+ buffer_off, (size_t)(BUFLEN - buffer_off)
# else
diff --git a/src/proto/fileio.pro b/src/proto/fileio.pro
index 88d3c27..cb4012f 100644
--- a/src/proto/fileio.pro
+++ b/src/proto/fileio.pro
@@ -54,4 +54,6 @@
int match_file_pat __ARGS((char_u *pattern, regprog_T *prog, char_u *fname, char_u *sfname, char_u *tail, int allow_dirs));
int match_file_list __ARGS((char_u *list, char_u *sfname, char_u *ffname));
char_u *file_pat_to_reg_pat __ARGS((char_u *pat, char_u *pat_end, char *allow_dirs, int no_bslash));
+long read_eintr __ARGS((int fd, void *buf, size_t bufsize));
+long write_eintr __ARGS((int fd, void *buf, size_t bufsize));
/* vim: set ft=c : */
diff --git a/src/undo.c b/src/undo.c
index 8fb46e4..bcf9463 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -1386,7 +1386,7 @@
char_u mbuf[UF_START_MAGIC_LEN];
int len;
- len = vim_read(fd, mbuf, UF_START_MAGIC_LEN);
+ len = read_eintr(fd, mbuf, UF_START_MAGIC_LEN);
close(fd);
if (len < UF_START_MAGIC_LEN
|| memcmp(mbuf, UF_START_MAGIC, UF_START_MAGIC_LEN) != 0)
diff --git a/src/version.c b/src/version.c
index e3cb9e5..346d291 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 83,
+/**/
82,
/**/
81,
diff --git a/src/vim.h b/src/vim.h
index c799cce..60e91c7 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -1642,6 +1642,11 @@
# define USE_INPUT_BUF
#endif
+#ifndef EINTR
+# define read_eintr(fd, buf, count) vim_read((fd), (buf), (count))
+# define write_eintr(fd, buf, count) vim_write((fd), (buf), (count))
+#endif
+
#ifdef MSWIN
/* On MS-Windows the third argument isn't size_t. This matters for Win64,
* where sizeof(size_t)==8, not 4 */
