libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make --old_pseudo_scsi_adr -scanbus work with any drive_scsi_dev_family=

Browse Source
This commit is contained in:
Thomas Schmitt 2007-04-03 14:56:36 +00:00
parent 44af2b807d
commit 18f3442971
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libburn/trunk/cdrskin/cdrskin.c
View File

@ -3400,7 +3400,7 @@ wrong_devno:;
int Cdrskin_driveno_to_btldev(struct CdrskiN *skin, int driveno, int Cdrskin_driveno_to_btldev(struct CdrskiN *skin, int driveno,
char btldev[Cdrskin_adrleN], int flag) char btldev[Cdrskin_adrleN], int flag)
{ {
int k,ret,still_untranslated= 1,hret; int k,ret,still_untranslated= 1,hret,k_start;
char *loc= NULL,buf[Cdrskin_adrleN],adr[Cdrskin_adrleN]; char *loc= NULL,buf[Cdrskin_adrleN],adr[Cdrskin_adrleN];
if(driveno<0 || driveno>skin->n_drives) if(driveno<0 || driveno>skin->n_drives)
@ -3441,12 +3441,17 @@ int Cdrskin_driveno_to_btldev(struct CdrskiN *skin, int driveno,
} }
#endif #endif
if(strncmp(loc,"/dev/sg",7)==0) { k_start= 0;
for(k= 7;loc[k]!=0;k++) if(strncmp(loc,"/dev/sg",7)==0 || strncmp(loc,"/dev/sr",7)==0)
k_start= 7;
if(strncmp(loc,"/dev/scd",8)==0)
k_start= 8;
if(k_start>0) {
for(k= k_start;loc[k]!=0;k++)
if(loc[k]<'0' || loc[k]>'9') if(loc[k]<'0' || loc[k]>'9')
break; break;
if(loc[k]==0 && k>7) { if(loc[k]==0 && k>k_start) {
sprintf(btldev,"1,%s,0",loc+7); sprintf(btldev,"1,%s,0",loc+k_start);
{ret= 1; goto adr_translation;} {ret= 1; goto adr_translation;}
} }
} }

2
libburn/trunk/cdrskin/cdrskin_timestamp.h
View File

@ -1 +1 @@
#define Cdrskin_timestamP "2007.04.03.140356" #define Cdrskin_timestamP "2007.04.03.145637"