Module Name: src
Committed By: tls
Date: Sun Aug 10 06:59:43 UTC 2014
Modified Files:
src/usr.sbin/makefs/cd9660 [tls-earlyentropy]: iso9660_rrip.c
src/usr.sbin/makefs/msdos [tls-earlyentropy]: msdosfs_vfsops.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.2.1 src/usr.sbin/makefs/cd9660/iso9660_rrip.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/usr.sbin/makefs/msdos/msdosfs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/makefs/cd9660/iso9660_rrip.c
diff -u src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.13 src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.13.2.1
--- src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.13 Tue Jul 30 16:02:23 2013
+++ src/usr.sbin/makefs/cd9660/iso9660_rrip.c Sun Aug 10 06:59:43 2014
@@ -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.13.2.1 2014/08/10 06:59:43 tls 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.13.2.1 2014/08/10 06:59:43 tls Exp $");
#endif /* !__lint */
static void cd9660_rrip_initialize_inode(cd9660node *);
@@ -657,13 +657,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;
}
Index: src/usr.sbin/makefs/msdos/msdosfs_vfsops.c
diff -u src/usr.sbin/makefs/msdos/msdosfs_vfsops.c:1.7 src/usr.sbin/makefs/msdos/msdosfs_vfsops.c:1.7.8.1
--- src/usr.sbin/makefs/msdos/msdosfs_vfsops.c:1.7 Wed Jan 30 19:19:19 2013
+++ src/usr.sbin/makefs/msdos/msdosfs_vfsops.c Sun Aug 10 06:59:43 2014
@@ -50,7 +50,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.7 2013/01/30 19:19:19 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.7.8.1 2014/08/10 06:59:43 tls Exp $");
#include <sys/param.h>
@@ -407,7 +407,7 @@ error_exit:
free(pmp);
}
errno = error;
- return pmp;
+ return NULL;
}
int
