[Debburn-changes] r644 - in cdrkit/trunk: . libusal wodim

[Eduard Bloch]

Author: blade
Date: 2006-12-27 19:44:40 +0100 (Wed, 27 Dec 2006)
New Revision: 644

Modified:
   cdrkit/trunk/Changelog
   cdrkit/trunk/libusal/scsi-linux-sg.c
   cdrkit/trunk/wodim/wodim.c
Log:
Minor fixes on msifile suggested by Thomas Schmidt

Modified: cdrkit/trunk/Changelog
===================================================================
--- cdrkit/trunk/Changelog	2006-12-27 17:12:37 UTC (rev 643)
+++ cdrkit/trunk/Changelog	2006-12-27 18:44:40 UTC (rev 644)
@@ -15,6 +15,8 @@
   * get maximum DMA buffer size from sysfs on Linux, where possible
   * enable BURN-Free by default where possible
   * genisoimage documentation updates, mkisofs name changes
+  * changed device access max. attempt count to 3, that is enough to inform
+    the user that something is there and it is busy
 
   [ Thomas Schmidt ]
   * workaround for older libmagic API

Modified: cdrkit/trunk/libusal/scsi-linux-sg.c
===================================================================
--- cdrkit/trunk/libusal/scsi-linux-sg.c	2006-12-27 17:12:37 UTC (rev 643)
+++ cdrkit/trunk/libusal/scsi-linux-sg.c	2006-12-27 18:44:40 UTC (rev 644)
@@ -253,7 +253,7 @@
        int i;
        f = open(device, mode|O_EXCL);
        /* try to reopen locked/busy devices up to five times */
-       for (i = 0; (i < 5) && (f == -1 && errno == EBUSY); i++) {
+       for (i = 0; (i < 3) && (f == -1 && errno == EBUSY); i++) {
 	       fprintf(stderr, "Error trying to open %s exclusively (%s)... %s\n",
                device, strerror(errno), 
                (i<4)?"retrying in 1 second.":"giving up.");

Modified: cdrkit/trunk/wodim/wodim.c
===================================================================
--- cdrkit/trunk/wodim/wodim.c	2006-12-27 17:12:37 UTC (rev 643)
+++ cdrkit/trunk/wodim/wodim.c	2006-12-27 18:44:40 UTC (rev 644)
@@ -1635,7 +1635,8 @@
 	fprintf(stderr, "\t-lock		load and lock the disk and exit (works only with tray loader)\n");
 	fprintf(stderr, "\t-eject		eject the disk after doing the work\n");
 	fprintf(stderr, "\t-dummy		do everything with laser turned off\n");
-	fprintf(stderr, "\t-msinfo		retrieve multi-session info for mkisofs >= 1.10\n");
+	fprintf(stderr, "\t-msinfo		retrieve multi-session info for genisoimage\n");
+	fprintf(stderr, "\t-msifile=path	run -msinfo and copy output to file\n");
 	fprintf(stderr, "\t-toc		retrieve and print TOC/PMA data\n");
 	fprintf(stderr, "\t-atip		retrieve and print ATIP data\n");
 	fprintf(stderr, "\t-multi		generate a TOC that allows multi session\n");
@@ -4095,7 +4096,7 @@
 	if(msifile) {
 		FILE *f = fopen(msifile, "w");
 		if(f) {
-			fprintf(f, "%ld,%ld\n", off, fa);
+			fprintf(f, "%ld,%ld", off, fa);
 			fclose(f);
 		}
 		else {