claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Virtual ISO: Don't declare Rock Ridge extension on Joliet tree

Browse Source
This commit is contained in:
RichardG867
2022-03-31 13:53:52 -03:00
parent 4e910f1709
commit f8173f75ec
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/cdrom/cdrom_image_viso.c
View File

@@ -1102,11 +1102,12 @@ next_dir:
} }
/* Write directory records for each type. */ /* Write directory records for each type. */
int dir_type = VISO_DIR_CURRENT_ROOT;
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
cdrom_image_viso_log("VISO: Generating directory record set #%d:\n", i); cdrom_image_viso_log("VISO: Generating directory record set #%d:\n", i);
/* Go through directories. */ /* Go through directories. */
dir = viso->root_dir; dir = viso->root_dir;
while (dir) { while (dir) {
/* Pad to the next sector if required. */ /* Pad to the next sector if required. */
write = ftello64(viso->tf.file) % viso->sector_size; write = ftello64(viso->tf.file) % viso->sector_size;
@@ -1133,8 +1134,7 @@ next_dir:
dir->file = NULL; dir->file = NULL;
/* Go through entries in this directory. */ /* Go through entries in this directory. */
viso_entry_t *entry = dir->first_child; viso_entry_t *entry = dir->first_child;
int dir_type = (dir == viso->root_dir) ? VISO_DIR_CURRENT_ROOT : VISO_DIR_CURRENT;
while (entry) { while (entry) {
/* Skip the El Torito boot code entry if present. */ /* Skip the El Torito boot code entry if present. */
if (entry == viso->eltorito_entry) if (entry == viso->eltorito_entry)
@@ -1193,7 +1193,8 @@ next_entry:
viso_pwrite(data, dir->first_child->next->dr_offsets[i] + 10, 8, 1, viso->tf.file); viso_pwrite(data, dir->first_child->next->dr_offsets[i] + 10, 8, 1, viso->tf.file);
/* Move on to the next directory. */ /* Move on to the next directory. */
dir = dir->next_dir; dir_type = VISO_DIR_CURRENT;
dir = dir->next_dir;
} }
/* Pad to the next even sector. */ /* Pad to the next even sector. */