[Debburn-changes] r754 - in cdrkit/trunk: . genisoimage

Eduard Bloch blade at alioth.debian.org
Thu May 3 10:01:21 UTC 2007


Author: blade
Date: 2007-05-03 10:01:20 +0000 (Thu, 03 May 2007)
New Revision: 754

Modified:
   cdrkit/trunk/Changelog
   cdrkit/trunk/genisoimage/eltorito.c
Log:
Hiding boot catalog entry when needed, by Vladimir Nadvornik

Modified: cdrkit/trunk/Changelog
===================================================================
--- cdrkit/trunk/Changelog	2007-04-21 09:50:15 UTC (rev 753)
+++ cdrkit/trunk/Changelog	2007-05-03 10:01:20 UTC (rev 754)
@@ -1,3 +1,11 @@
+cdrkit (1.1.6) UNRELEASED; urgency=low
+
+  [ Vladimir Nadvornik ]
+  * genisoimage/eltorito.c: care about inhibit flags when preparing eltority
+    boot catalog directory entry, avoiding possible crashes
+
+ -- Eduard Bloch <blade at debian.org>  Thu, 03 May 2007 11:54:45 +0200
+
 cdrkit (1.1.5.1) RELEASED; urgency=low
 
   * resync with cosmetical last-minute changes from Peter Samuelson

Modified: cdrkit/trunk/genisoimage/eltorito.c
===================================================================
--- cdrkit/trunk/genisoimage/eltorito.c	2007-04-21 09:50:15 UTC (rev 753)
+++ cdrkit/trunk/genisoimage/eltorito.c	2007-05-03 10:01:20 UTC (rev 754)
@@ -228,6 +228,15 @@
 	iso9660_file_length(p2, s_entry, 0);
 
 	/* flag file as necessary */
+
+	/*
+	 * If the current directory is hidden, then hide this entry
+	 */
+	if (this_dir->dir_flags & INHIBIT_ISO9660_ENTRY)
+		bcat_de_flags |= INHIBIT_ISO9660_ENTRY;
+	if (this_dir->dir_flags & INHIBIT_JOLIET_ENTRY)
+		bcat_de_flags |= INHIBIT_JOLIET_ENTRY;
+
 	s_entry->de_flags = bcat_de_flags;
 
 	if ((use_XA || use_RockRidge) &&




More information about the Debburn-changes mailing list