D39258.diff
No OneTemporary
Actions

Size

1016 B

Referenced Files

None

Subscribers

None

D39258.diff
View Options

	diff --git a/usr.sbin/makefs/cd9660/iso9660_rrip.c b/usr.sbin/makefs/cd9660/iso9660_rrip.c
	--- a/usr.sbin/makefs/cd9660/iso9660_rrip.c
	+++ b/usr.sbin/makefs/cd9660/iso9660_rrip.c
	@@ -414,26 +414,12 @@
	} else {
	cd9660_rrip_initialize_inode(node);

	- /*
	- * Not every node needs a NM set - only if the name is
	- * actually different. IE: If a file is TEST -> TEST,
	- * no NM. test -> TEST, need a NM
	- *
	- * The rr_moved_dir needs to be assigned a NM record as well.
	- */
	if (node == diskStructure->rr_moved_dir) {
	cd9660_rrip_add_NM(node, RRIP_DEFAULT_MOVE_DIR_NAME);
	- }
	- else if ((node->node != NULL) &&
	- ((strlen(node->node->name) !=
	- (uint8_t)node->isoDirRecord->name_len[0]) \|\|
	- (memcmp(node->node->name,node->isoDirRecord->name,
	- (uint8_t)node->isoDirRecord->name_len[0]) != 0))) {
	+ } else if (node->node != NULL) {
	cd9660_rrip_NM(node);
	}

	-
	-
	/* Rock ridge directory relocation code here. */

	/* First handle the CL for the placeholder file. */