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

Made -rom_toc_scan emul_off work with -mount ... sbsector ...

Browse Source
This commit is contained in:
Thomas Schmitt 2010-12-07 17:49:29 +00:00
parent fcf0089584
commit f614228d41
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libisoburn/trunk/xorriso/iso_img.c
View File

@ -888,7 +888,7 @@ int Xorriso_mount(struct XorrisO *xorriso, char *dev, int adr_mode,
char *adr_value, char *cmd, int flag) char *adr_value, char *cmd, int flag)
{ {
int ret, lba, track, session, params_flag= 0, is_safe= 0, is_extra_drive= 0; int ret, lba, track, session, params_flag= 0, is_safe= 0, is_extra_drive= 0;
int give_up= 0, mount_chardev= 0, status; int give_up= 0, mount_chardev= 0, status, aquire_flag;
char volid[33], *devadr, mount_command[SfileadrL], adr_data[163], *adr_pt; char volid[33], *devadr, mount_command[SfileadrL], adr_data[163], *adr_pt;
char *dev_path, libburn_adr[BURN_DRIVE_ADR_LEN + SfileadrL]; char *dev_path, libburn_adr[BURN_DRIVE_ADR_LEN + SfileadrL];
char sfe[5 * SfileadrL], *dpt, *sysname= ""; char sfe[5 * SfileadrL], *dpt, *sysname= "";
@ -957,7 +957,10 @@ int Xorriso_mount(struct XorrisO *xorriso, char *dev, int adr_mode,
if(ret == 0 && strncmp(dev, "stdio:", 6) != 0) if(ret == 0 && strncmp(dev, "stdio:", 6) != 0)
sprintf(libburn_adr, "stdio:%s", dev); sprintf(libburn_adr, "stdio:%s", dev);
burn_preset_device_open(xorriso->drives_exclusive, 0, 0); burn_preset_device_open(xorriso->drives_exclusive, 0, 0);
ret= isoburn_drive_aquire(&dinfo, libburn_adr, 1); aquire_flag= 1;
if((xorriso->toc_emulation_flag & 2) && adr_mode == 3)
aquire_flag|= 16;
ret= isoburn_drive_aquire(&dinfo, libburn_adr, aquire_flag);
burn_preset_device_open(1, 0, 0); burn_preset_device_open(1, 0, 0);
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
if(ret <= 0) if(ret <= 0)
@ -977,7 +980,7 @@ int Xorriso_mount(struct XorrisO *xorriso, char *dev, int adr_mode,
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
if(ret <= 0) if(ret <= 0)
goto ex; goto ex;
if(session <= 0 || track <= 0 || ret == 2) { if(((session <= 0 || track <= 0) && !(aquire_flag & 16)) || ret == 2) {
Xorriso_msgs_submit(xorriso, 0, Xorriso_msgs_submit(xorriso, 0,
"-mount : Given address does not point to an ISO 9660 session", "-mount : Given address does not point to an ISO 9660 session",
0, "FAILURE", 0); 0, "FAILURE", 0);

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2010.12.06.094347" #define Xorriso_timestamP "2010.12.07.174921"