Browse Source

New API call isoburn_ropt_get_tree_loaded()

master
Thomas Schmitt 1 month ago
parent
commit
b3adff1daa
6 changed files with 43 additions and 11 deletions
  1. +10
    -1
      libisoburn/isoburn.c
  2. +6
    -1
      libisoburn/isoburn.h
  3. +4
    -2
      libisoburn/isofs_wrap.c
  4. +21
    -6
      libisoburn/libisoburn.h
  5. +1
    -0
      libisoburn/libisoburn.ver
  6. +1
    -1
      xorriso/xorriso_timestamp.h

+ 10
- 1
libisoburn/isoburn.c View File

@ -7,7 +7,7 @@
Class core of libisoburn.
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.
*/
@ -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.


+ 6
- 1
libisoburn/isoburn.h View File

@ -3,7 +3,7 @@
Class struct of libisoburn.
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.
*/
@ -388,6 +388,11 @@ struct isoburn_read_opts {
uint32_t size; /**< Will be filled with the size (in 2048 byte block) of
* 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 */
uint32_t displacement;


+ 4
- 2
libisoburn/isofs_wrap.c View File

@ -6,8 +6,8 @@
/*
libisofs related functions of libisoburn.
Copyright 2007 - 2017 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
Thomas Schmitt <scdbackup@gmx.net>
Copyright 2007 - 2009 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
Copyright 2007 - 2020 Thomas Schmitt <scdbackup@gmx.net>
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->hasElTorito = iso_read_image_features_has_eltorito(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;
ex:;
if(msg != NULL)


+ 21
- 6
libisoburn/libisoburn.h View File

@ -6,7 +6,7 @@
Lower level API definition of libisoburn.
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.
*/
@ -1063,7 +1063,8 @@ int isoburn_ropt_get_truncate_mode(struct isoburn_read_opts *o,
/** 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:
joliet_available = (has_what & isoburn_ropt_has_joliet);
@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 has_what Bitfield:
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
Joliet extension info is available (suitable for MS-Windows)
Joliet tree is available (suitable for MS-Windows)
bit2= has_iso1999
ISO version 2 Enhanced Volume Descriptor is available.
This is rather exotic.
ISO version 2 Enhanced Volume Descriptor aka ISO 9660:1999
and its tree is available. This is rather exotic.
bit3= has_el_torito
El-Torito boot record is present
@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 */


+ 1
- 0
libisoburn/libisoburn.ver View File

@ -111,6 +111,7 @@ isoburn_ropt_get_displacement;
isoburn_ropt_get_extensions;
isoburn_ropt_get_input_charset;
isoburn_ropt_get_size_what;
isoburn_ropt_get_tree_loaded;
isoburn_ropt_get_truncate_mode;
isoburn_ropt_new;
isoburn_ropt_set_auto_incharset;


+ 1
- 1
xorriso/xorriso_timestamp.h View File

@ -1 +1 @@
#define Xorriso_timestamP "2020.12.05.085329"
#define Xorriso_timestamP "2020.12.07.183710"

Loading…
Cancel
Save