Removed a bug with SCSI address of scanned drives without such address

This commit is contained in:
Thomas Schmitt 2006-09-23 13:26:42 +00:00
parent c9a3fd3140
commit 81ceaf0cdd
3 changed files with 10 additions and 4 deletions

View File

@ -2757,9 +2757,12 @@ int Cdrskin_driveno_to_btldev(struct CdrskiN *skin, int driveno,
{ret= 2; goto adr_translation;}
}
fallback:;
if(skin->preskin->no_pseudo_scsi_adr)
sprintf(btldev,"%d",driveno);
else
if(skin->preskin->no_pseudo_scsi_adr) {
if(loc!=NULL)
strcpy(btldev,loc);
else
sprintf(btldev,"%d",driveno);
} else
sprintf(btldev,"0,%d,0",driveno);
ret= 0;

View File

@ -1 +1 @@
#define Cdrskin_timestamP "2006.09.23.114858"
#define Cdrskin_timestamP "2006.09.23.132755"

View File

@ -766,6 +766,9 @@ int burn_drive_obtain_scsi_adr(char *path, int *host_no, int *channel_no,
*channel_no = drive_array[i].channel;
*target_no = drive_array[i].id;
*lun_no = drive_array[i].lun;
if (*host_no < 0 || *channel_no < 0 ||
*target_no < 0 || *lun_no < 0)
return 0;
return 1;
}
}