Date: Sat, 29 Nov 2008 05:08:49 +0000 (UTC) From: Tim Kientzle <kientzle@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r185425 - releng/7.1/sys/fs/cd9660 Message-ID: <200811290508.mAT58nx1039679@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kientzle Date: Sat Nov 29 05:08:49 2008 New Revision: 185425 URL: http://svn.freebsd.org/changeset/base/185425 Log: MFC r185334: Recognize Rockridge extensions even when the IEEE-standard extension name (as standardized in 1994) is used. PR: kern/128942 Submitted by: J.R. Oldroyd Approved by: re Modified: releng/7.1/sys/fs/cd9660/cd9660_rrip.c Modified: releng/7.1/sys/fs/cd9660/cd9660_rrip.c ============================================================================== --- releng/7.1/sys/fs/cd9660/cd9660_rrip.c Sat Nov 29 03:21:25 2008 (r185424) +++ releng/7.1/sys/fs/cd9660/cd9660_rrip.c Sat Nov 29 05:08:49 2008 (r185425) @@ -467,8 +467,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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811290508.mAT58nx1039679>