aboutsummaryrefslogtreecommitdiff
path: root/bin/gensquashfs/test/fstree_from_file.c
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2023-10-24 10:10:52 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2023-10-24 15:57:18 +0200
commitd17f308b24a332d1767888e086ece9a2e71a891d (patch)
tree765ab17e800cd4c5d9f2c2e3716d93e1aaac2c0b /bin/gensquashfs/test/fstree_from_file.c
parentdce63f71c4b901e776686cca351d4ff55badb425 (diff)
Cleanup: gensquashfs: remove tree walk for force-uid/gid
If the --force-uid or --force-gid flags are used, don't do a recursive tree walk after the fact, instead simply apply the settings at the source (e.g. tree iterator). Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'bin/gensquashfs/test/fstree_from_file.c')
-rw-r--r--bin/gensquashfs/test/fstree_from_file.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/gensquashfs/test/fstree_from_file.c b/bin/gensquashfs/test/fstree_from_file.c
index a5500dc..bbd1c09 100644
--- a/bin/gensquashfs/test/fstree_from_file.c
+++ b/bin/gensquashfs/test/fstree_from_file.c
@@ -27,15 +27,19 @@ int main(int argc, char **argv)
fstree_defaults_t fsd;
sqfs_istream_t *file;
tree_node_t *n;
+ options_t opt;
fstree_t fs;
(void)argc; (void)argv;
+ memset(&opt, 0, sizeof(opt));
+ opt.dirscan_flags = DIR_SCAN_KEEP_UID | DIR_SCAN_KEEP_GID;
+
file = istream_memory_create("memfile", 7, listing, strlen(listing));
TEST_NOT_NULL(file);
TEST_ASSERT(parse_fstree_defaults(&fsd, NULL) == 0);
TEST_ASSERT(fstree_init(&fs, &fsd) == 0);
- TEST_ASSERT(fstree_from_file_stream(&fs, file, NULL) == 0);
+ TEST_ASSERT(fstree_from_file_stream(&fs, file, &opt) == 0);
sqfs_drop(file);
fstree_post_process(&fs);