[Debburn-changes] r396 - in nonameyet/trunk: . cdrecord debian
Eduard Bloch
blade at alioth.debian.org
Wed Nov 15 15:17:54 CET 2006
Author: blade
Date: 2006-11-15 15:17:53 +0100 (Wed, 15 Nov 2006)
New Revision: 396
Modified:
nonameyet/trunk/Changelog
nonameyet/trunk/cdrecord/cdrecord.c
nonameyet/trunk/cdrecord/drv_mmc.c
nonameyet/trunk/debian/changelog
nonameyet/trunk/debian/control
Log:
* more reliable FIFO process termination (closes: #398043)
* prints burn-free message only with higher verbosity (closes: 388770)
Modified: nonameyet/trunk/Changelog
===================================================================
--- nonameyet/trunk/Changelog 2006-11-15 11:38:01 UTC (rev 395)
+++ nonameyet/trunk/Changelog 2006-11-15 14:17:53 UTC (rev 396)
@@ -2,10 +2,14 @@
[ Eduard Bloch ]
* mapping of ATAPI: -> ATA: method on linux-2.6 and some code beautification
+ * added a atexit handler to stop the FIFO process more reliably, since
+ Schilling's constructs seem to terminate the application on too many
+ places
+ * print Burnfree state/preparation messages only with high verbosity
-- Eduard Bloch <blade at debian.org> Wed, 15 Nov 2006 12:30:01 +0100
-cdrkit (1.0pre5) UNRELEASED; urgency=low
+cdrkit (1.0pre5) RELEASED; urgency=low
[ Eduard Bloch ]
* added better check for capability.h and FATAL_ERROR if it's missing on Linux
Modified: nonameyet/trunk/cdrecord/cdrecord.c
===================================================================
--- nonameyet/trunk/cdrecord/cdrecord.c 2006-11-15 11:38:01 UTC (rev 395)
+++ nonameyet/trunk/cdrecord/cdrecord.c 2006-11-15 14:17:53 UTC (rev 396)
@@ -281,6 +281,10 @@
int exflags;
} exargs;
+void fifo_cleanup(void) {
+ kill_faio();
+}
+
EXPORT int
main(ac, av)
int ac;
@@ -1174,6 +1178,8 @@
else
on_comerr(excdr, &exargs);
+ atexit(fifo_cleanup);
+
#if defined(USE_POSIX_PRIORITY_SCHEDULING) && defined(HAVE_SETREUID)
/*
* XXX Below this point we never need root privilleges anymore.
Modified: nonameyet/trunk/cdrecord/drv_mmc.c
===================================================================
--- nonameyet/trunk/cdrecord/drv_mmc.c 2006-11-15 11:38:01 UTC (rev 395)
+++ nonameyet/trunk/cdrecord/drv_mmc.c 2006-11-15 14:17:53 UTC (rev 396)
@@ -2581,16 +2581,18 @@
MS_MULTI : MS_NONE;
mp->session_format = toc2sess[track_base(trackp)->tracktype & TOC_MASK];
- if (lverbose && dp->cdr_cdcap->BUF != 0)
+ if (lverbose > 2 && dp->cdr_cdcap->BUF != 0)
printf("BURN-Free is %s.\n", mp->BUFE?"ON":"OFF");
if (driveropts != NULL) {
if ((strcmp(driveropts, "burnproof") == 0 ||
strcmp(driveropts, "burnfree") == 0) && dp->cdr_cdcap->BUF != 0) {
- errmsgno(EX_BAD, "Turning BURN-Free on\n");
+ if(lverbose>2)
+ errmsgno(EX_BAD, "Turning BURN-Free on\n");
mp->BUFE = 1;
} else if ((strcmp(driveropts, "noburnproof") == 0 ||
strcmp(driveropts, "noburnfree") == 0)) {
- errmsgno(EX_BAD, "Turning BURN-Free off\n");
+ if(lverbose>2)
+ errmsgno(EX_BAD, "Turning BURN-Free off\n");
mp->BUFE = 0;
} else if (strcmp(driveropts, "help") == 0) {
mmc_opthelp(dp, 0);
@@ -3081,7 +3083,7 @@
burnfree = rp && rp->BUEFE != 0;
}
- if (lverbose && (dp->cdr_flags & CDR_BURNFREE) != 0)
+ if (lverbose>2 && (dp->cdr_flags & CDR_BURNFREE) != 0)
printf("BURN-Free is %s.\n", burnfree?"ON":"OFF");
if (!burnfree && (dp->cdr_dstat->ds_cdrflags & RF_BURNFREE) != 0) {
Modified: nonameyet/trunk/debian/changelog
===================================================================
--- nonameyet/trunk/debian/changelog 2006-11-15 11:38:01 UTC (rev 395)
+++ nonameyet/trunk/debian/changelog 2006-11-15 14:17:53 UTC (rev 396)
@@ -1,6 +1,8 @@
cdrkit (5:1.0~pre5-1.1) unstable; urgency=low
- * ATAPI -> ATA mapping and better error messages
+ * 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)
-- Eduard Bloch <blade at debian.org> Tue, 14 Nov 2006 15:08:16 +0100
Modified: nonameyet/trunk/debian/control
===================================================================
--- nonameyet/trunk/debian/control 2006-11-15 11:38:01 UTC (rev 395)
+++ nonameyet/trunk/debian/control 2006-11-15 14:17:53 UTC (rev 396)
@@ -10,7 +10,7 @@
Architecture: any
Depends: ${shlibs:Depends}
Recommends: mkisofs
-Replaces: cdrtools-doc (<< 5:1.0~pre1-0), cdrecord (<< 5:1.0~pre1-0)
+Replaces: cdrtools-doc (<< 5:1.0~pre1-1), cdrecord (<< 5:1.0~pre1-1)
Suggests: cdrkit-doc
Conflicts: cdrecord (<< 5:1.0~pre1-1)
Description: command line CD/DVD writing tool
More information about the Debburn-changes
mailing list