[src/trunk]: src/usr.sbin/makefs/cd9660 PR kern/48852 (which should have been...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5afa05aeb9cc
branches:  trunk
changeset: 796365:5afa05aeb9cc
user:      martin <martin%NetBSD.org@localhost>
date:      Fri May 30 13:14:47 2014 +0000

description:
PR kern/48852 (which should have been bin/ in retrospect): apply patch
from Thomas Schmitt to fix rockridge encoding of device nodes.

diffstat:

 usr.sbin/makefs/cd9660/iso9660_rrip.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r 47ea4cec5863 -r 5afa05aeb9cc usr.sbin/makefs/cd9660/iso9660_rrip.c
--- a/usr.sbin/makefs/cd9660/iso9660_rrip.c     Fri May 30 11:46:48 2014 +0000
+++ b/usr.sbin/makefs/cd9660/iso9660_rrip.c     Fri May 30 13:14:47 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iso9660_rrip.c,v 1.13 2013/07/30 16:02:23 reinoud 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
@@ -44,7 +44,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: iso9660_rrip.c,v 1.13 2013/07/30 16:02:23 reinoud Exp $");
+__RCSID("$NetBSD: iso9660_rrip.c,v 1.14 2014/05/30 13:14:47 martin Exp $");
 #endif  /* !__lint */
 
 static void cd9660_rrip_initialize_inode(cd9660node *);
@@ -657,13 +657,14 @@
        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;
 }