packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/repo: open file only if required 

This tightens up the logic for opening a file while inspecting its
xattrs. The only codepath fetching xattrs from a FD is the one
handling 'bare' mode.
It also rearranges the else-assert flow, mostly for future-proofing.
This commit is contained in:
Luca BRUNO 2022-01-24 16:46:40 +00:00
parent 0713ad3259
commit b27792ade3
No known key found for this signature in database
GPG Key ID: A9834A2252078E4E
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libostree/ostree-repo.c
View File

@ -4218,8 +4218,9 @@ _ostree_repo_load_file_bare (OstreeRepo *self,
cancellable, error); cancellable, error);
} }
const gboolean need_open = const gboolean need_open = (out_fd ||
(out_fd || out_xattrs || self->mode == OSTREE_REPO_MODE_BARE_USER); (out_xattrs && self->mode == OSTREE_REPO_MODE_BARE) ||
self->mode == OSTREE_REPO_MODE_BARE_USER);
/* If it's a regular file and we're requested to return the fd, do it now. As /* If it's a regular file and we're requested to return the fd, do it now. As
* a special case in bare-user, we always do an open, since the stat() metadata * a special case in bare-user, we always do an open, since the stat() metadata
* lives there. * lives there.
@ -4284,10 +4285,8 @@ _ostree_repo_load_file_bare (OstreeRepo *self,
ret_xattrs = g_variant_ref_sink (g_variant_builder_end (&builder)); ret_xattrs = g_variant_ref_sink (g_variant_builder_end (&builder));
} }
} }
else else if (self->mode == OSTREE_REPO_MODE_BARE)
{ {
g_assert (self->mode == OSTREE_REPO_MODE_BARE);
if (S_ISREG (stbuf.st_mode) && out_xattrs) if (S_ISREG (stbuf.st_mode) && out_xattrs)
{ {
if (self->disable_xattrs) if (self->disable_xattrs)
@ -4306,6 +4305,10 @@ _ostree_repo_load_file_bare (OstreeRepo *self,
return FALSE; return FALSE;
} }
} }
else
{
g_assert_not_reached ();
}
if (out_fd) if (out_fd)
*out_fd = glnx_steal_fd (&fd); *out_fd = glnx_steal_fd (&fd);