Tue Apr 18 23:02:51 2023 UTC ()

We previously attempted to emit Rock Ridge NM records only when the name
represented by the Rock Ridge extensions would actually differ. We would
omit the record for an all-upper-case directory name, however Linux (and
perhaps other operating systems) map names with no NM record to
lowercase.

This affected only directories, as file names have an implicit ";1"
version number appended and thus always differ.  To solve, just emit NM
records for all entries other than DOT and DOTDOT .

We could continue to omit the NM record for directories that would avoid
mapping (for example, one named 1234.567) but this does not seem worth
the complexity.

From FreeBSD https://reviews.freebsd.org/D39258


(christos)

diff -r1.15 -r1.16 src/usr.sbin/makefs/cd9660/iso9660_rrip.c

--- src/usr.sbin/makefs/cd9660/iso9660_rrip.c 2023/04/18 22:56:41	1.15
+++ src/usr.sbin/makefs/cd9660/iso9660_rrip.c 2023/04/18 23:02:51	1.16

 @@ -1,14 +1,14 @@
-/*	$NetBSD: iso9660_rrip.c,v 1.15 2023/04/18 22:56:41 christos Exp $	*/
+/*	$NetBSD: iso9660_rrip.c,v 1.16 2023/04/18 23:02:51 christos Exp $	*/
 /*
  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
  * Perez-Rathke and Ram Vedam.  All rights reserved.
+ *
  * This code was written by Daniel Watt, Walter Deignan, Ryan Gabrys,
  * Alan Perez-Rathke and Ram Vedam.
+ *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
  * conditions are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -34,27 +34,27 @@
 /* This will hold all the function definitions
  * defined in iso9660_rrip.h
  */
 #include "makefs.h"
 #include "cd9660.h"
 #include "iso9660_rrip.h"
 #include <sys/queue.h>
 #include <stdio.h>
 #include <util.h>
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: iso9660_rrip.c,v 1.15 2023/04/18 22:56:41 christos Exp $");
+__RCSID("$NetBSD: iso9660_rrip.c,v 1.16 2023/04/18 23:02:51 christos Exp $");
 #endif  /* !__lint */
 static void cd9660_rrip_initialize_inode(cd9660node *);
 static int cd9660_susp_handle_continuation(iso9660_disk *, cd9660node *);
 static int cd9660_susp_handle_continuation_common(iso9660_disk *, cd9660node *,
     int);
 int
 cd9660_susp_initialize(iso9660_disk *diskStructure, cd9660node *node,
     cd9660node *parent, cd9660node *grandparent)
+{
 	cd9660node *cn;
 	int r;
 @@ -403,46 +403,32 @@ cd9660_rrip_initialize_node(iso9660_disk
 			cd9660node_rrip_px(current, grandparent->node);
 			TAILQ_INSERT_TAIL(&node->head, current, rr_ll);
+		}
 		/* Handle PL */
 		if (parent != NULL && parent->rr_real_parent != NULL) {
 			current = cd9660node_susp_create_node(SUSP_TYPE_RRIP,
 			    SUSP_ENTRY_RRIP_PL, "PL", SUSP_LOC_DOTDOT);
 			cd9660_rrip_PL(current,node);
 			TAILQ_INSERT_TAIL(&node->head, current, rr_ll);
+		}
 	} 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) {
 		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))) {
 			cd9660_rrip_NM(node);
+		}
 		/* Rock ridge directory relocation code here. */
 		/* First handle the CL for the placeholder file. */
 		if (node->rr_relocated != NULL) {
 			current = cd9660node_susp_create_node(SUSP_TYPE_RRIP,
 				SUSP_ENTRY_RRIP_CL, "CL", SUSP_LOC_ENTRY);
 			cd9660_rrip_CL(current, node);
 			TAILQ_INSERT_TAIL(&node->head, current, rr_ll);
+		}
 		/* Handle RE*/
 		if (node->rr_real_parent != NULL) {
 			current = cd9660node_susp_create_node(SUSP_TYPE_RRIP,