coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-11 22:12:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

util/nvmutil: move EINTR handle to prw()

Browse Source 
this way, we now have a universal function
that is reusable elsewhere, with the same
redundancy. the rw_once and rw_exact functions
still get this redundancy, through prw

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-13 22:45:28 +00:00
parent 223932c5f8
commit 4bb64c8d37
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+18 -8
View File
@@ -1618,9 +1618,6 @@ rw_file_once(int fd, u8 *mem, size_t nrw,
read_again:
rv = prw(fd, mem + rc, nrw - rc, off + rc, rw_type);
if (rv < 0 && errno == EINTR)
goto read_again;
if (rv < 0)
return -1;
@@ -1640,6 +1637,8 @@ err_rw_file_once:
}
/*
* prw() - portable read-write
*
* This implements a portable analog of pwrite()
* and pread() - note that this version is not
* thread-safe (race conditions are possible on
@@ -1660,15 +1659,27 @@ prw(int fd, void *mem, size_t nrw,
ssize_t r;
int saved_errno;
int flags;
int positional_rw = 0;
if (io_args(fd, mem, nrw, off, rw_type) == -1)
goto err_prw;
if (rw_type == IO_WRITE)
return write(fd, mem, nrw);
r = -1;
if (rw_type == IO_READ)
return read(fd, mem, nrw);
try_rw_again:
if (rw_type == IO_WRITE)
r = write(fd, mem, nrw);
else if (rw_type == IO_READ)
r = read(fd, mem, nrw);
else
positional_rw = 1;
if (!positional_rw) {
if (r == -1 && errno == EINTR)
goto try_rw_again;
return r;
}
flags = fcntl(fd, F_GETFL);
if (flags == -1)
@@ -1700,7 +1711,6 @@ prw(int fd, void *mem, size_t nrw,
if (lseek_eintr(fd, off_orig, SEEK_SET) == (off_t)-1) {
if (r < 0)
errno = saved_errno;
return -1;
}
errno = saved_errno;