From da7eb3445cab5936455b8a119cb656113ca3d402 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Wed, 3 Jul 2019 18:50:33 +0200 Subject: cleanup: move tree node from path function to libfstree.a Signed-off-by: David Oberhollenzer --- unpack/rdsquashfs.c | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) (limited to 'unpack') diff --git a/unpack/rdsquashfs.c b/unpack/rdsquashfs.c index 42bddff..4a0f12b 100644 --- a/unpack/rdsquashfs.c +++ b/unpack/rdsquashfs.c @@ -1,39 +1,6 @@ /* SPDX-License-Identifier: GPL-3.0-or-later */ #include "rdsquashfs.h" -static tree_node_t *find_node(tree_node_t *n, const char *path) -{ - const char *end; - size_t len; - - while (path != NULL && *path != '\0') { - if (!S_ISDIR(n->mode)) { - errno = ENOTDIR; - return NULL; - } - - end = strchrnul(path, '/'); - len = end - path; - - for (n = n->data.dir->children; n != NULL; n = n->next) { - if (strncmp(path, n->name, len) != 0) - continue; - if (n->name[len] != '\0') - continue; - break; - } - - if (n == NULL) { - errno = ENOENT; - return NULL; - } - - path = *end ? (end + 1) : end; - } - - return n; -} - int main(int argc, char **argv) { int status = EXIT_FAILURE; @@ -76,7 +43,7 @@ int main(int argc, char **argv) goto out_cmp; if (opt.cmdpath != NULL) { - n = find_node(fs.root, opt.cmdpath); + n = fstree_node_from_path(&fs, opt.cmdpath); if (n == NULL) { perror(opt.cmdpath); goto out_fs; -- cgit v1.2.3