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

[Eduard Bloch]

Author: blade
Date: 2007-04-21 07:14:45 +0000 (Sat, 21 Apr 2007)
New Revision: 744

Modified:
   cdrkit/trunk/Changelog
   cdrkit/trunk/genisoimage/tree.c
Log:
Removed the permissions simultation, there is no such directory entry anyway so avoid cludges

Modified: cdrkit/trunk/Changelog
===================================================================
--- cdrkit/trunk/Changelog	2007-04-20 22:18:22 UTC (rev 743)
+++ cdrkit/trunk/Changelog	2007-04-21 07:14:45 UTC (rev 744)
@@ -16,8 +16,7 @@
   * 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
+  * genisoimage: avoid pointless warnings on filetype of <root directory>/".."
 
  -- Eduard Bloch <blade at debian.org>  Fri, 20 Apr 2007 23:41:13 +0200
 

Modified: cdrkit/trunk/genisoimage/tree.c
===================================================================
--- cdrkit/trunk/genisoimage/tree.c	2007-04-20 22:18:22 UTC (rev 743)
+++ cdrkit/trunk/genisoimage/tree.c	2007-04-21 07:14:45 UTC (rev 744)
@@ -1421,13 +1421,8 @@
 	if (this_dir == root && strcmp(short_name, ".") == 0)
 		root_statbuf = statbuf;	/* Save this for later on */
 
-	printf("hab: %s, gesetzt, st_mode: %d\n", short_name, statbuf.st_mode);
-
 	/* 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;
 	}
@@ -1601,10 +1596,12 @@
 		!S_ISFIFO(lstatbuf.st_mode) && !S_ISSOCK(lstatbuf.st_mode) &&
 		!S_ISLNK(lstatbuf.st_mode) && !S_ISREG(lstatbuf.st_mode) &&
 		!S_ISDIR(lstatbuf.st_mode)) {
-		fprintf(stderr,
-		"Unknown file type (%s) %s - ignoring and continuing.\n",
-			filetype((int) lstatbuf.st_mode), whole_path);
-		return (0);
+        if ( ! (this_dir == root && strcmp(short_name, "..") == 0)) {
+            fprintf(stderr,
+                    "Unknown file type (%s) %s - ignoring and continuing.\n",
+                    filetype((int) lstatbuf.st_mode), whole_path);
+            return (0);
+        }
 	}
 	/* Who knows what trash this is - ignore and continue */