svn commit: r185334 - head/sys/fs/cd9660

[Ulf Lilleengen]

Author: lulf
Date: Wed Nov 26 13:09:45 2008
New Revision: 185334
URL: http://svn.freebsd.org/changeset/base/185334

Log:
  - 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>

Modified:
  head/sys/fs/cd9660/cd9660_rrip.c

Modified: head/sys/fs/cd9660/cd9660_rrip.c
==============================================================================
--- head/sys/fs/cd9660/cd9660_rrip.c	Wed Nov 26 12:54:31 2008	(r185333)
+++ head/sys/fs/cd9660/cd9660_rrip.c	Wed Nov 26 13:09:45 2008	(r185334)
@@ -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;