[Debburn-changes] r731 - cdrkit/trunk/wodim
Peter Samuelson
peters-guest at alioth.debian.org
Fri Apr 6 20:11:40 UTC 2007
Author: peters-guest
Date: 2007-04-06 20:11:40 +0000 (Fri, 06 Apr 2007)
New Revision: 731
Modified:
cdrkit/trunk/wodim/scsi_scan.c
Log:
Followup to r729: use a slightly cleaner construction for the srN/sgN
selection code. Also change from srN to scdN, which is the preferred
name on Linux. (srN is a compatibility symlink.)
Modified: cdrkit/trunk/wodim/scsi_scan.c
===================================================================
--- cdrkit/trunk/wodim/scsi_scan.c 2007-04-06 14:23:53 UTC (rev 730)
+++ cdrkit/trunk/wodim/scsi_scan.c 2007-04-06 20:11:40 UTC (rev 731)
@@ -83,16 +83,14 @@
int i, ndevs=0;
BOOL have_tgt;
#ifdef linux
- char type=check_linux_26() ? 'r' : 'g';
+ const char *srdev = check_linux_26() ? "/dev/scd" : "/dev/sg";
fprintf(stderr, "Beginning native device scan. This may take a while if devices are busy...\n");
for(i=0;i<MAXDEVCOUNT;i++) {
if(i<26)
snprintf(devname, sizeof (devname), "/dev/hd%c", 'a'+i);
- else if(i<(256+26))
- snprintf(devname, sizeof (devname), "/dev/s%c%d", type, i-26);
else
- break;
+ snprintf(devname, sizeof (devname), "%s%d", srdev, i-26);
if(stat(devname, &statbuf))
continue;
More information about the Debburn-changes
mailing list