diff options
author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-10-24 10:10:52 +0200 |
---|---|---|
committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-10-24 15:57:18 +0200 |
commit | d17f308b24a332d1767888e086ece9a2e71a891d (patch) | |
tree | 765ab17e800cd4c5d9f2c2e3716d93e1aaac2c0b /bin/gensquashfs/test/fstree_glob1.c | |
parent | dce63f71c4b901e776686cca351d4ff55badb425 (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_glob1.c')
-rw-r--r-- | bin/gensquashfs/test/fstree_glob1.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/bin/gensquashfs/test/fstree_glob1.c b/bin/gensquashfs/test/fstree_glob1.c index 315ab74..58686fd 100644 --- a/bin/gensquashfs/test/fstree_glob1.c +++ b/bin/gensquashfs/test/fstree_glob1.c @@ -269,17 +269,21 @@ static void check_hierarchy(tree_node_t *root, bool subdir, bool recursive) int main(int argc, char **argv) { fstree_defaults_t fsd; + options_t opt; fstree_t fs; int ret; (void)argc; (void)argv; TEST_ASSERT(parse_fstree_defaults(&fsd, NULL) == 0); + memset(&opt, 0, sizeof(opt)); + opt.packdir = (char *)TEST_PATH; + /* first test case, directory tree only */ ret = fstree_init(&fs, &fsd); TEST_EQUAL_I(ret, 0); - ret = fstree_from_file(&fs, TEST_PATH "/fstree_glob1.txt", TEST_PATH); + ret = fstree_from_file(&fs, TEST_PATH "/fstree_glob1.txt", &opt); TEST_EQUAL_I(ret, 0); fstree_post_process(&fs); @@ -290,7 +294,7 @@ int main(int argc, char **argv) ret = fstree_init(&fs, &fsd); TEST_EQUAL_I(ret, 0); - ret = fstree_from_file(&fs, TEST_PATH "/fstree_glob2.txt", TEST_PATH); + ret = fstree_from_file(&fs, TEST_PATH "/fstree_glob2.txt", &opt); TEST_EQUAL_I(ret, 0); fstree_post_process(&fs); @@ -301,7 +305,7 @@ int main(int argc, char **argv) ret = fstree_init(&fs, &fsd); TEST_EQUAL_I(ret, 0); - ret = fstree_from_file(&fs, TEST_PATH "/fstree_glob3.txt", TEST_PATH); + ret = fstree_from_file(&fs, TEST_PATH "/fstree_glob3.txt", &opt); TEST_EQUAL_I(ret, 0); fstree_post_process(&fs); |