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

Clarified role of drive when parsing already loaded ISO 9660 superblock

Browse Source
This commit is contained in:
Thomas Schmitt 2012-07-25 18:15:26 +00:00
parent bb26a75b08
commit bce5a0251c
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libisoburn/trunk/libisoburn/burn_wrap.c
View File

@ -1199,7 +1199,7 @@ int isoburn_report_iso_error(int iso_error_code, char msg_text[], int os_errno,
bit15= -reserved- bit15= -reserved-
@return 1 seems to be a valid ISO image , 0 format not recognized, <0 error @return 1 seems to be a valid ISO image , 0 format not recognized, <0 error
*/ */
int isoburn_read_iso_head_parse(struct burn_drive *d, unsigned char *data, int isoburn_read_iso_head_parse(unsigned char *data,
int *image_blocks, char *info, int flag) int *image_blocks, char *info, int flag)
{ {
int i, info_mode; int i, info_mode;
@ -1297,13 +1297,13 @@ int isoburn_read_iso_head(struct burn_drive *d, int lba,
} }
if(flag&(1<<14)) { if(flag&(1<<14)) {
ret= isoburn_read_iso_head_parse(d, buffer, image_blocks, info, info_mode); ret= isoburn_read_iso_head_parse(buffer, image_blocks, info, info_mode);
if(ret<0) if(ret<0)
goto ex; goto ex;
if(ret>0) if(ret>0)
{ret= 2; goto ex;} {ret= 2; goto ex;}
} }
ret= isoburn_read_iso_head_parse(d, buffer+32*1024, image_blocks, info, ret= isoburn_read_iso_head_parse(buffer+32*1024, image_blocks, info,
info_mode); info_mode);
if(ret<=0) if(ret<=0)
goto ex; goto ex;

5
libisoburn/trunk/libisoburn/libisoburn.h
View File

@ -688,8 +688,9 @@ void isoburn_toc_disc_free(struct isoburn_toc_disc *disc);
2= @since 0.2.2 : 2= @since 0.2.2 :
copy 64 kB header to info (needs 65536 bytes) copy 64 kB header to info (needs 65536 bytes)
bit13= @since 0.2.2: bit13= @since 0.2.2:
do not read head from medium but use first 64 kB from Do not read head from medium but use first 64 kB from
info info.
In this case it is permissible to submit d == NULL.
bit14= check both half buffers (not only second) bit14= check both half buffers (not only second)
return 2 if found in first block return 2 if found in first block
bit15= return -1 on read error bit15= return -1 on read error

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

@ -1 +1 @@
#define Xorriso_timestamP "2012.07.20.184237" #define Xorriso_timestamP "2012.07.25.181415"