diff options
author | kientzle <kientzle@FreeBSD.org> | 2005-11-08 07:41:03 +0000 |
---|---|---|
committer | kientzle <kientzle@FreeBSD.org> | 2005-11-08 07:41:03 +0000 |
commit | fdd1f596650d52654ab5ff474492a698fb1d29e7 (patch) | |
tree | 276734cbddc543132cd439727b380d170e88fc6b /lib/libarchive/archive_read_support_format_iso9660.c | |
parent | bcff233215aa6549df420bfa8bdbf1e78afbd7a1 (diff) | |
download | FreeBSD-src-fdd1f596650d52654ab5ff474492a698fb1d29e7.zip FreeBSD-src-fdd1f596650d52654ab5ff474492a698fb1d29e7.tar.gz |
Fine-tune the format detection for CPIO and ISO9660 sub-types.
This has no impact on the actual operation, it just fixes some
inaccuracies in the format code and description reported back to the caller.
Diffstat (limited to 'lib/libarchive/archive_read_support_format_iso9660.c')
-rw-r--r-- | lib/libarchive/archive_read_support_format_iso9660.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/libarchive/archive_read_support_format_iso9660.c b/lib/libarchive/archive_read_support_format_iso9660.c index 25482a2..510d7f0 100644 --- a/lib/libarchive/archive_read_support_format_iso9660.c +++ b/lib/libarchive/archive_read_support_format_iso9660.c @@ -302,10 +302,7 @@ archive_read_format_iso9660_read_header(struct archive *a, iso9660 = *(a->pformat_data); - if (iso9660->seenRockridge) { - a->archive_format = ARCHIVE_FORMAT_ISO9660_ROCKRIDGE; - a->archive_format_name = "ISO9660 with Rockridge extensions"; - } else { + if (!a->archive_format) { a->archive_format = ARCHIVE_FORMAT_ISO9660; a->archive_format_name = "ISO9660"; } @@ -402,6 +399,12 @@ archive_read_format_iso9660_read_header(struct archive *a, continue; child = parse_file_info(iso9660, file, dr); add_entry(iso9660, child); + if (iso9660->seenRockridge) { + a->archive_format = + ARCHIVE_FORMAT_ISO9660_ROCKRIDGE; + a->archive_format_name = + "ISO9660 with Rockridge extensions"; + } } } } |