svn commit: r290593 - stable/9/usr.sbin/makefs/cd9660

[Garrett Cooper]

Author: ngie
Date: Mon Nov  9 09:05:09 2015
New Revision: 290593
URL: https://svnweb.freebsd.org/changeset/base/290593

Log:
  MFstable/10 r290591:
  
  MFC r289899:
  
  Import the fix from NetBSD kern/48852 (sic) to fix rockridge encoding of
  device nodes
  
  In particular, use st_rdev (the device type), not st_dev (the device inode),
  and fix the comparison to be correct with the st_rdev field
  
  Bug 203648
  Submitted by: Thomas Schmitt <scdbackup at gmx.net>
  Coverity CID: 1008927
  Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/9/usr.sbin/makefs/cd9660/iso9660_rrip.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/usr.sbin/   (props changed)
  stable/9/usr.sbin/makefs/   (props changed)

Modified: stable/9/usr.sbin/makefs/cd9660/iso9660_rrip.c
==============================================================================
--- stable/9/usr.sbin/makefs/cd9660/iso9660_rrip.c	Mon Nov  9 09:04:11 2015	(r290592)
+++ stable/9/usr.sbin/makefs/cd9660/iso9660_rrip.c	Mon Nov  9 09:05:09 2015	(r290593)
@@ -1,4 +1,4 @@
-/*	$NetBSD: iso9660_rrip.c,v 1.11 2012/04/29 13:32:21 joerg Exp $	*/
+/*	$NetBSD: iso9660_rrip.c,v 1.14 2014/05/30 13:14:47 martin Exp $	*/
 
 /*
  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -656,13 +656,14 @@ cd9660node_rrip_pn(struct ISO_SUSP_ATTRI
 	pn_field->attr.rr_entry.PN.h.length[0] = 20;
 	pn_field->attr.rr_entry.PN.h.version[0] = 1;
 
-	if (sizeof (fnode->inode->st.st_dev) > 32)
-		cd9660_bothendian_dword((uint64_t)fnode->inode->st.st_dev >> 32,
+	if (sizeof (fnode->inode->st.st_rdev) > 4)
+		cd9660_bothendian_dword(
+		    (uint64_t)fnode->inode->st.st_rdev >> 32,
 		    pn_field->attr.rr_entry.PN.high);
 	else
 		cd9660_bothendian_dword(0, pn_field->attr.rr_entry.PN.high);
 
-	cd9660_bothendian_dword(fnode->inode->st.st_dev & 0xffffffff,
+	cd9660_bothendian_dword(fnode->inode->st.st_rdev & 0xffffffff,
 		pn_field->attr.rr_entry.PN.low);
 	return 1;
 }