aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2023-04-17 20:54:07 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2023-04-17 20:54:07 +0200
commita13df03fddd9499960d4653aaee0970983b65f73 (patch)
tree6a4642c15c3e746dd1bc593ee9f3bca1ff7054f4
parent483bf42fe4507fa709d9892c581c98f5a4b54849 (diff)
fstree_from_dir: Move the recursion step into scan_dir
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
-rw-r--r--bin/gensquashfs/src/fstree_from_dir.c35
1 files changed, 13 insertions, 22 deletions
diff --git a/bin/gensquashfs/src/fstree_from_dir.c b/bin/gensquashfs/src/fstree_from_dir.c
index 8de7f54..6b27fad 100644
--- a/bin/gensquashfs/src/fstree_from_dir.c
+++ b/bin/gensquashfs/src/fstree_from_dir.c
@@ -140,8 +140,17 @@ static int scan_dir(fstree_t *fs, tree_node_t *root, const char *path,
if (ret < 0)
goto fail;
- if (ret > 0)
+ if (ret > 0) {
discard_node(root, n);
+ continue;
+ }
+
+ if (!(flags & DIR_SCAN_NO_RECURSION) && S_ISDIR(n->mode)) {
+ if (fstree_from_subdir(fs, n, path, n->name,
+ cb, user, flags)) {
+ goto fail;
+ }
+ }
}
sqfs_drop(dir);
@@ -158,7 +167,7 @@ int fstree_from_subdir(fstree_t *fs, tree_node_t *root,
{
size_t plen, slen;
char *temp = NULL;
- tree_node_t *n;
+ int ret;
if (!S_ISDIR(root->mode)) {
fprintf(stderr,
@@ -186,27 +195,9 @@ int fstree_from_subdir(fstree_t *fs, tree_node_t *root,
path = temp;
}
- if (scan_dir(fs, root, path, cb, user, flags))
- goto fail;
-
- if (flags & DIR_SCAN_NO_RECURSION) {
- free(temp);
- return 0;
- }
-
- for (n = root->data.dir.children; n != NULL; n = n->next) {
- if (!S_ISDIR(n->mode))
- continue;
-
- if (fstree_from_subdir(fs, n, path, n->name, cb, user, flags))
- goto fail;
- }
-
+ ret = scan_dir(fs, root, path, cb, user, flags);
free(temp);
- return 0;
-fail:
- free(temp);
- return -1;
+ return ret;
}
int fstree_from_dir(fstree_t *fs, tree_node_t *root,