SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdisk-util: Make fdisk_new_context_fd() more generic

Browse Source 
Let's make this an openat() style function so we can also pass a
device path.
This commit is contained in:
Daan De Meyer
2023-08-14 10:27:57 +02:00
parent 59120e89d8
commit fd9fe57a26
4 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/fdisk-util.c
+14 -6
View File
@@ -8,26 +8,34 @@
#if HAVE_LIBFDISK
int fdisk_new_context_fd(
int fd,
int fdisk_new_context_at(
int dir_fd,
const char *path,
bool read_only,
uint32_t sector_size,
struct fdisk_context **ret) {
_cleanup_(fdisk_unref_contextp) struct fdisk_context *c = NULL;
_cleanup_close_ int fd = -EBADF;
int r;
assert(dir_fd >= 0 || dir_fd == AT_FDCWD);
assert(ret);
if (fd < 0)
return -EBADF;
if (!isempty(path)) {
fd = openat(dir_fd, path, (read_only ? O_RDONLY : O_RDWR)|O_CLOEXEC);
if (fd < 0)
return -errno;
dir_fd = fd;
}
c = fdisk_new_context();
if (!c)
return -ENOMEM;
if (sector_size == UINT32_MAX) {
r = probe_sector_size_prefer_ioctl(fd, &sector_size);
r = probe_sector_size_prefer_ioctl(dir_fd, &sector_size);
if (r < 0)
return r;
}
@@ -38,7 +46,7 @@ int fdisk_new_context_fd(
return r;
}
r = fdisk_assign_device(c, FORMAT_PROC_FD_PATH(fd), read_only);
r = fdisk_assign_device(c, FORMAT_PROC_FD_PATH(dir_fd), read_only);
if (r < 0)
return r;
src/shared/fdisk-util.h
+1 -1
View File
@@ -14,7 +14,7 @@ DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct fdisk_partition*, fdisk_unref_partition,
DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct fdisk_parttype*, fdisk_unref_parttype, NULL);
DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct fdisk_table*, fdisk_unref_table, NULL);
int fdisk_new_context_fd(int fd, bool read_only, uint32_t sector_size, struct fdisk_context **ret);
int fdisk_new_context_at(int dir_fd, const char *path, bool read_only, uint32_t sector_size, struct fdisk_context **ret);
int fdisk_partition_get_uuid_as_id128(struct fdisk_partition *p, sd_id128_t *ret);
int fdisk_partition_get_type_as_id128(struct fdisk_partition *p, sd_id128_t *ret);