summaryrefslogtreecommitdiff
path: root/bin/gensquashfs/dirscan_xattr.c
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-12-10 16:00:44 +0100
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-12-10 16:00:44 +0100
commitf138e4a24919682cf477cf93ae47b9a89bb5a3f0 (patch)
tree300147af5d6d6c9a2e0cf9b49674ec9edf58f0fb /bin/gensquashfs/dirscan_xattr.c
parentca61276fe9676670afe657c863257c01274c111a (diff)
Move fstree dirscan code back to libfstree
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'bin/gensquashfs/dirscan_xattr.c')
-rw-r--r--bin/gensquashfs/dirscan_xattr.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/gensquashfs/dirscan_xattr.c b/bin/gensquashfs/dirscan_xattr.c
index 5ed3c9c..65f7f5c 100644
--- a/bin/gensquashfs/dirscan_xattr.c
+++ b/bin/gensquashfs/dirscan_xattr.c
@@ -122,7 +122,7 @@ fail:
#endif
static int xattr_xcan_dfs(const char *path_prefix, void *selinux_handle,
- sqfs_xattr_writer_t *xwr, unsigned int flags,
+ sqfs_xattr_writer_t *xwr, bool scan_xattr,
tree_node_t *node)
{
char *path;
@@ -136,7 +136,7 @@ static int xattr_xcan_dfs(const char *path_prefix, void *selinux_handle,
}
#ifdef HAVE_SYS_XATTR_H
- if (flags & DIR_SCAN_READ_XATTR) {
+ if (scan_xattr) {
path = get_full_path(path_prefix, node);
if (path == NULL)
return -1;
@@ -176,7 +176,7 @@ static int xattr_xcan_dfs(const char *path_prefix, void *selinux_handle,
while (node != NULL) {
if (xattr_xcan_dfs(path_prefix, selinux_handle, xwr,
- flags, node)) {
+ scan_xattr, node)) {
return -1;
}
@@ -188,13 +188,13 @@ static int xattr_xcan_dfs(const char *path_prefix, void *selinux_handle,
}
int xattrs_from_dir(fstree_t *fs, const char *path, void *selinux_handle,
- sqfs_xattr_writer_t *xwr, unsigned int flags)
+ sqfs_xattr_writer_t *xwr, bool scan_xattr)
{
if (xwr == NULL)
return 0;
- if (selinux_handle == NULL && !(flags & DIR_SCAN_READ_XATTR))
+ if (selinux_handle == NULL && !scan_xattr)
return 0;
- return xattr_xcan_dfs(path, selinux_handle, xwr, flags, fs->root);
+ return xattr_xcan_dfs(path, selinux_handle, xwr, scan_xattr, fs->root);
}