[Debburn-changes] r397 - in nonameyet/trunk: . debian mkisofs

[Eduard Bloch]

Author: blade
Date: 2006-11-15 16:12:23 +0100 (Wed, 15 Nov 2006)
New Revision: 397

Modified:
   nonameyet/trunk/Changelog
   nonameyet/trunk/debian/changelog
   nonameyet/trunk/mkisofs/write.c
Log:
sorted file list printing, by Dennis Vshivkov

Modified: nonameyet/trunk/Changelog
===================================================================
--- nonameyet/trunk/Changelog	2006-11-15 14:17:53 UTC (rev 396)
+++ nonameyet/trunk/Changelog	2006-11-15 15:12:23 UTC (rev 397)
@@ -7,6 +7,9 @@
     places
   * print Burnfree state/preparation messages only with high verbosity
 
+  [ Dennis Vshivkov ]
+  * sorted display of files when needed
+
  -- Eduard Bloch <blade at debian.org>  Wed, 15 Nov 2006 12:30:01 +0100
 
 cdrkit (1.0pre5) RELEASED; urgency=low

Modified: nonameyet/trunk/debian/changelog
===================================================================
--- nonameyet/trunk/debian/changelog	2006-11-15 14:17:53 UTC (rev 396)
+++ nonameyet/trunk/debian/changelog	2006-11-15 15:12:23 UTC (rev 397)
@@ -3,6 +3,7 @@
   * ATAPI -> ATA mapping and better error messages (closes: #398465)
   * more reliable FIFO process termination (closes: #398043)
   * prints burn-free message only with higher verbosity (closes: 388770)
+  * sorted file list printing, by Dennis Vshivkov (closes: #278071)
 
  -- Eduard Bloch <blade at debian.org>  Tue, 14 Nov 2006 15:08:16 +0100
 

Modified: nonameyet/trunk/mkisofs/write.c
===================================================================
--- nonameyet/trunk/mkisofs/write.c	2006-11-15 14:17:53 UTC (rev 396)
+++ nonameyet/trunk/mkisofs/write.c	2006-11-15 15:12:23 UTC (rev 397)
@@ -955,14 +955,29 @@
 		s_entry = dpnt->contents;
 		for (s_entry = dpnt->contents; s_entry; s_entry = s_entry->next) {
 			/* link files have already been given the weight NOT_SORTED */
-			if (s_entry->sort != NOT_SORTED)
-				continue;
+			if (s_entry->sort == NOT_SORTED)
+			{
+				/* update the start extent */
+				s_hash = find_hash(s_entry->dev, s_entry->inode);
+				if (s_hash) {
+					set_733((char *) s_entry->isorec.extent,
+							s_hash->starting_block);
+					s_entry->starting_block = s_hash->starting_block;
+				}
+			}
 
-			/* update the start extent */
-			s_hash = find_hash(s_entry->dev, s_entry->inode);
-			if (s_hash) {
-				set_733((char *) s_entry->isorec.extent, s_hash->starting_block);
-				s_entry->starting_block = s_hash->starting_block;
+			if (verbose > 2 && s_entry->size != 0) {
+				fprintf(stderr, "%8d %8d ",
+					s_entry->starting_block,
+					s_entry->starting_block + ISO_BLOCKS(s_entry->size) - 1);
+
+				if (s_entry->inode != TABLE_INODE) {
+					fprintf(stderr, "%s\n", s_entry->whole_name);
+				} else {
+					fprintf(stderr, "%s%s%s\n",
+						s_entry->filedir->whole_name,
+						SPATH_SEPARATOR, trans_tbl);
+				}
 			}
 		}
 		if (dpnt->subdir) {
@@ -1300,8 +1315,8 @@
 					last_extent += dwpnt->pad;
 				}
 #endif /* DVD_VIDEO */
-				if (verbose > 2) {
-					fprintf(stderr, "%d %d %s\n",
+				if (verbose > 2 && !do_sort) {
+					fprintf(stderr, "%8d %8d %s\n",
 						s_entry->starting_block,
 						last_extent - 1, whole_path);
 				}