summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-03-22 20:18:49 +0100
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-03-22 23:30:28 +0100
commit377112c6c1b307023265706b1848fb0952fd809c (patch)
tree4743a9dd4601dfcd5946460380c2dba215f28d81
parent3fd6b0a8e02e1ca50bd03691f404f343995d2ed6 (diff)
Do not try to read back the compressor options
None of the currently implemented compressors do anything with that data. They are all at the mercy of the data actually in the image. This commit removes the code from sqfs2tar and rdsquashfs that decodes the options, which also has the side effect of increasing compatibillity with some non-confirming images. Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
-rw-r--r--extras/browse.c9
-rw-r--r--extras/list_files.c9
-rw-r--r--tar/sqfs2tar.c9
-rw-r--r--unpack/rdsquashfs.c9
4 files changed, 0 insertions, 36 deletions
diff --git a/extras/browse.c b/extras/browse.c
index a238793..ef4e223 100644
--- a/extras/browse.c
+++ b/extras/browse.c
@@ -513,15 +513,6 @@ int main(int argc, char **argv)
goto out_fd;
}
- if (super.flags & SQFS_FLAG_COMPRESSOR_OPTIONS) {
- if (cmp->read_options(cmp, file)) {
- fprintf(stderr,
- "%s: error reading compressor options.\n",
- argv[1]);
- goto out_cmp;
- }
- }
-
/* Create and read the UID/GID mapping table */
idtbl = sqfs_id_table_create(0);
if (idtbl == NULL) {
diff --git a/extras/list_files.c b/extras/list_files.c
index 61184bf..4862a22 100644
--- a/extras/list_files.c
+++ b/extras/list_files.c
@@ -86,15 +86,6 @@ int main(int argc, char **argv)
goto out_fd;
}
- if (super.flags & SQFS_FLAG_COMPRESSOR_OPTIONS) {
- if (cmp->read_options(cmp, file)) {
- fprintf(stderr,
- "%s: error reading compressor options.\n",
- argv[1]);
- goto out_cmp;
- }
- }
-
/* Create and read the UID/GID mapping table */
idtbl = sqfs_id_table_create(0);
if (idtbl == NULL) {
diff --git a/tar/sqfs2tar.c b/tar/sqfs2tar.c
index cdad066..b21570a 100644
--- a/tar/sqfs2tar.c
+++ b/tar/sqfs2tar.c
@@ -557,15 +557,6 @@ int main(int argc, char **argv)
goto out_fd;
}
- if (super.flags & SQFS_FLAG_COMPRESSOR_OPTIONS) {
- ret = cmp->read_options(cmp, file);
- if (ret) {
- sqfs_perror(filename, "reading compressor options",
- ret);
- goto out_cmp;
- }
- }
-
idtbl = sqfs_id_table_create(0);
if (idtbl == NULL) {
diff --git a/unpack/rdsquashfs.c b/unpack/rdsquashfs.c
index c166f4a..fa2bbb4 100644
--- a/unpack/rdsquashfs.c
+++ b/unpack/rdsquashfs.c
@@ -51,15 +51,6 @@ int main(int argc, char **argv)
goto out_file;
}
- if (super.flags & SQFS_FLAG_COMPRESSOR_OPTIONS) {
- ret = cmp->read_options(cmp, file);
- if (ret) {
- sqfs_perror(opt.image_name, "reading compressor "
- "options", ret);
- goto out_cmp;
- }
- }
-
if (!(super.flags & SQFS_FLAG_NO_XATTRS)) {
xattr = sqfs_xattr_reader_create(0);
if (xattr == NULL) {