coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-19 09:32:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

util/nvmutil: clean up file handling

Browse Source 
inline check_read_or_die

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-06 18:36:29 +00:00
parent 58b17c98fd
commit 82fdee91fa
1 changed files with 17 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+17 -32
View File
@@ -30,8 +30,6 @@ static uint8_t hextonum(char);
static uint8_t rhex(void); static uint8_t rhex(void);
static void read_file_PERFECTLY_or_die(int, void *, size_t, static void read_file_PERFECTLY_or_die(int, void *, size_t,
off_t, const char *, const char *); off_t, const char *, const char *);
static int check_read_or_die(const char *,
ssize_t, size_t, int, const char *);
static int write_mac_part(int); static int write_mac_part(int);
static void cmd_dump(void); static void cmd_dump(void);
static void print_mac_address(int); static void print_mac_address(int);
@@ -504,48 +502,35 @@ static void
read_file_PERFECTLY_or_die(int fd, void *buf, size_t len, read_file_PERFECTLY_or_die(int fd, void *buf, size_t len,
off_t off, const char *path, const char *op) off_t off, const char *path, const char *op)
{ {
int retry;
ssize_t rval; ssize_t rval;
int retry;
for (retry = 0; retry < MAX_RETRY_READ; retry++) { for (retry = 0; retry < MAX_RETRY_READ; retry++) {
if (op == NULL) if (op)
rval = read(fd, buf, len);
else
rval = pread(fd, buf, len, off); rval = pread(fd, buf, len, off);
else
rval = read(fd, buf, len);
if (check_read_or_die(path, rval, len, retry, if (rval == (ssize_t)len) {
op ? op : "read")) errno = 0;
return; return;
}
if (rval != -1)
err(ECANCELED,
"Short %s, %zd bytes, on file: %s",
op ? op : "read", rval, path);
if (errno != EINTR)
err(ECANCELED,
"Could not %s file: '%s'",
op ? op : "read", path);
} }
err(EINTR, "%s: max retries exceeded on file: %s", err(EINTR, "%s: max retries exceeded on file: %s",
op ? op : "read", path); op ? op : "read", path);
} }
static int
check_read_or_die(const char *rpath, ssize_t rval, size_t rsize,
int retry, const char *readtype)
{
if (rval == (ssize_t)rsize) {
errno = 0;
return 1; /* Successful read */
}
if (rval != -1)
err(ECANCELED, "Short %s, %zd bytes, on file: %s",
readtype, rval, rpath);
if (errno != EINTR)
err(ECANCELED, "Could not %s file: '%s'", readtype, rpath);
if (retry == MAX_RETRY_READ - 1)
err(EINTR, "%s: max retries exceeded on file: %s",
readtype, rpath);
/*
* Bad read, with errno EINTR (syscall interrupted).
*/
return 0;
}
static int static int
write_mac_part(int partnum) write_mac_part(int partnum)
{ {