diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2016-10-17 11:40:14 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2016-10-17 12:30:12 +0200 |
| commit | a48796506d77fc339d186cf2da3d8558097b9f0f (patch) | |
| tree | ebb9a352318b8ba77cccc7f72023deeaffe2c050 | |
| parent | bd0221b884283361625e485840c99739c85d7b76 (diff) | |
| download | fstools-a48796506d77fc339d186cf2da3d8558097b9f0f.tar.gz | |
libblkid-tiny: fix SquashFS version detection on different endian systems
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
| -rw-r--r-- | libblkid-tiny/squashfs.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libblkid-tiny/squashfs.c b/libblkid-tiny/squashfs.c index d04f0b1..79588e7 100644 --- a/libblkid-tiny/squashfs.c +++ b/libblkid-tiny/squashfs.c @@ -53,12 +53,12 @@ static int probe_squashfs(blkid_probe pr, const struct blkid_idmag *mag) if (strcmp(mag->magic, "sqsh") == 0 || strcmp(mag->magic, "qshs") == 0) blkid_probe_sprintf_version(pr, "%u.%u", - sq->s_major, - sq->s_minor); + be16_to_cpu(sq->s_major), + be16_to_cpu(sq->s_minor)); else blkid_probe_sprintf_version(pr, "%u.%u", - swab16(sq->s_major), - swab16(sq->s_minor)); + le16_to_cpu(sq->s_major), + le16_to_cpu(sq->s_minor)); md5_begin(&ctx); md5_hash(sq, sizeof(*sq), &ctx); md5_end(&md5, &ctx); @@ -74,12 +74,12 @@ const struct blkid_idinfo squashfs_idinfo = .probefunc = probe_squashfs, .magics = { - { .magic = "sqsh", .len = 4 }, - { .magic = "hsqs", .len = 4 }, /* swap */ + { .magic = "sqsh", .len = 4 }, /* BE legacy squashfs */ + { .magic = "hsqs", .len = 4 }, /* LE / v4 squashfs */ /* LZMA version */ - { .magic = "qshs", .len = 4 }, - { .magic = "shsq", .len = 4 }, /* swap */ + { .magic = "qshs", .len = 4 }, /* BE legacy squashfs with LZMA */ + { .magic = "shsq", .len = 4 }, /* LE / v4 squashfs with LZMA */ { NULL } } }; |