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

Adapted to enhanced iso_write_opts_set_record_md5()

Browse Source
This commit is contained in:
Thomas Schmitt 2009-08-19 18:05:36 +00:00
parent 7c4cf26163
commit 7543f5d940
4 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libisoburn/isoburn.c
View File

@ -433,7 +433,7 @@ int isoburn_prepare_disc_aux(struct burn_drive *in_d, struct burn_drive *out_d,
iso_write_opts_set_dir_rec_mtime(wopts, opts->dir_rec_mtime); iso_write_opts_set_dir_rec_mtime(wopts, opts->dir_rec_mtime);
iso_write_opts_set_aaip_susp_1_10(wopts, opts->aaip_susp_1_10); iso_write_opts_set_aaip_susp_1_10(wopts, opts->aaip_susp_1_10);
iso_write_opts_set_sort_files(wopts, opts->sort_files); iso_write_opts_set_sort_files(wopts, opts->sort_files);
iso_write_opts_set_record_md5(wopts, opts->session_md5, opts->file_md5); iso_write_opts_set_record_md5(wopts, opts->session_md5, opts->file_md5 & 3);
iso_write_opts_set_replace_mode(wopts, opts->replace_dir_mode, iso_write_opts_set_replace_mode(wopts, opts->replace_dir_mode,
opts->replace_file_mode, opts->replace_uid, opts->replace_gid); opts->replace_file_mode, opts->replace_uid, opts->replace_gid);
iso_write_opts_set_default_dir_mode(wopts, opts->dir_mode); iso_write_opts_set_default_dir_mode(wopts, opts->dir_mode);
@ -879,7 +879,7 @@ int isoburn_igopt_set_extensions(struct isoburn_imgen_opts *o, int ext)
o->hardlinks= !!(ext & 8); o->hardlinks= !!(ext & 8);
o->aaip= !!(ext & 32); o->aaip= !!(ext & 32);
o->session_md5= !!(ext & 64); o->session_md5= !!(ext & 64);
o->file_md5= !!(ext & 128); o->file_md5= (ext & (128 | 256)) >> 7;
return(1); return(1);
} }
@ -888,7 +888,7 @@ int isoburn_igopt_get_extensions(struct isoburn_imgen_opts *o, int *ext)
{ {
*ext= (!!o->rockridge) | ((!!o->joliet)<<1) | ((!!o->iso1999)<<2) | *ext= (!!o->rockridge) | ((!!o->joliet)<<1) | ((!!o->iso1999)<<2) |
((!!o->hardlinks) << 3) | ((!!o->aaip) << 5) | ((!!o->hardlinks) << 3) | ((!!o->aaip) << 5) |
((!!o->session_md5) << 6) | ((!!o->file_md5) << 7); ((!!o->session_md5) << 6) | ((o->file_md5 & 3) << 7);
return(1); return(1);
} }

6
libisoburn/isoburn.h
View File

@ -334,8 +334,10 @@ struct isoburn_imgen_opts {
/* Produce and write a MD5 checksum of the whole session stream. */ /* Produce and write a MD5 checksum of the whole session stream. */
unsigned int session_md5 :1; unsigned int session_md5 :1;
/* Produce and write MD5 checksums for each single IsoFile. */ /* Produce and write MD5 checksums for each single IsoFile.
unsigned int file_md5 :1; See parameter files of iso_write_opts_set_record_md5().
*/
unsigned int file_md5 :2;
/* relaxed constraints */ /* relaxed constraints */

7
libisoburn/libisoburn.h
View File

@ -934,6 +934,12 @@ int isoburn_igopt_get_level(struct isoburn_imgen_opts *o, int *level);
bit7= file_md5 bit7= file_md5
@since 0.4.2 @since 0.4.2
Produce and write MD5 checksums for each single IsoFile. Produce and write MD5 checksums for each single IsoFile.
bit8= file_stability (only together with file_md5)
@since 0.4.2
Compute MD5 of each file before copying it into the image and
compare this with the MD5 of the actual copying. If they do
not match then issue MISHAP event.
See also libisofs.h iso_write_opts_set_record_md5()
@return 1 success, <=0 failure @return 1 success, <=0 failure
*/ */
#define isoburn_igopt_rockridge 1 #define isoburn_igopt_rockridge 1
@ -943,6 +949,7 @@ int isoburn_igopt_get_level(struct isoburn_imgen_opts *o, int *level);
#define isoburn_igopt_aaip 32 #define isoburn_igopt_aaip 32
#define isoburn_igopt_session_md5 64 #define isoburn_igopt_session_md5 64
#define isoburn_igopt_file_md5 128 #define isoburn_igopt_file_md5 128
#define isoburn_igopt_file_stability 256
int isoburn_igopt_set_extensions(struct isoburn_imgen_opts *o, int ext); int isoburn_igopt_set_extensions(struct isoburn_imgen_opts *o, int ext);
int isoburn_igopt_get_extensions(struct isoburn_imgen_opts *o, int *ext); int isoburn_igopt_get_extensions(struct isoburn_imgen_opts *o, int *ext);

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2009.08.18.191013" #define Xorriso_timestamP "2009.08.19.180632"