From 576e195ba5476ebf428bac51365d829d713e6907 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Mon, 10 Jun 2019 23:16:34 +0200 Subject: cleanup: move tree deserialization to libsqfs.a Signed-off-by: David Oberhollenzer --- unpack/rdsquashfs.h | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'unpack/rdsquashfs.h') diff --git a/unpack/rdsquashfs.h b/unpack/rdsquashfs.h index f1cd131..a615bb5 100644 --- a/unpack/rdsquashfs.h +++ b/unpack/rdsquashfs.h @@ -4,6 +4,7 @@ #include "meta_reader.h" #include "frag_reader.h" +#include "highlevel.h" #include "squashfs.h" #include "compress.h" #include "id_table.h" @@ -20,20 +21,16 @@ #include enum UNPACK_FLAGS { - UNPACK_NO_DEVICES = 0x01, - UNPACK_NO_SOCKETS = 0x02, - UNPACK_NO_FIFO = 0x04, - UNPACK_NO_SLINKS = 0x08, - UNPACK_NO_EMPTY = 0x10, - UNPACK_CHMOD = 0x20, - UNPACK_CHOWN = 0x40, - UNPACK_QUIET = 0x80, + UNPACK_CHMOD = 0x01, + UNPACK_CHOWN = 0x02, + UNPACK_QUIET = 0x04, }; typedef struct { compressor_t *cmp; size_t block_size; frag_reader_t *frag; + int rdtree_flags; int sqfsfd; int flags; @@ -41,13 +38,6 @@ typedef struct { void *scratch; } unsqfs_info_t; -tree_node_t *tree_node_from_inode(sqfs_inode_generic_t *inode, - const id_table_t *idtbl, - const char *name, - size_t block_size); - -int read_fstree(fstree_t *out, sqfs_super_t *super, unsqfs_info_t *info); - void list_files(tree_node_t *node); int extract_file(file_info_t *fi, unsqfs_info_t *info, int outfd); -- cgit v1.2.3