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

Fixed assessment of omit_version_numbers and no_force_dots

Browse Source
This commit is contained in:
Thomas Schmitt 2022-10-07 11:14:51 +02:00
parent 83e5832ed0
commit 71772baab7
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libisofs/fs_image.c
View File

@ -5935,7 +5935,7 @@ static
int iso_img_feature_to_text(struct iso_read_img_feature *f, char **result) int iso_img_feature_to_text(struct iso_read_img_feature *f, char **result)
{ {
int count= 0, pass, i; int count= 0, pass, i;
char num_text[81], *t; char num_text[81], *t= NULL;
*result = NULL; *result = NULL;
if (f->valid != 1) if (f->valid != 1)
@ -7495,6 +7495,13 @@ int iso_assess_written_features(IsoDataSource *src, IsoReadOpts *opts,
int pass, ret, reuse_features = 0, omit, opts_mem[5]; int pass, ret, reuse_features = 0, omit, opts_mem[5];
IsoImage *image = NULL; IsoImage *image = NULL;
/* Memorize read_opts values which might change */
opts_mem[0]= opts->norock;
opts_mem[1]= opts->nojoliet;
opts_mem[2]= opts->noiso1999;
opts_mem[3]= opts->preferjoliet;
opts_mem[4]= opts->read_features;
if (features == NULL) if (features == NULL)
return ISO_NULL_POINTER; return ISO_NULL_POINTER;
@ -7505,13 +7512,6 @@ int iso_assess_written_features(IsoDataSource *src, IsoReadOpts *opts,
if (ret < 0) if (ret < 0)
goto ex; goto ex;
/* Memorize read_opts values which might change */
opts_mem[0]= opts->norock;
opts_mem[1]= opts->nojoliet;
opts_mem[2]= opts->noiso1999;
opts_mem[3]= opts->preferjoliet;
opts_mem[4]= opts->read_features;
for (pass= 0; pass < 4; pass++) { for (pass= 0; pass < 4; pass++) {
ret = iso_image_new("ISOIMAGE", &image); ret = iso_image_new("ISOIMAGE", &image);
if (ret < 0) if (ret < 0)
@ -7524,6 +7524,7 @@ int iso_assess_written_features(IsoDataSource *src, IsoReadOpts *opts,
omit = 0; omit = 0;
if (pass == 0) { if (pass == 0) {
image->tree_compliance->iso_level = 1; image->tree_compliance->iso_level = 1;
iso_read_opts_set_ecma119_map(opts, 0);
} else if(pass == 1) { } else if(pass == 1) {
if (*features != NULL) if (*features != NULL)
if (!iso_read_image_features_has_rockridge(*features)) if (!iso_read_image_features_has_rockridge(*features))