diff options
| author | lulf <lulf@FreeBSD.org> | 2008-11-26 13:09:45 +0000 |
|---|---|---|
| committer | lulf <lulf@FreeBSD.org> | 2008-11-26 13:09:45 +0000 |
| commit | 9dccf6209569514a1e6c36f6d331fcf5d3d41316 (patch) | |
| tree | 6a058a5372715071dfc0620c4da6635968a5998d /sys/fs/cd9660 | |
| parent | 2df0dfae2558afc5978e0b98cba4bc00c3847707 (diff) | |
| download | FreeBSD-src-9dccf6209569514a1e6c36f6d331fcf5d3d41316.zip FreeBSD-src-9dccf6209569514a1e6c36f6d331fcf5d3d41316.tar.gz | |
- Support IEEE_P1282 and IEEE_1282 tags in the rock ridge extensions record.
PR: kern/128942
Submitted by: "J.R. Oldroyd" <fbsd - at - opal.com>
Diffstat (limited to 'sys/fs/cd9660')
| -rw-r--r-- | sys/fs/cd9660/cd9660_rrip.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c index 670ca30..739972b 100644 --- a/sys/fs/cd9660/cd9660_rrip.c +++ b/sys/fs/cd9660/cd9660_rrip.c @@ -472,8 +472,12 @@ cd9660_rrip_extref(p,ana) ISO_RRIP_EXTREF *p; ISO_RRIP_ANALYZE *ana; { - if (isonum_711(p->len_id) != 10 - || bcmp((char *)p + 8,"RRIP_1991A",10) + if ( ! ((isonum_711(p->len_id) == 10 + && bcmp((char *)p + 8,"RRIP_1991A",10) == 0) + || (isonum_711(p->len_id) == 10 + && bcmp((char *)p + 8,"IEEE_P1282",10) == 0) + || (isonum_711(p->len_id) == 9 + && bcmp((char *)p + 8,"IEEE_1282", 9) == 0)) || isonum_711(p->version) != 1) return 0; ana->fields &= ~ISO_SUSP_EXTREF; |
