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

Disabled skipping of ECMA-119 directory /RR_MOVED by name.

Browse Source
This commit is contained in:
Thomas Schmitt 2012-03-06 16:18:05 +01:00
parent 37f880797d
commit e49f9672bc
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libisofs/fs_image.c
View File

@ -522,18 +522,30 @@ int read_dir(ImageFileSourceData *data)
continue; continue;
} }
/* /* (Vreixo:)
* What about ignoring files with existence flag? * What about ignoring files with existence flag?
* if (record->flags[0] & 0x01) * if (record->flags[0] & 0x01)
* continue; * continue;
* ts B20306 : >>> One should rather record that flag and write it
* >>> to the new image.
*/ */
/* #ifdef Libisofs_wrongly_skip_rr_moveD
/* ts B20306 :
This skipping by name is wrong resp. redundant:
If no rr reading is enabled, then it is the only access point for
the content of relocated directories. So one should not ignore it.
If rr reading is enabled, then the RE entry of mkisofs' RR_MOVED
will cause it to be skipped.
*/
/* (Vreixo:)
* For a extrange reason, mkisofs relocates directories under * For a extrange reason, mkisofs relocates directories under
* a RR_MOVED dir. It seems that it is only used for that purposes, * a RR_MOVED dir. It seems that it is only used for that purposes,
* and thus it should be removed from the iso tree before * and thus it should be removed from the iso tree before
* generating a new image with libisofs, that don't uses it. * generating a new image with libisofs, that don't uses it.
*/ */
if (data->parent == NULL && record->len_fi[0] == 8 if (data->parent == NULL && record->len_fi[0] == 8
&& !strncmp((char*)record->file_id, "RR_MOVED", 8)) { && !strncmp((char*)record->file_id, "RR_MOVED", 8)) {
@ -544,6 +556,8 @@ int read_dir(ImageFileSourceData *data)
continue; continue;
} }
#endif /* Libisofs_wrongly_skip_rr_moveD */
/* /*
* We pass a NULL parent instead of dir, to prevent the circular * We pass a NULL parent instead of dir, to prevent the circular
* reference from child to parent. * reference from child to parent.