lib: Add "open dfd iter handling noent" helper, port tree-wide
Follow up to a previous patch that addressed a double-close; I realized we already had a helper for doing "open dfd iter, do nothing if we get ENOENT". Raise it to libotuil, and port all consumers. Closes: #863 Approved by: jlebon
This commit is contained in:
1 parent
90cd7f7234
commit
9380dbb14d
7 files changed
+112
-131
No files matched your search
@@ -421,23 +421,17 @@ _ostree_sysroot_read_boot_loader_configs (OstreeSysroot *self,
|
||||
g_ptr_array_new_with_free_func ((GDestroyNotify)g_object_unref);
|
||||
|
||||
g_autofree char *entries_path = g_strdup_printf ("boot/loader.%d/entries", bootversion);
|
||||
/* Temporary owned by iterator */
|
||||
int fd = glnx_opendirat_with_errno (self->sysroot_fd, entries_path, TRUE);
|
||||
if (fd == -1)
|
||||
{
|
||||
if (errno != ENOENT)
|
||||
return glnx_throw_errno (error);
|
||||
else
|
||||
{
|
||||
/* Note early return */
|
||||
*out_loader_configs = g_steal_pointer (&ret_loader_configs);
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
gboolean entries_exists;
|
||||
g_auto(GLnxDirFdIterator) dfd_iter = { 0, };
|
||||
if (!glnx_dirfd_iterator_init_take_fd (fd, &dfd_iter, error))
|
||||
if (!ot_dfd_iter_init_allow_noent (self->sysroot_fd, entries_path,
|
||||
&dfd_iter, &entries_exists, error))
|
||||
return FALSE;
|
||||
if (!entries_exists)
|
||||
{
|
||||
/* Note early return */
|
||||
*out_loader_configs = g_steal_pointer (&ret_loader_configs);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
while (TRUE)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user