diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-06-10 23:16:34 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-06-10 23:16:53 +0200 |
| commit | 576e195ba5476ebf428bac51365d829d713e6907 (patch) | |
| tree | 1dc5a487ae278cfd9287dbd233a7975489612ffc /unpack/rdsquashfs.c | |
| parent | 4d2e87b767d1e025699286783c23926ec5eff857 (diff) | |
cleanup: move tree deserialization to libsqfs.a
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'unpack/rdsquashfs.c')
| -rw-r--r-- | unpack/rdsquashfs.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/unpack/rdsquashfs.c b/unpack/rdsquashfs.c index 11f0a32..81da226 100644 --- a/unpack/rdsquashfs.c +++ b/unpack/rdsquashfs.c @@ -177,16 +177,16 @@ int main(int argc, char **argv) switch (i) { case 'D': - info.flags |= UNPACK_NO_DEVICES; + info.rdtree_flags |= RDTREE_NO_DEVICES; break; case 'S': - info.flags |= UNPACK_NO_SOCKETS; + info.rdtree_flags |= RDTREE_NO_SOCKETS; break; case 'F': - info.flags |= UNPACK_NO_FIFO; + info.rdtree_flags |= RDTREE_NO_FIFO; break; case 'L': - info.flags |= UNPACK_NO_SLINKS; + info.rdtree_flags |= RDTREE_NO_SLINKS; break; case 'C': info.flags |= UNPACK_CHMOD; @@ -195,7 +195,7 @@ int main(int argc, char **argv) info.flags |= UNPACK_CHOWN; break; case 'E': - info.flags |= UNPACK_NO_EMPTY; + info.rdtree_flags |= RDTREE_NO_EMPTY; break; case 'c': op = OP_CAT; @@ -276,8 +276,10 @@ int main(int argc, char **argv) goto out_cmp; } - if (read_fstree(&fs, &super, &info)) + if (deserialize_fstree(&fs, &super, info.cmp, + info.sqfsfd, info.rdtree_flags)) { goto out_cmp; + } info.block_size = super.block_size; |