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

[Eduard Bloch]

Author: blade
Date: 2007-04-20 22:18:22 +0000 (Fri, 20 Apr 2007)
New Revision: 743

Modified:
   cdrkit/trunk/Changelog
   cdrkit/trunk/genisoimage/tree.c
Log:
Fake the .. entry with a sane mode where it was just ignored before

Modified: cdrkit/trunk/Changelog
===================================================================
--- cdrkit/trunk/Changelog	2007-04-20 21:53:20 UTC (rev 742)
+++ cdrkit/trunk/Changelog	2007-04-20 22:18:22 UTC (rev 743)
@@ -1,7 +1,5 @@
 cdrkit (1.1.5) UNRELEASED; urgency=low
 
-  * restored support for iso9660 file sizes up to 4GB-1
-  * forced MAGIC_ERROR definition for older version, thanks to T. Schmidt
   * always return a value in usal_sense_table(...), from a patch from
     SUSE (cdrkit-dvd-fix.patch)
   * explicite warning and more grace time if user specifies a size less than
@@ -14,9 +12,14 @@
     to provide backward compatibility
   * For SCSI devices, use only scd* on kernel 2.6 and sg* on kernel 2.4 until
     proper locking scheme is established
-  * customized the default APPID string in genisoimage
+  * genisoimage: customized the default APPID string in genisoimage
+  * genisoimage: restored support for iso9660 file sizes up to 4GB-1
+  * genisoimage: forced MAGIC_ERROR definition for older version, thanks 
+    to T. Schmidt
+  * genisoimage: workaround to create dummy ".." entry in the root directory
+    where it could be just ignored before
 
- -- Eduard Bloch <blade at debian.org>  Fri, 06 Apr 2007 16:22:49 +0200
+ -- Eduard Bloch <blade at debian.org>  Fri, 20 Apr 2007 23:41:13 +0200
 
 cdrkit (1.1.4) RELEASED; urgency=low
 

Modified: cdrkit/trunk/genisoimage/tree.c
===================================================================
--- cdrkit/trunk/genisoimage/tree.c	2007-04-20 21:53:20 UTC (rev 742)
+++ cdrkit/trunk/genisoimage/tree.c	2007-04-20 22:18:22 UTC (rev 743)
@@ -839,6 +839,7 @@
 
 	/* Now create the . and .. entries in rr_moved */
 	/* Now create an actual directory  entry */
+	memset(&root_statbuf, 0x0, sizeof(struct stat)); /* be sure */
 	attach_dot_entries(reloc_dir, &root_statbuf);
 }
 
@@ -1424,6 +1425,9 @@
 
 	/* We do this to make sure that the root entries are consistent */
 	if (this_dir == root && strcmp(short_name, "..") == 0) {
+		if(root_statbuf.st_mode == 0) { /* not seen yet, fake it */
+			root_statbuf.st_mode=S_IFDIR | S_IRWXU | S_IRWXG | S_IRWXO;
+		}
 		statbuf = root_statbuf;
 		lstatbuf = root_statbuf;
 	}