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

VISO: Add flags field and calculate timezone format on ISO only

Browse Source
This commit is contained in:
RichardG867
2022-11-21 15:58:33 -03:00
parent 1ec5765f3f
commit 1695980271
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/cdrom/cdrom_image_viso.c
View File

@@ -115,7 +115,7 @@ typedef struct _viso_entry_ {
typedef struct { typedef struct {
uint64_t vol_size_offsets[2], pt_meta_offsets[2]; uint64_t vol_size_offsets[2], pt_meta_offsets[2];
int format; int format, flags;
size_t metadata_sectors, all_sectors, entry_map_size, sector_size, file_fifo_pos; size_t metadata_sectors, all_sectors, entry_map_size, sector_size, file_fifo_pos;
uint8_t *metadata; uint8_t *metadata;
@@ -470,7 +470,7 @@ viso_fill_time(uint8_t *data, time_t time, int format, int longform)
} }
static int static int
viso_fill_dir_record(uint8_t *data, viso_entry_t *entry, int format, int type) viso_fill_dir_record(uint8_t *data, viso_entry_t *entry, int format, int flags, int type)
{ {
uint8_t *p = data, *q, *r; uint8_t *p = data, *q, *r;
@@ -968,6 +968,7 @@ next_dir:
the timezone offset for descriptors and file times to use. */ the timezone offset for descriptors and file times to use. */
tzset(); tzset();
time_t now = time(NULL); time_t now = time(NULL);
if (viso->format >= VISO_FORMAT_ISO) /* timezones are ISO only */
tz_offset = (now - mktime(gmtime(&now))) / (3600 / 4); tz_offset = (now - mktime(gmtime(&now))) / (3600 / 4);
/* Get root directory basename for the volume ID. */ /* Get root directory basename for the volume ID. */
@@ -1024,7 +1025,7 @@ next_dir:
VISO_SKIP(p, 24 + (16 * (viso->format <= VISO_FORMAT_HSF))); /* PT size, LE PT offset, optional LE PT offset (three on HSF), BE PT offset, optional BE PT offset (three on HSF) */ VISO_SKIP(p, 24 + (16 * (viso->format <= VISO_FORMAT_HSF))); /* PT size, LE PT offset, optional LE PT offset (three on HSF), BE PT offset, optional BE PT offset (three on HSF) */
viso->root_dir->dr_offsets[i] = ftello64(viso->tf.file) + (p - data); viso->root_dir->dr_offsets[i] = ftello64(viso->tf.file) + (p - data);
p += viso_fill_dir_record(p, viso->root_dir, viso->format, VISO_DIR_CURRENT); /* root directory */ p += viso_fill_dir_record(p, viso->root_dir, viso->format, viso->flags, VISO_DIR_CURRENT); /* root directory */
if (i) { if (i) {
viso_write_wstring((uint16_t *) p, L"", 64, VISO_CHARSET_D); /* volume set ID */ viso_write_wstring((uint16_t *) p, L"", 64, VISO_CHARSET_D); /* volume set ID */
@@ -1321,7 +1322,7 @@ next_dir:
((dir_type == VISO_DIR_PARENT) ? ".." : ((dir_type < VISO_DIR_PARENT) ? "." : (i ? entry->basename : entry->name_short)))); ((dir_type == VISO_DIR_PARENT) ? ".." : ((dir_type < VISO_DIR_PARENT) ? "." : (i ? entry->basename : entry->name_short))));
/* Fill directory record. */ /* Fill directory record. */
viso_fill_dir_record(data, entry, viso->format, dir_type); viso_fill_dir_record(data, entry, viso->format, viso->flags, dir_type);
/* Entries cannot cross sector boundaries, so pad to the next sector if needed. */ /* Entries cannot cross sector boundaries, so pad to the next sector if needed. */
write = viso->sector_size - (ftello64(viso->tf.file) % viso->sector_size); write = viso->sector_size - (ftello64(viso->tf.file) % viso->sector_size);