[Debburn-changes] r600 - in cdrkit/trunk: icedax wodim

[Eduard Bloch]

Author: blade
Date: 2006-12-08 17:53:20 +0100 (Fri, 08 Dec 2006)
New Revision: 600

Modified:
   cdrkit/trunk/icedax/global.h
   cdrkit/trunk/icedax/icedax.1
   cdrkit/trunk/icedax/icedax.c
   cdrkit/trunk/icedax/interface.c
   cdrkit/trunk/wodim/scsi_scan.c
Log:
Added --devices to icedax

Modified: cdrkit/trunk/icedax/global.h
===================================================================
--- cdrkit/trunk/icedax/global.h	2006-12-08 15:56:49 UTC (rev 599)
+++ cdrkit/trunk/icedax/global.h	2006-12-08 16:53:20 UTC (rev 600)
@@ -47,6 +47,7 @@
 	int			scsi_silent;
 	int			scsi_verbose;
 	int			scanbus;
+	int			scandevs;
 	int			multiname;
 	int			sh_bits;
 	int			Remainder;

Modified: cdrkit/trunk/icedax/icedax.1
===================================================================
--- cdrkit/trunk/icedax/icedax.1	2006-12-08 15:56:49 UTC (rev 599)
+++ cdrkit/trunk/icedax/icedax.1	2006-12-08 16:53:20 UTC (rev 600)
@@ -335,6 +335,12 @@
 The numbers printed out as labels are computed by: 
 .B "bus * 100 + target
 .TP
+.B \-\-devices
+Like \-scanbus but works in a more native way, respecting the device name
+specification on the current operating system. See
+.B wodim(1)
+for details.
+.TP
 .B \-paranoia
 use the paranoia library instead of icedax's routines for reading.
 .TP

Modified: cdrkit/trunk/icedax/icedax.c
===================================================================
--- cdrkit/trunk/icedax/icedax.c	2006-12-08 15:56:49 UTC (rev 599)
+++ cdrkit/trunk/icedax/icedax.c	2006-12-08 16:53:20 UTC (rev 600)
@@ -161,7 +161,7 @@
 find-extremes,F,find-mono,G,no-infofile,H,\
 deemphasize,T,info-only,J,silent-scsi,Q,\
 cddbp-server*,cddbp-port*,\
-scanbus,device*,dev*,D*,auxdevice*,A*,interface*,I*,output-format*,O*,\
+scanbus,devices,device*,dev*,D*,auxdevice*,A*,interface*,I*,output-format*,O*,\
 output-endianess*,E*,cdrom-endianess*,C*,speed#,S#,\
 playback-realtime#L,p#L,md5#,M#,set-overlap#,P#,sound-device*,K*,\
 cddb#,L#,channels*,c*,bits-per-sample#,b#,rate#,r#,gui,g,\
@@ -733,6 +733,7 @@
   (-g) -gui			generate special output suitable for gui frontends.\n\
   (-Q) -silent-scsi		do not print status of erreneous scsi-commands.\n\
        -scanbus			scan the SCSI bus and exit\n\
+       --devices		scan for system devices and print with native names\n\
   (-M) md5=count		calculate MD-5 checksum for blocks of 'count' bytes.\n\
   (-q) -quiet			quiet operation, no screen output.\n\
   (-p) playback-realtime=perc	play (echo) audio pitched at perc percent (50%-200%).\n\
@@ -784,6 +785,7 @@
   global.scsi_silent = 0;
   global.scsi_verbose = 0;		/* SCSI verbose level */
   global.scanbus = 0;
+  global.scandevs = 0;
   global.multiname = 0;		/* multiple file names given */
   global.sh_bits  =  0;		/* sh_bits: sample bit shift */
   global.Remainder=  0;		/* remainder */
@@ -2116,6 +2118,7 @@
 
 			, &global.cddbp_server, &global.cddbp_port
 			, &global.scanbus
+			, &global.scandevs
 			, &global.dev_name, &global.dev_name, &global.dev_name
 			, &global.aux_name, &global.aux_name
 			, &int_name, &int_name

Modified: cdrkit/trunk/icedax/interface.c
===================================================================
--- cdrkit/trunk/icedax/interface.c	2006-12-08 15:56:49 UTC (rev 599)
+++ cdrkit/trunk/icedax/interface.c	2006-12-08 16:53:20 UTC (rev 600)
@@ -612,6 +612,11 @@
 		exit(NO_ERROR);
 	}
 
+	if (global.scandevs) {
+		scan_devices();
+		exit(0);
+	}
+
 	/* device name, debug, verboseopen */
 	usalp = usal_open(pdev_name, errstr, sizeof(errstr), 0, 0);
 

Modified: cdrkit/trunk/wodim/scsi_scan.c
===================================================================
--- cdrkit/trunk/wodim/scsi_scan.c	2006-12-08 15:56:49 UTC (rev 599)
+++ cdrkit/trunk/wodim/scsi_scan.c	2006-12-08 16:53:20 UTC (rev 600)
@@ -130,9 +130,9 @@
 			usal_close(usalp);
 		}
 	}
-	fprintf(stdout, "wodim: Overview of accessible drives (%d found) :\n"
+	fprintf(stdout, "%s: Overview of accessible drives (%d found) :\n"
 			"----------------------------------------------------------------------\n",
-			ndevs);
+			get_progname(), ndevs);
 	for(i=0;i<ndevs;i++)
 		fprintf(stdout, "%s", lines[i]);
 	fprintf(stdout,	"----------------------------------------------------------------------\n");