Compare commits
2 Commits
47be075c45
...
3542e8af97
Author | SHA1 | Date | |
---|---|---|---|
3542e8af97 | |||
b3adff1daa |
|
@ -7,7 +7,7 @@
|
||||||
Class core of libisoburn.
|
Class core of libisoburn.
|
||||||
|
|
||||||
Copyright 2007 - 2009 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
|
Copyright 2007 - 2009 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
|
||||||
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.
|
||||||
*/
|
*/
|
||||||
|
@ -1106,6 +1106,15 @@ int isoburn_ropt_get_size_what(struct isoburn_read_opts *o,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int isoburn_ropt_get_tree_loaded(struct isoburn_read_opts *o,
|
||||||
|
int *tree, int *rr)
|
||||||
|
{
|
||||||
|
*tree= o->tree_loaded;
|
||||||
|
*rr= o->rr_loaded;
|
||||||
|
return(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------- */
|
/* ----------------------------------------------------------------------- */
|
||||||
/*
|
/*
|
||||||
Options for image generation by libisofs and image transport to libburn.
|
Options for image generation by libisofs and image transport to libburn.
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
Class struct of libisoburn.
|
Class struct of libisoburn.
|
||||||
|
|
||||||
Copyright 2007 - 2009 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
|
Copyright 2007 - 2009 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
|
||||||
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.
|
||||||
*/
|
*/
|
||||||
|
@ -388,6 +388,11 @@ struct isoburn_read_opts {
|
||||||
|
|
||||||
uint32_t size; /**< Will be filled with the size (in 2048 byte block) of
|
uint32_t size; /**< Will be filled with the size (in 2048 byte block) of
|
||||||
* the image, as reported in the PVM. */
|
* the image, as reported in the PVM. */
|
||||||
|
|
||||||
|
int tree_loaded; /* from iso_read_image_features_tree_loaded() */
|
||||||
|
int rr_loaded; /* from iso_read_image_features_rr_loaded */
|
||||||
|
|
||||||
|
|
||||||
unsigned int pretend_blank:1; /* always create empty image */
|
unsigned int pretend_blank:1; /* always create empty image */
|
||||||
|
|
||||||
uint32_t displacement;
|
uint32_t displacement;
|
||||||
|
|
|
@ -6,8 +6,8 @@
|
||||||
/*
|
/*
|
||||||
libisofs related functions of libisoburn.
|
libisofs related functions of libisoburn.
|
||||||
|
|
||||||
Copyright 2007 - 2017 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
|
Copyright 2007 - 2009 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
|
||||||
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.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -332,6 +332,8 @@ displacement_rollover:;
|
||||||
read_opts->hasIso1999 = iso_read_image_features_has_iso1999(features);
|
read_opts->hasIso1999 = iso_read_image_features_has_iso1999(features);
|
||||||
read_opts->hasElTorito = iso_read_image_features_has_eltorito(features);
|
read_opts->hasElTorito = iso_read_image_features_has_eltorito(features);
|
||||||
read_opts->size = iso_read_image_features_get_size(features);
|
read_opts->size = iso_read_image_features_get_size(features);
|
||||||
|
read_opts->tree_loaded = iso_read_image_features_tree_loaded(features);
|
||||||
|
read_opts->rr_loaded = iso_read_image_features_rr_loaded(features);
|
||||||
ret= 1;
|
ret= 1;
|
||||||
ex:;
|
ex:;
|
||||||
if(msg != NULL)
|
if(msg != NULL)
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
Lower level API definition of libisoburn.
|
Lower level API definition of libisoburn.
|
||||||
|
|
||||||
Copyright 2007-2009 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
|
Copyright 2007-2009 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
|
||||||
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.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -1063,7 +1063,8 @@ int isoburn_ropt_get_truncate_mode(struct isoburn_read_opts *o,
|
||||||
|
|
||||||
|
|
||||||
/** After calling function isoburn_read_image() there are information
|
/** After calling function isoburn_read_image() there are information
|
||||||
available in the option set.
|
available in the option set about the size and the available extra trees
|
||||||
|
and extensions in the ISO filesystem.
|
||||||
This info can be obtained as bits in parameter has_what. Like:
|
This info can be obtained as bits in parameter has_what. Like:
|
||||||
joliet_available = (has_what & isoburn_ropt_has_joliet);
|
joliet_available = (has_what & isoburn_ropt_has_joliet);
|
||||||
@since 0.1.0
|
@since 0.1.0
|
||||||
|
@ -1071,12 +1072,13 @@ int isoburn_ropt_get_truncate_mode(struct isoburn_read_opts *o,
|
||||||
@param size Number of image data blocks, 2048 bytes each.
|
@param size Number of image data blocks, 2048 bytes each.
|
||||||
@param has_what Bitfield:
|
@param has_what Bitfield:
|
||||||
bit0= has_rockridge
|
bit0= has_rockridge
|
||||||
RockRidge extension info is available (POSIX filesystem)
|
RockRidge extension info is available in the ISO 9660 tree
|
||||||
|
(POSIX filesystem)
|
||||||
bit1= has_joliet
|
bit1= has_joliet
|
||||||
Joliet extension info is available (suitable for MS-Windows)
|
Joliet tree is available (suitable for MS-Windows)
|
||||||
bit2= has_iso1999
|
bit2= has_iso1999
|
||||||
ISO version 2 Enhanced Volume Descriptor is available.
|
ISO version 2 Enhanced Volume Descriptor aka ISO 9660:1999
|
||||||
This is rather exotic.
|
and its tree is available. This is rather exotic.
|
||||||
bit3= has_el_torito
|
bit3= has_el_torito
|
||||||
El-Torito boot record is present
|
El-Torito boot record is present
|
||||||
@return 1 success, <=0 failure
|
@return 1 success, <=0 failure
|
||||||
|
@ -1096,6 +1098,19 @@ int isoburn_ropt_get_size_what(struct isoburn_read_opts *o,
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
/** After calling function isoburn_read_image() there are information
|
||||||
|
available in the option set about which tree was used for image loading
|
||||||
|
and whether Rock Ridge information was actually used.
|
||||||
|
@since 1.5.4
|
||||||
|
@param o The option set to work on
|
||||||
|
@param tree The tree which was loaded:
|
||||||
|
0= ISO 9660 , 1 = Joliet , 2 = ISO 9660:1999
|
||||||
|
@param rr 1= Rock Ridge information was used, 0 = No Rock Ridge was used
|
||||||
|
@return 1 success, <=0 failure
|
||||||
|
*/
|
||||||
|
int isoburn_ropt_get_tree_loaded(struct isoburn_read_opts *o,
|
||||||
|
int *tree, int *rr);
|
||||||
|
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------- */
|
/* ----------------------------------------------------------------------- */
|
||||||
/* End of Options for image reading */
|
/* End of Options for image reading */
|
||||||
|
|
|
@ -111,6 +111,7 @@ isoburn_ropt_get_displacement;
|
||||||
isoburn_ropt_get_extensions;
|
isoburn_ropt_get_extensions;
|
||||||
isoburn_ropt_get_input_charset;
|
isoburn_ropt_get_input_charset;
|
||||||
isoburn_ropt_get_size_what;
|
isoburn_ropt_get_size_what;
|
||||||
|
isoburn_ropt_get_tree_loaded;
|
||||||
isoburn_ropt_get_truncate_mode;
|
isoburn_ropt_get_truncate_mode;
|
||||||
isoburn_ropt_new;
|
isoburn_ropt_new;
|
||||||
isoburn_ropt_set_auto_incharset;
|
isoburn_ropt_set_auto_incharset;
|
||||||
|
|
|
@ -168,6 +168,9 @@ int Xorriso_new(struct XorrisO ** xorriso,char *progname, int flag)
|
||||||
m->do_follow_mount= 1;
|
m->do_follow_mount= 1;
|
||||||
m->do_global_uid= 0;
|
m->do_global_uid= 0;
|
||||||
m->global_uid= 0;
|
m->global_uid= 0;
|
||||||
|
m->isofs_has_what= 0;
|
||||||
|
m->tree_loaded= 0;
|
||||||
|
m->rr_loaded= 0;
|
||||||
strcpy(m->volid, "ISOIMAGE");
|
strcpy(m->volid, "ISOIMAGE");
|
||||||
m->volid_default= 1;
|
m->volid_default= 1;
|
||||||
m->loaded_volid[0]= 0;
|
m->loaded_volid[0]= 0;
|
||||||
|
|
|
@ -692,6 +692,10 @@ int Xorriso_aquire_drive(struct XorrisO *xorriso, char *adr, char *show_adr,
|
||||||
}
|
}
|
||||||
Xorriso_process_msg_queues(xorriso,0);
|
Xorriso_process_msg_queues(xorriso,0);
|
||||||
isoburn_ropt_get_size_what(ropts, &size, &has_what);
|
isoburn_ropt_get_size_what(ropts, &size, &has_what);
|
||||||
|
xorriso->isofs_has_what= has_what;
|
||||||
|
isoburn_ropt_get_tree_loaded(ropts, &(xorriso->tree_loaded),
|
||||||
|
&(xorriso->rr_loaded));
|
||||||
|
|
||||||
if(has_what & isoburn_ropt_has_el_torito) {
|
if(has_what & isoburn_ropt_has_el_torito) {
|
||||||
if(xorriso->boot_image_bin_path[0])
|
if(xorriso->boot_image_bin_path[0])
|
||||||
boot_fate= "replaced by new boot image";
|
boot_fate= "replaced by new boot image";
|
||||||
|
@ -1279,6 +1283,20 @@ int Xorriso_toc(struct XorrisO *xorriso, int flag)
|
||||||
if(!(flag & 2))
|
if(!(flag & 2))
|
||||||
Xorriso_show_boot_info(xorriso, 1 | (flag & 8) | ((flag & 1) << 1));
|
Xorriso_show_boot_info(xorriso, 1 | (flag & 8) | ((flag & 1) << 1));
|
||||||
|
|
||||||
|
if(!(flag & 3)) {
|
||||||
|
sprintf(respt, "ISO offers :%s%s%s%s\n",
|
||||||
|
xorriso->isofs_has_what & 1 ? " Rock_Ridge" : "",
|
||||||
|
xorriso->isofs_has_what & 2 ? " Joliet" : "",
|
||||||
|
xorriso->isofs_has_what & 4 ? " ISO_9660_1999" : "",
|
||||||
|
xorriso->isofs_has_what & 7 ? "" : " Only_ECMA_119");
|
||||||
|
Xorriso_toc_line(xorriso, flag & 8);
|
||||||
|
sprintf(respt, "ISO loaded : %s\n",
|
||||||
|
xorriso->tree_loaded == 1 ? "Joliet" :
|
||||||
|
xorriso->tree_loaded == 2 ? "ISO_9660_1999" :
|
||||||
|
xorriso->rr_loaded > 0 ? "Rock_Ridge" : "Only_ECMA_119");
|
||||||
|
Xorriso_toc_line(xorriso, flag & 8);
|
||||||
|
}
|
||||||
|
|
||||||
disc= isoburn_toc_drive_get_disc(drive);
|
disc= isoburn_toc_drive_get_disc(drive);
|
||||||
if(flag & 4)
|
if(flag & 4)
|
||||||
sprintf(respt, "TOC layout : %3s , %9s , %10s\n",
|
sprintf(respt, "TOC layout : %3s , %9s , %10s\n",
|
||||||
|
|
|
@ -241,6 +241,14 @@ struct XorrisO { /* the global context of xorriso */
|
||||||
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 */
|
||||||
|
|
||||||
|
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];
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
#define Xorriso_timestamP "2020.12.05.085329"
|
#define Xorriso_timestamP "2020.12.07.184159"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user