[Debburn-changes] r709 - in cdrkit/trunk: . debian wodim

[Eduard Bloch]

Author: blade
Date: 2007-03-15 23:20:37 +0000 (Thu, 15 Mar 2007)
New Revision: 709

Modified:
   cdrkit/trunk/Changelog
   cdrkit/trunk/debian/changelog
   cdrkit/trunk/wodim/defaults.c
Log:
Correct fallback to CDR_FIFOSIZE and correct error message on bad input

Modified: cdrkit/trunk/Changelog
===================================================================
--- cdrkit/trunk/Changelog	2007-03-15 22:56:45 UTC (rev 708)
+++ cdrkit/trunk/Changelog	2007-03-15 23:20:37 UTC (rev 709)
@@ -16,6 +16,8 @@
     cdrtools-2.01.01a24, excluding meta changes and big tree.c and mkisofs.c
     refactoring. Stream file name option enabled now.
   * wodim.1: "you have 4 seconds to abort ..."
+  * defaults.c: Correct fallback to CDR_FIFOSIZE and correct error message
+    on bad input.
 
   [ Peter Samuelson ]
   * Clean up Linux-2.6 CD/DVD-R drive detection, clearer error messages.

Modified: cdrkit/trunk/debian/changelog
===================================================================
--- cdrkit/trunk/debian/changelog	2007-03-15 22:56:45 UTC (rev 708)
+++ cdrkit/trunk/debian/changelog	2007-03-15 23:20:37 UTC (rev 709)
@@ -1,7 +1,8 @@
 cdrkit (9:1.1.3-1) unstable; urgency=medium
 
   * New upstream version with important bugfixes
-    + dealing with newline when searching for device (closes: #408456, 409005)
+    + dealing with newline when searching for device (closes: #408456).
+      Also telling the expected track size to not confuse (closes: #409005)
     + corrected picking up of the SCSI transfer size (closes: #407773)
     + restores forgotten compiler definitions on wodim (closes: #407611)
     + LFS support in UDF (closes: #411178, #401988)

Modified: cdrkit/trunk/wodim/defaults.c
===================================================================
--- cdrkit/trunk/wodim/defaults.c	2007-03-15 22:56:45 UTC (rev 708)
+++ cdrkit/trunk/wodim/defaults.c	2007-03-15 23:20:37 UTC (rev 709)
@@ -108,9 +108,9 @@
 				exit(EXIT_FAILURE);
 			}
 		}
-		else if(wc>2 && *sFs) {
+		else if(wc>2 && *sFs && strcmp("-1", sFs)) {
 			if(getnum(sFs, p_fifosize)!=1 || *p_fifosize<-1) {
-				fprintf(stderr, "Bad fifo size (%s) in the config, device description.\n", sSpeed);
+				fprintf(stderr, "Bad fifo size (%s) in the config, device description.\n", sFs);
 				exit(EXIT_FAILURE);
 			}
 		}
@@ -120,9 +120,6 @@
 				exit(EXIT_FAILURE);
 			}
 		}
-		/* undocumented option. Most likely to prevent killing Schily's
-		 * underpowered machines (see docs) by allocating too much memory after
-		 * doing a mistake in the config. */
 		if(NULL!=(t=cfg_get("CDR_MAXFIFOSIZE"))) {
 			long max;
 			if(getnum(t, &max)!=1 || *p_fifosize<-1) {