[Debburn-changes] r341 - in nonameyet/trunk: . cdrecord

[Eduard Bloch]

Author: blade
Date: 2006-09-26 20:54:02 +0000 (Tue, 26 Sep 2006)
New Revision: 341

Modified:
   nonameyet/trunk/Changelog
   nonameyet/trunk/cdrecord/cdrecord.c
   nonameyet/trunk/cdrecord/fifo.c
Log:
make sure that FIFO helper is killed on ungraceful termination, and print trackno debug message only with -vvv

Modified: nonameyet/trunk/Changelog
===================================================================
--- nonameyet/trunk/Changelog	2006-09-26 17:30:29 UTC (rev 340)
+++ nonameyet/trunk/Changelog	2006-09-26 20:54:02 UTC (rev 341)
@@ -12,6 +12,7 @@
   * reenabled (forgotten) support for libedc
   * table formating fixes in cdda2wav.1, helps small terminals
   * AIX 5l port
+  * killing FIFO process on ungraceful termination
 
   [ Eugen Dedu ]
   * corrections and constructive help on cdda2ogg

Modified: nonameyet/trunk/cdrecord/cdrecord.c
===================================================================
--- nonameyet/trunk/cdrecord/cdrecord.c	2006-09-26 17:30:29 UTC (rev 340)
+++ nonameyet/trunk/cdrecord/cdrecord.c	2006-09-26 20:54:02 UTC (rev 341)
@@ -1321,7 +1321,8 @@
    The real information is from read disk info command*/
    if((dp->cdr_dstat->ds_disktype&DT_DVD) && (dp->cdr_dstat->ds_trlast>0)){
       trackno=dp->cdr_dstat->ds_trlast-1;
-      printf("trackno=%d\n",trackno);
+	  if (lverbose > 2)
+		  printf("trackno=%d\n",trackno);
    }
 
 	if ((tracks + trackno) > MAX_TRACK) {
@@ -1488,6 +1489,7 @@
 	/*
 	 * Try to restore the old sector size and stop FIFO.
 	 */
+	kill_faio();
 	comexit(errs?-2:0);
 	return (0);
 }
@@ -1524,13 +1526,6 @@
 	signal(SIGINT, intr);
 	signal(SIGHUP, intr);
 	signal(SIGTERM, intr);
-	/*
-	 * Note to people who like to change this: I am geting patch requests
-	 * for an option to reduce the grace_time two times a year. I am not
-	 * willing to change things with respect to grace_time because it would
-	 * not reduce the needed time in a significant amount and because it
-	 * would break other things.
-	 */
 
 	for (i = gracetime; --i >= 0; ) {
 		sleep(1);

Modified: nonameyet/trunk/cdrecord/fifo.c
===================================================================
--- nonameyet/trunk/cdrecord/fifo.c	2006-09-26 17:30:29 UTC (rev 340)
+++ nonameyet/trunk/cdrecord/fifo.c	2006-09-26 20:54:02 UTC (rev 341)
@@ -417,7 +417,7 @@
 LOCAL	int	buf_idx_reader = 0;	/* Separate var to allow vfork()    */
 					/* buf_idx_reader is for the process */
 					/* that fills the FIFO		    */
-LOCAL	pid_t	faio_pid;
+LOCAL	pid_t	faio_pid = -1;
 LOCAL	BOOL	faio_didwait;
 
 #ifdef AMIGA
@@ -589,6 +589,7 @@
 {
 	if (faio_pid > 0)
 		kill(faio_pid, SIGKILL);
+  faio_pid=-1;
 }
 
 EXPORT int