2 files changed, 29 insertions, 33 deletions

diff --git a/lib/fstree/fstree_sort.c b/lib/fstree/fstree_sort.c
index 9f07c92..cd01235 100644
--- a/lib/fstree/fstree_sort.c
+++ b/lib/fstree/fstree_sort.c
@@ -3,32 +3,9 @@
 
 #include <string.h>
 
-static tree_node_t *sort_list(tree_node_t *head)
+static tree_node_t *merge(tree_node_t *lhs, tree_node_t *rhs)
 {
-	tree_node_t *it, *prev, *lhs, *rhs;
-	size_t i, count = 0;
-
-	for (it = head; it != NULL; it = it->next)
-		++count;
-
-	if (count < 2)
-		return head;
-
-	prev = NULL;
-	it = head;
-
-	for (i = 0; i < count / 2; ++i) {
-		prev = it;
-		it = it->next;
-	}
-
-	prev->next = NULL;
-
-	lhs = sort_list(head);
-	rhs = sort_list(it);
-
-	head = NULL;
-	prev = NULL;
+	tree_node_t *head = NULL, *prev = NULL, *it;
 
 	while (lhs != NULL && rhs != NULL) {
 		if (strcmp(lhs->name, rhs->name) <= 0) {
@@ -60,17 +37,36 @@ static tree_node_t *sort_list(tree_node_t *head)
 	return head;
 }
 
-static void sort_directory(tree_node_t *n)
+tree_node_t *tree_node_list_sort(tree_node_t *head)
 {
-	n->data.dir->children = sort_list(n->data.dir->children);
+	tree_node_t *it, *prev;
+	size_t i, count = 0;
 
-	for (n = n->data.dir->children; n != NULL; n = n->next) {
-		if (S_ISDIR(n->mode))
-			sort_directory(n);
+	for (it = head; it != NULL; it = it->next)
+		++count;
+
+	if (count < 2)
+		return head;
+
+	prev = NULL;
+	it = head;
+
+	for (i = 0; i < count / 2; ++i) {
+		prev = it;
+		it = it->next;
 	}
+
+	prev->next = NULL;
+
+	return merge(tree_node_list_sort(head), tree_node_list_sort(it));
 }
 
-void fstree_sort(fstree_t *fs)
+void tree_node_sort_recursive(tree_node_t *n)
 {
-	sort_directory(fs->root);
+	n->data.dir->children = tree_node_list_sort(n->data.dir->children);
+
+	for (n = n->data.dir->children; n != NULL; n = n->next) {
+		if (S_ISDIR(n->mode))
+			tree_node_sort_recursive(n);
+	}
 }
diff --git a/lib/sqfs/deserialize_fstree.c b/lib/sqfs/deserialize_fstree.c
index 2994007..e90e1c1 100644
--- a/lib/sqfs/deserialize_fstree.c
+++ b/lib/sqfs/deserialize_fstree.c
@@ -175,7 +175,7 @@ int deserialize_fstree(fstree_t *out, sqfs_super_t *super, compressor_t *cmp,
 	if (fill_dir(ir, dr, out->root, super, &idtbl, flags))
 		goto fail_fs;
 
-	fstree_sort(out);
+	tree_node_sort_recursive(out->root);
 
 	status = 0;
 out_id: