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

lbutils: unify xopen and open_on_eintr

Browse Source 
use open_on_eintr for gbe files

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-28 09:03:18 +00:00
parent 4ecdadb7a6
commit 6643d9c1fa
4 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/libreboot-utils/lib/file.c
+15 -19
View File
@@ -65,22 +65,6 @@ err_same_file:
return set_errno(saved_errno, ESTALE);
}
void
xopen(int *fd_ptr, const char *path, int flags, struct stat *st)
{
if ((*fd_ptr = open(path, flags)) < 0)
err_exit(errno, "%s", path);
if (fstat(*fd_ptr, st) < 0)
err_exit(errno, "%s: stat", path);
if (!S_ISREG(st->st_mode))
err_exit(errno, "%s: not a regular file", path);
if (lseek_on_eintr(*fd_ptr, 0, SEEK_CUR, 1, 1) == (off_t)-1)
err_exit(errno, "%s: file not seekable", path);
}
int
fsync_dir(const char *path)
{
@@ -568,8 +552,9 @@ free_and_set_null(char **buf)
}
void
open_on_eintr(char *path,
int *fd, int flags, mode_t mode)
open_on_eintr(const char *path,
int *fd, int flags, mode_t mode,
struct stat *st)
{
int r = -1;
int saved_errno = errno;
@@ -594,6 +579,17 @@ open_on_eintr(char *path,
*fd = r;
if (st != NULL) {
if (fstat(*fd, st) < 0)
err_exit(errno, "%s: stat", path);
if (!S_ISREG(st->st_mode))
err_exit(errno, "%s: not a regular file", path);
}
if (lseek_on_eintr(*fd, 0, SEEK_CUR, 1, 1) == (off_t)-1)
err_exit(errno, "%s: file not seekable", path);
errno = saved_errno;
}
@@ -683,7 +679,7 @@ rootfs(void)
global_fs.rootfd = -1;
open_on_eintr("/", &global_fs.rootfd,
O_RDONLY | O_DIRECTORY | O_CLOEXEC, 0400);
O_RDONLY | O_DIRECTORY | O_CLOEXEC, 0400, NULL);
if (global_fs.rootfd < 0)
return NULL;