Browse Source

New libisoburn extension option isoburn_ropt_map_joliet_unmapped

master
Thomas Schmitt 10 months ago
parent
commit
8f89ad03fc
  1. 8
      libisoburn/isoburn.c
  2. 3
      libisoburn/isoburn.h
  3. 3
      libisoburn/isofs_wrap.c
  4. 9
      libisoburn/libisoburn.h
  5. 2
      xorriso/xorriso_timestamp.h

8
libisoburn/isoburn.c

@ -856,7 +856,8 @@ int isoburn_ropt_new(struct isoburn_read_opts **new_o, int flag)
o->noiso1999= 1;
o->do_ecma119_map= 0;
o->map_mode= 1;
o->joliet_stripped= 1;
o->do_joliet_map= 0;
o->joliet_map_mode= 1;
o->noaaip= 1;
o->noacl= 1;
o->noea= 1;
@ -959,7 +960,8 @@ int isoburn_ropt_set_extensions(struct isoburn_read_opts *o, int ext)
o->nomd5= (ext >> 9) & 3;
o->do_ecma119_map= !!(ext & 2048);
o->map_mode= (ext >> 12) & 3;
o->joliet_stripped= !!(ext & 16384);
o->do_joliet_map= !!(ext & 16384);
o->joliet_map_mode= !!(ext & 32768);
return(1);
}
@ -971,7 +973,7 @@ int isoburn_ropt_get_extensions(struct isoburn_read_opts *o, int *ext)
((!!o->noaaip) << 5) | ((!!o->noacl) << 6) | ((!!o->noea) << 7) |
((!!o->noino) << 8) | ((o->nomd5 & 3) << 9) |
((!!o->do_ecma119_map) << 11) | ((o->map_mode & 3) << 12) |
((!!o->joliet_stripped) << 14);
((!!o->do_joliet_map) << 14) | ((!!o->joliet_map_mode) << 15);
return(1);
}

3
libisoburn/isoburn.h

@ -326,7 +326,8 @@ struct isoburn_read_opts {
unsigned int do_ecma119_map:1; /* call iso_read_opts_set_ecma119_map() */
unsigned int map_mode:2; /* argument for do_ecma119_map */
unsigned int joliet_stripped:1; /* for iso_read_opts_set_joliet_map */
unsigned int do_joliet_map:1; /* call iso_read_opts_set_joliet_map() */
unsigned int joliet_map_mode:1; /* for iso_read_opts_set_joliet_map */
/* ts A90121 */
unsigned int noaaip:1; /* Do not read AAIP for ACL and EA */

3
libisoburn/isofs_wrap.c

@ -275,7 +275,8 @@ displacement_rollover:;
iso_read_opts_set_no_md5(ropts, int_num);
if(read_opts->do_ecma119_map)
iso_read_opts_set_ecma119_map(ropts, read_opts->map_mode);
iso_read_opts_set_joliet_map(ropts, read_opts->joliet_stripped);
if(read_opts->do_joliet_map)
iso_read_opts_set_joliet_map(ropts, read_opts->joliet_map_mode);
iso_read_opts_set_new_inos(ropts, read_opts->noino);
iso_read_opts_set_no_joliet(ropts, read_opts->nojoliet);

9
libisoburn/libisoburn.h

@ -909,7 +909,11 @@ int isoburn_ropt_get_data_cache(struct isoburn_read_opts *o,
or ".;1"
2 = uppercase: Like stripped, but map {a-z} to {A-Z}
3 = lowercase: Like stripped, but map {A-Z} to {a-z}
bit14= joliet_stripped
bit14= do_joliet_map
@since 1.5.4
Set iso_read_opts_set_joliet_map() to joliet_map_mode
rather than relying on the default setting of libisofs.
bit15= joliet_map_mode
@since 1.5.4
How to convert Joliet file names.
0 = unmapped: Take name as recorded in Joliet directory
@ -934,7 +938,8 @@ int isoburn_ropt_get_data_cache(struct isoburn_read_opts *o,
#define isoburn_ropt_map_stripped ( 2048 | 4096 )
#define isoburn_ropt_map_uppercase ( 2048 | 8192 )
#define isoburn_ropt_map_lowercase ( 2048 | 12288 )
#define isoburn_ropt_joliet_stripped 16384
#define isoburn_ropt_joliet_unmapped ( 16384 | 0)
#define isoburn_ropt_joliet_stripped ( 16384 | 32768)
int isoburn_ropt_set_extensions(struct isoburn_read_opts *o, int ext);
int isoburn_ropt_get_extensions(struct isoburn_read_opts *o, int *ext);

2
xorriso/xorriso_timestamp.h

@ -1 +1 @@
#define Xorriso_timestamP "2020.11.22.131521"
#define Xorriso_timestamP "2020.11.22.134545"

Loading…
Cancel
Save