rpms/cdrkit/F-7 icedax-segfault.patch, NONE, 1.1 wodim-prtypo.patch, NONE, 1.1

[Harald Hoyer (harald)]

Author: harald

Update of /cvs/pkgs/rpms/cdrkit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17851

Added Files:
	icedax-segfault.patch wodim-prtypo.patch 
Log Message:
* Fri Sep 21 2007 Harald Hoyer <harald at redhat.com> - 1.1.6-5
- fixed rhbz#255001 - icedax --devices segfaults
- fixed rhbz#249357 - Typo in wodim output


icedax-segfault.patch:

--- NEW FILE icedax-segfault.patch ---
--- cdrkit-1.1.6/icedax/interface.c.segf	2007-09-21 10:34:36.000000000 +0200
+++ cdrkit-1.1.6/icedax/interface.c	2007-09-21 10:35:10.000000000 +0200
@@ -611,12 +611,6 @@ static int OpenCdRom(char *pdev_name)
 		usal_help(stderr);
 		exit(NO_ERROR);
 	}
-
-	if (global.scandevs) {
-		list_devices(usalp, stdout, 0);
-		exit(0);
-	}
-
 	/* device name, debug, verboseopen */
 	usalp = usal_open(pdev_name, errstr, sizeof(errstr), 0, 0);
 
@@ -661,6 +655,11 @@ static int OpenCdRom(char *pdev_name)
 	dontneedgroup();
 	dontneedroot();
 
+	if (global.scandevs) {
+		list_devices(usalp, stdout, 0);
+		exit(0);
+	}
+
 	if (global.scanbus) {
 		select_target(usalp, stdout);
 		exit(0);

wodim-prtypo.patch:

--- NEW FILE wodim-prtypo.patch ---
--- cdrkit-1.1.6/wodim/wodim.c.prtypo	2007-09-21 10:38:53.000000000 +0200
+++ cdrkit-1.1.6/wodim/wodim.c	2007-09-21 10:39:51.000000000 +0200
@@ -1485,7 +1485,7 @@ gracewait(cdr_t *dp, BOOL *didgracep)
 		printf("No chance to quit anymore.");
 		goto grace_done;
 	}
-	printf("Last chance to quit, starting %s write in  %d seconds.",
+	printf("Last chance to quit, starting %s write in   %d seconds.",
 		(dp->cdr_cmdflags & F_DUMMY)?"dummy":"real", gracetime);
 	flush();
 	signal(SIGINT, intr);