"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "xorriso/xorriso_private.h" between
xorriso-1.5.2.tar.gz and xorriso-1.5.4.tar.gz

About: GNU xorriso creates, loads, manipulates and writes ISO 9660 filesystem images with Rock Ridge extensions. It is suitable for incremental data backup and for production of bootable ISO 9660 images. GNU xorriso is a statical compilation of the libraries libburn, libisofs, libisoburn, and libjte.

xorriso_private.h  (xorriso-1.5.2):xorriso_private.h  (xorriso-1.5.4)
/* Command line oriented batch and dialog tool which creates, loads, /* Command line oriented batch and dialog tool which creates, loads,
manipulates and burns ISO 9660 filesystem images. manipulates and burns ISO 9660 filesystem images.
Copyright 2007-2019 Thomas Schmitt, <scdbackup@gmx.net> Copyright 2007-2020 Thomas Schmitt, <scdbackup@gmx.net>
Provided under GPL version 2 or later. Provided under GPL version 2 or later.
This file contains inner declarations of xorriso. This file contains inner declarations of xorriso.
The public interface is in xorriso.h The public interface is in xorriso.h
*/ */
/* For now, #ifdef Xorriso_is_xorriso_selF has no meaning. /* For now, #ifdef Xorriso_is_xorriso_selF has no meaning.
But it is already now to be set only by the xorriso.c module. But it is already now to be set only by the xorriso.c module.
*/ */
skipping to change at line 141 skipping to change at line 141
*/ */
int iso_level; int iso_level;
int iso_level_is_default; int iso_level_is_default;
int do_joliet; int do_joliet;
int do_hfsplus; int do_hfsplus;
int do_fat; int do_fat;
int do_rockridge; int do_rockridge;
int do_iso1999; int do_iso1999;
int ecma119_map; /* 0=unmapped , 1=stripped , 2=uppercase , 3=lowercase */ int ecma119_map; /* 0=unmapped , 1=stripped , 2=uppercase , 3=lowercase */
int joliet_map; /* 0=unmapped , 1=stripped */
int do_aaip; /* bit0= ACL in int do_aaip; /* bit0= ACL in
bit1= ACL out bit1= ACL out
bit2= EA in bit2= EA in
bit3= EA out bit3= EA out
bit4= record dev,inode per node, isofs_st_out in root bit4= record dev,inode per node, isofs_st_out in root
bit5= check dev,inode,isofs_st_in bit5= check dev,inode,isofs_st_in
bit6= omit content check if bit5 check is conclusive bit6= omit content check if bit5 check is conclusive
bit7= omit dev check with bit5 bit7= omit dev check with bit5
bit8= store output charset in xattr "isofs.cs" bit8= store output charset in xattr "isofs.cs"
skipping to change at line 164 skipping to change at line 165
if bit3: export to local filesystem all xattr if bit3: export to local filesystem all xattr
namespaces, not only "user." namespaces, not only "user."
*/ */
int do_md5; /* bit0= read MD5 array int do_md5; /* bit0= read MD5 array
bit1= write session MD5 bit1= write session MD5
bit2= write MD5 for each data file bit2= write MD5 for each data file
bit3= make file content stability check by double reading bit3= make file content stability check by double reading
bit4= use recorded MD5 as proxy of ISO file bit4= use recorded MD5 as proxy of ISO file
bit5= with bit0: do not check tags of superblock,tree,session bit5= with bit0: do not check tags of superblock,tree,session
bit6= during extraction verify file content by recorded MD5
bit7= with bit6: take lack of MD5 as error
*/ */
int no_emul_toc; /* bit0= On overwriteables: int no_emul_toc; /* bit0= On overwritables:
write first session to LBA 0 rather than 32. write first session to LBA 0 rather than 32.
*/ */
int do_old_empty; /* See -compliance old_empty int do_old_empty; /* See -compliance old_empty
own data content: range [0,31]. The new way is to have own data content: range [0,31]. The new way is to have
a dedicated block to which all such files will point. a dedicated block to which all such files will point.
*/ */
char scdbackup_tag_name[81]; char scdbackup_tag_name[81];
char scdbackup_tag_time[19]; char scdbackup_tag_time[19];
skipping to change at line 201 skipping to change at line 204
int do_follow_concat; int do_follow_concat;
int do_follow_mount; int do_follow_mount;
int do_global_uid; int do_global_uid;
uid_t global_uid; uid_t global_uid;
int do_global_gid; int do_global_gid;
gid_t global_gid; gid_t global_gid;
int do_global_mode; int do_global_mode;
mode_t global_dir_mode; mode_t global_dir_mode;
mode_t global_file_mode; mode_t global_file_mode;
int do_tao; /* 1= Use TAO resp. Incremental int do_tao; /* 1= Use TAO or Incremental
-1= Use SAO resp. DAO -1= Use SAO or DAO
0= let libburn choose */ 0= let libburn choose */
struct Xorriso_lsT *filters; struct Xorriso_lsT *filters;
int filter_list_closed; int filter_list_closed;
int zlib_level; int zlib_level;
int zlib_level_default; int zlib_level_default;
int zisofs_block_size; int zisofs_block_size;
int zisofs_block_size_default; int zisofs_block_size_default;
int zisofs_by_magic; int zisofs_by_magic;
int zisofs_v2_enabled; /* 0=no, 1=as_needed, 2=force */
uint64_t zisofs_max_total_blocks;
uint64_t zisofs_max_total_blocks_default;
uint64_t zisofs_max_file_blocks;
uint64_t zisofs_max_file_blocks_default;
int zisofs_v2_block_size;
int zisofs_v2_block_size_default;
int64_t zisofs_block_number_target;
double zisofs_bpt_discard_free_ratio;
double zisofs_bpt_discard_free_ratio_default;
int zisofs_susp_z2;
int zisofs_susp_z2_default;
int do_overwrite; /* 0=off, 1=on, 2=nondir */ int do_overwrite; /* 0=off, 1=on, 2=nondir */
int do_reassure; /* 0=off, 1=on, 2=tree */ int do_reassure; /* 0=off, 1=on, 2=tree */
uint32_t isofs_size; /* Size of loaded ISO filesystem */
int isofs_has_what; /* bit0= hasRR
bit1= hasJoliet
bit2= hasIso1999
bit3= hasElTorito
*/
int tree_loaded; /* 0= ISO 9660 , 1 = Joliet , 2 = ISO 9660:1999 */
int rr_loaded; /* 1= Rock Ridge information was used, 0= Not */
char volid[33]; char volid[33];
int volid_default; int volid_default;
char loaded_volid[33]; char loaded_volid[33];
char assert_volid[SfileadrL]; char assert_volid[SfileadrL];
char assert_volid_sev[80]; char assert_volid_sev[80];
char preparer_id[129]; char preparer_id[129];
char publisher[129]; char publisher[129];
char application_id[129]; char application_id[129];
skipping to change at line 249 skipping to change at line 273
/* >>> put libburn/isoburn aspects here */ /* >>> put libburn/isoburn aspects here */
struct Xorriso_lsT *drive_blacklist; struct Xorriso_lsT *drive_blacklist;
struct Xorriso_lsT *drive_greylist; struct Xorriso_lsT *drive_greylist;
struct Xorriso_lsT *drive_whitelist; struct Xorriso_lsT *drive_whitelist;
int toc_emulation_flag; /* bit0= bit3 for isoburn_drive_aquire() int toc_emulation_flag; /* bit0= bit3 for isoburn_drive_aquire()
scan -ROM profiles for ISO sessions scan -ROM profiles for ISO sessions
bit1= bit4 for isoburn_drive_aquire() bit1= bit4 for isoburn_drive_aquire()
do not emulate TOC on overwriteable media do not emulate TOC on overwritable media
bit2= bit7 for isoburn_drive_aquire() bit2= bit7 for isoburn_drive_aquire()
pretend any media to be -ROM pretend any media to be -ROM
bit3= bit9 for isoburn_drive_aquire() bit3= bit9 for isoburn_drive_aquire()
Ignore enclosing session at LBA 0 Ignore enclosing session at LBA 0
*/ */
int image_start_mode; /* From what address to load the ISO image int image_start_mode; /* From what address to load the ISO image
bit0-15= addressing mode bit0-15= addressing mode
0= automatic lba as deduced from media 0= automatic lba as deduced from media
1= value is session number 1= value is session number
skipping to change at line 354 skipping to change at line 378
*/ */
int ban_stdio_write; int ban_stdio_write;
int do_dummy; int do_dummy;
int do_close; int do_close;
int auto_close; /* Whether to let do_close depend on media state */ int auto_close; /* Whether to let do_close depend on media state */
int write_speed; /* Write speed in libburn units : 1000 bytes/second , int write_speed; /* Write speed in libburn units : 1000 bytes/second ,
0 = Max, -1 = Min, -2= do not set */ 0 = Max, -1 = Min, -2= do not set */
int read_speed; /* Read speed. See above */ int read_speed; /* Read speed. See above */
int read_speed_force; /* >0 : use burn_nominal_slowdown() in
Xorriso_check_interval() */
int read_speed_corr; /* parameter max_corr for burn_nominal_slowdown */
int fs; /* fifo size in 2048 byte chunks : at most 1 GB */ int fs; /* fifo size in 2048 byte chunks : at most 1 GB */
int padding; /* number of bytes to add after ISO 9660 image */ int padding; /* number of bytes to add after ISO 9660 image */
int do_padding_by_libisofs; /* 0= by libburn , 1= by libisofs */ int do_padding_by_libisofs; /* 0= by libburn , 1= by libisofs */
int alignment; /* if > 0 : output size alignment in 2048 byte blocks. int alignment; /* if > 0 : output size alignment in 2048 byte blocks.
This is always done by libburn, i.e. attached This is always done by libburn, i.e. attached
outside the image. Eventual inner alignment of outside the image. Eventual inner alignment of
the image end happens first. the image end happens first.
*/ */
skipping to change at line 415 skipping to change at line 442
int boot_emul_default; /* 1= boot_image_emul is still default */ int boot_emul_default; /* 1= boot_image_emul is still default */
off_t boot_image_load_size; off_t boot_image_load_size;
int boot_img_size_default; /* 1= boot_image_load_size is still default */ int boot_img_size_default; /* 1= boot_image_load_size is still default */
int boot_img_full_size; /* 1= override boot_image_load_size by image size */ int boot_img_full_size; /* 1= override boot_image_load_size by image size */
unsigned char boot_id_string[29]; unsigned char boot_id_string[29];
unsigned char boot_selection_crit[21]; unsigned char boot_selection_crit[21];
int boot_image_isohybrid; /* 0=off , deprecated: 1=auto , 2=on , 3=force */ int boot_image_isohybrid; /* 0=off , deprecated: 1=auto , 2=on , 3=force */
int boot_efi_default; /* 0= no effect , int boot_efi_default; /* 0= no effect ,
1= appy --efi-boot parameters when attaching to img */ 1= apply --efi-boot parameters when attaching to img
*/
char system_area_disk_path[SfileadrL]; char system_area_disk_path[SfileadrL];
int system_area_clear_loaded; int system_area_clear_loaded;
int system_area_options; /* bit0= "GRUB protective msdos label" int system_area_options; /* bit0= "GRUB protective msdos label"
(a simple partition table) (a simple partition table)
bit1= isohybrid boot image pointer bit1= isohybrid boot image pointer
and partition table and partition table
bit2-7= System area type bit2-7= System area type
0= with bit0 or bit1: MBR 0= with bit0 or bit1: MBR
else: unspecified type else: unspecified type
skipping to change at line 562 skipping to change at line 590
#ifdef Xorriso_with_libjtE #ifdef Xorriso_with_libjtE
/* Parameters and state of Jigdo Template Export environment */ /* Parameters and state of Jigdo Template Export environment */
struct libjte_env *libjte_handle; struct libjte_env *libjte_handle;
#endif #endif
/* List of -jigdo parameters since the most recent -jigdo clear */ /* List of -jigdo parameters since the most recent -jigdo clear */
struct Xorriso_lsT *jigdo_params; struct Xorriso_lsT *jigdo_params;
struct Xorriso_lsT *jigdo_values; struct Xorriso_lsT *jigdo_values;
int libjte_params_given; /* bits: 0= outfile , 1= verbosity , 2= template_path int libjte_params_given; /* bits: 0= outfile , 1= verbosity , 2= template_path
3= jigdo_path , 4= md5_path , 5= min_size 3= jigdo_path , 4= checksum_path
6= checksum_iso , 7= checksum_template 5= min_size , 6= checksum_iso
8= compression , 9= exclude , 10= demand_md5 7= checksum_template , 8= compression
11= mapping 9= exclude , 10= demand_checksum
11= mapping , 12= checksum_algorithm
*/ */
/* LBA of boot image after image loading */ /* LBA of boot image after image loading */
int loaded_boot_bin_lba; int loaded_boot_bin_lba;
/* Path of the catalog node after image loading */ /* Path of the catalog node after image loading */
char loaded_boot_cat_path[SfileadrL]; char loaded_boot_cat_path[SfileadrL];
/* XORRISO options */ /* XORRISO options */
int allow_graft_points; /* if not zero: yes int allow_graft_points; /* if not zero: yes
special options: special options:
skipping to change at line 660 skipping to change at line 689
int do_iso_rr_pattern; /* 0=off, 1=on, 2=ls */ int do_iso_rr_pattern; /* 0=off, 1=on, 2=ls */
int do_disk_pattern; /* 0=off, 1=on, 2=ls */ int do_disk_pattern; /* 0=off, 1=on, 2=ls */
int temp_mem_limit; int temp_mem_limit;
off_t file_size_limit; off_t file_size_limit;
int file_name_limit; int file_name_limit;
struct ExclusionS *disk_exclusions; struct ExclusionS *disk_exclusions;
int disk_excl_mode; /* bit0= on (else off) int disk_excl_mode; /* bit0= on (else off)
bit1= parameter too (else rekursion only) bit1= parameter too (else recursion only)
bit2= whole subtree banned (else only exact path) bit2= whole subtree banned (else only exact path)
bit3= when comparing ignore excluded files rather bit3= when comparing ignore excluded files rather
than to treat them as truly missing on disk than to treat them as truly missing on disk
*/ */
struct ExclusionS *iso_rr_hidings; struct ExclusionS *iso_rr_hidings;
struct ExclusionS *joliet_hidings; struct ExclusionS *joliet_hidings;
struct ExclusionS *hfsplus_hidings; struct ExclusionS *hfsplus_hidings;
int use_stdin; /* use raw stdin even if readline support is compiled */ int use_stdin; /* use raw stdin even if readline support is compiled */
skipping to change at line 835 skipping to change at line 864
/* For find jobs show_hfs_cmd , show_hfs_as_mkisofs /* For find jobs show_hfs_cmd , show_hfs_as_mkisofs
*/ */
/* bit0= do not record but only count /* bit0= do not record but only count
bit1= as_mkisofs mode bit1= as_mkisofs mode
*/ */
int show_hfs_cmd_flag; int show_hfs_cmd_flag;
int show_hfs_cmd_count; int show_hfs_cmd_count;
char **show_hfs_cmds; char **show_hfs_cmds;
/* Extraction to sparse files */
off_t sparse_min_gap;
/* result (stdout, R: ) */ /* result (stdout, R: ) */
char result_line[10*SfileadrL]; char result_line[10*SfileadrL];
int result_line_counter; int result_line_counter;
int result_page_counter; int result_page_counter;
int result_open_line_len; int result_open_line_len;
/* info (stderr, I:) */ /* info (stderr, I:) */
char info_text[10*SfileadrL]; char info_text[10*SfileadrL];
}; };
 End of changes. 13 change blocks. 
11 lines changed or deleted 43 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)