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

Updated Vladimir Serbinenko's work.

Browse Source
This commit is contained in:
Thomas Schmitt 2012-05-24 11:27:21 +02:00
parent 1a5c02a27e
commit 9e2d82fc78
7 changed files with 2109 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -68,6 +68,9 @@ libisofs_libisofs_la_SOURCES = \
libisofs/joliet.c \ libisofs/joliet.c \
libisofs/hfsplus.h \ libisofs/hfsplus.h \
libisofs/hfsplus.c \ libisofs/hfsplus.c \
libisofs/hfsplus_decompose.c \
libisofs/hfsplus_classes.c \
libisofs/hfsplus_case.c \
libisofs/eltorito.h \ libisofs/eltorito.h \
libisofs/eltorito.c \ libisofs/eltorito.c \
libisofs/system_area.h \ libisofs/system_area.h \

48
libisofs/ecma119.c
View File

@ -1264,8 +1264,6 @@ int write_head_part1(Ecma119Image *target, int *write_count, int flag)
iso_msg_debug(target->image->id, "Write volume descriptors"); iso_msg_debug(target->image->id, "Write volume descriptors");
for (i = 0; i < (int) target->nwriters; ++i) { for (i = 0; i < (int) target->nwriters; ++i) {
writer = target->writers[i]; writer = target->writers[i];
if (writer->write_vol_desc == hfsplus_writer_write_vol_desc)
continue;
res = writer->write_vol_desc(writer); res = writer->write_vol_desc(writer);
if (res < 0) if (res < 0)
goto write_error; goto write_error;
@ -1276,16 +1274,6 @@ int write_head_part1(Ecma119Image *target, int *write_count, int flag)
if (res < 0) if (res < 0)
goto write_error; goto write_error;
/* Special treatment for HFS */
for (i = 0; i < (int) target->nwriters; ++i) {
writer = target->writers[i];
if (writer->write_vol_desc != hfsplus_writer_write_vol_desc)
continue;
res = writer->write_vol_desc(writer);
if (res < 0)
goto write_error;
}
if(flag & 2) { if(flag & 2) {
iso_ring_buffer_get_buf_status(target->buffer, &buffer_size, iso_ring_buffer_get_buf_status(target->buffer, &buffer_size,
&buffer_free); &buffer_free);
@ -1928,7 +1916,7 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *opts, Ecma119Image **img)
nwriters++; nwriters++;
} }
if (target->hfsplus) { if (target->hfsplus) {
nwriters++; nwriters+= 2;
} }
if (target->iso1999) { if (target->iso1999) {
nwriters++; nwriters++;
@ -1981,7 +1969,6 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *opts, Ecma119Image **img)
/* create writer for HFS+ structure */ /* create writer for HFS+ structure */
if (target->hfsplus) { if (target->hfsplus) {
hfsplus_writer_index = target->nwriters - 1;
ret = hfsplus_writer_create(target); ret = hfsplus_writer_create(target);
if (ret < 0) { if (ret < 0) {
goto target_cleanup; goto target_cleanup;
@ -2022,6 +2009,13 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *opts, Ecma119Image **img)
} }
file_src_writer_index = target->nwriters - 1; file_src_writer_index = target->nwriters - 1;
/* create writer for HFS+ structure */
if (target->hfsplus) {
ret = hfsplus_tail_writer_create(target);
if (ret < 0) {
goto target_cleanup;
}
}
/* IMPORTANT: This must be the last writer before the checksum writer */ /* IMPORTANT: This must be the last writer before the checksum writer */
ret = zero_writer_create(target, target->tail_blocks, 1); ret = zero_writer_create(target, target->tail_blocks, 1);
@ -2087,15 +2081,6 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *opts, Ecma119Image **img)
if (i == el_torito_writer_index) if (i == el_torito_writer_index)
continue; continue;
/* >>> HFS : ts B20523
Vladimir wanted to skip hfsplus_writer here.
I do not understand all motivation for this yet, but the
writer must compute its data size in sequence with the other
writers. The el_torito_writer jump is a hack and allowed only
because eltorito_writer_compute_data_blocks() does not
increase the block count. It rather performs -boot-info-table.
*/
/* Exposing address of data start to IsoWriteOpts and memorizing /* Exposing address of data start to IsoWriteOpts and memorizing
this address for all files which have no block address: this address for all files which have no block address:
symbolic links, device files, empty data files. symbolic links, device files, empty data files.
@ -2103,17 +2088,6 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *opts, Ecma119Image **img)
will account resp. write this single block. will account resp. write this single block.
*/ */
if (i == file_src_writer_index) { if (i == file_src_writer_index) {
/* >>> HFS : ts B20523
Vladimir wanted to delay the setting of
target->empty_file_block here. But it might be important
that this is the start block of the file_src_writer realm.
I have to examine, whether it is ok to choose a different
block.
This is related anyway to the inappropriate skipping of
hfs_writer. See above.
*/
if (! target->old_empty) if (! target->old_empty)
target->empty_file_block = target->curblock; target->empty_file_block = target->curblock;
opts->data_start_lba = target->curblock; opts->data_start_lba = target->curblock;
@ -2580,6 +2554,12 @@ int iso_write(Ecma119Image *target, void *buf, size_t count)
{ {
int ret; int ret;
if (target->bytes_written + (off_t) count > target->total_size) {
iso_msg_submit(target->image->id, ISO_ASSERT_FAILURE, 0,
"ISO overwrite");
return ISO_ASSERT_FAILURE;
}
ret = iso_ring_buffer_write(target->buffer, buf, count); ret = iso_ring_buffer_write(target->buffer, buf, count);
if (ret == 0) { if (ret == 0) {
/* reader cancelled */ /* reader cancelled */

420
libisofs/hfsplus.c
View File

@ -31,30 +31,9 @@
#define HFSPLUS_BLOCK_SIZE BLOCK_SIZE #define HFSPLUS_BLOCK_SIZE BLOCK_SIZE
#define HFSPLUS_CAT_NODE_SIZE (2 * BLOCK_SIZE) #define HFSPLUS_CAT_NODE_SIZE (2 * BLOCK_SIZE)
static
int set_hfsplus_name(Ecma119Image *t, char *name, HFSPlusNode *node)
{
int ret;
uint16_t *ucs_name;
if (name == NULL) { uint16_t ntohs(uint16_t netshort); /* Linux: <arpa/inet.h> */
/* it is not necessarily an error, it can be the root */ uint16_t htons(uint16_t hostshort); /* Linux: <arpa/inet.h> */
return ISO_SUCCESS;
}
ret = str2ucs(t->input_charset, name, &ucs_name);
if (ret < 0) {
iso_msg_debug(t->image->id, "Can't convert %s", name);
return ret;
}
/* FIXME: Decompose it. */
node->name = ucs_name;
/* FIXME: Lowercase it. */
node->cmp_name = ucs_name;
node->strlen = ucslen (ucs_name);
return ISO_SUCCESS;
}
static static
@ -78,12 +57,120 @@ int filesrc_block_and_size(Ecma119Image *t, IsoFileSrc *src,
} }
/* If .size is not aligned to blocks then there is a byte gap. /* If .size is not aligned to blocks then there is a byte gap.
No need to trace the exact byte address. No need to trace the exact byte address.
*/ */
pos = src->sections[i].block + src->sections[i].size / 2048; pos = src->sections[i].block + src->sections[i].size / 2048;
} }
return 1; return 1;
} }
static
uint8_t get_class (uint16_t v)
{
uint16_t s;
uint8_t high, low;
s = ntohs (v);
high = s >> 8;
low = v & 0xff;
if (!hfsplus_class_pages[high])
return 0;
return hfsplus_class_pages[high][low];
}
static
int set_hfsplus_name(Ecma119Image *t, char *name, HFSPlusNode *node)
{
int ret;
uint16_t *ucs_name, *iptr, *optr;
uint32_t curlen;
int done;
if (name == NULL) {
/* it is not necessarily an error, it can be the root */
return ISO_SUCCESS;
}
ret = str2ucs(t->input_charset, name, &ucs_name);
if (ret < 0) {
iso_msg_debug(t->image->id, "Can't convert %s", name);
return ret;
}
curlen = ucslen (ucs_name);
node->name = malloc ((curlen * HFSPLUS_MAX_DECOMPOSE_LEN + 1)
* sizeof (node->name[0]));
if (!node->name)
return ISO_OUT_OF_MEM;
for (iptr = ucs_name, optr = node->name; *iptr; iptr++)
{
const uint16_t *dptr;
uint8_t high = ((uint8_t *) iptr)[0];
uint8_t low = ((uint8_t *) iptr)[1];
/* FIXME: decompose jamos. */
if (!hfsplus_decompose_pages[high])
{
*optr++ = *iptr;
continue;
}
dptr = hfsplus_decompose_pages[high][low];
if (!dptr[0])
{
*optr++ = *iptr;
continue;
}
for (; *dptr; dptr++)
*optr++ = htons (*dptr);
}
*optr = 0;
do
{
uint8_t last_class;
done = 0;
if (!ucs_name[0])
break;
last_class = get_class (ucs_name[0]);
for (optr = node->name + 1; *optr; optr++)
{
uint8_t new_class = get_class (*optr);
if (last_class == 0 || new_class == 0
|| last_class <= new_class)
last_class = new_class;
else
{
uint16_t t;
t = *(optr - 1);
*(optr - 1) = *optr;
*optr = t;
}
}
}
while (done);
node->cmp_name = malloc ((ucslen (node->name) + 1) * sizeof (node->cmp_name[0]));
if (!node->cmp_name)
return ISO_OUT_OF_MEM;
for (iptr = node->name, optr = node->cmp_name; *iptr; iptr++)
{
uint8_t high = ((uint8_t *) iptr)[0];
uint8_t low = ((uint8_t *) iptr)[1];
if (hfsplus_casefold[high] == 0)
{
*optr++ = *iptr;
continue;
}
if (!hfsplus_casefold[hfsplus_casefold[high] + low])
continue;
*optr++ = ntohs (hfsplus_casefold[hfsplus_casefold[high] + low]);
}
*optr = 0;
node->strlen = ucslen (node->name);
return ISO_SUCCESS;
}
static static
int hfsplus_count_tree(Ecma119Image *t, IsoNode *iso) int hfsplus_count_tree(Ecma119Image *t, IsoNode *iso)
{ {
@ -185,7 +272,7 @@ int create_tree(Ecma119Image *t, IsoNode *iso, uint32_t parent_id)
t->hfsp_leafs[t->hfsp_curleaf].node = iso; t->hfsp_leafs[t->hfsp_curleaf].node = iso;
t->hfsp_leafs[t->hfsp_curleaf].type = (iso->type == LIBISO_DIR) ? HFSPLUS_DIR_THREAD : HFSPLUS_FILE_THREAD; t->hfsp_leafs[t->hfsp_curleaf].type = (iso->type == LIBISO_DIR) ? HFSPLUS_DIR_THREAD : HFSPLUS_FILE_THREAD;
t->hfsp_leafs[t->hfsp_curleaf].file = 0; t->hfsp_leafs[t->hfsp_curleaf].file = 0;
t->hfsp_leafs[t->hfsp_curleaf].cat_id = cat_id; t->hfsp_leafs[t->hfsp_curleaf].cat_id = parent_id;
t->hfsp_leafs[t->hfsp_curleaf].parent_id = cat_id; t->hfsp_leafs[t->hfsp_curleaf].parent_id = cat_id;
t->hfsp_curleaf++; t->hfsp_curleaf++;
@ -229,19 +316,48 @@ cmp_node(const void *f1, const void *f2)
return ucscmp(a, b); return ucscmp(a, b);
} }
static
int hfsplus_tail_writer_compute_data_blocks(IsoImageWriter *writer)
{
Ecma119Image *t;
uint32_t hfsp_size;
if (writer == NULL) {
return ISO_OUT_OF_MEM;
}
t = writer->target;
hfsp_size = t->curblock - t->hfsp_part_start + 1;
/* We need one bit for every block. */
/* So if we allocate x blocks we have to satisfy:
8 * HFSPLUS_BLOCK_SIZE * x >= total_size + x
(8 * HFSPLUS_BLOCK_SIZE - 1) * x >= total_size
*/
t->hfsp_allocation_blocks = hfsp_size
/ (8 * HFSPLUS_BLOCK_SIZE - 1) + 1;
t->hfsp_allocation_file_start = t->curblock;
t->curblock += t->hfsp_allocation_blocks;
t->curblock++;
t->hfsp_total_blocks = t->curblock - t->hfsp_part_start;
return ISO_SUCCESS;
}
static static
int hfsplus_writer_compute_data_blocks(IsoImageWriter *writer) int hfsplus_writer_compute_data_blocks(IsoImageWriter *writer)
{ {
Ecma119Image *t; Ecma119Image *t;
uint32_t old_curblock, total_size;
if (writer == NULL) { if (writer == NULL) {
return ISO_OUT_OF_MEM; return ISO_OUT_OF_MEM;
} }
t = writer->target; t = writer->target;
old_curblock = t->curblock;
iso_msg_debug(t->image->id, "(b) curblock=%d, nodes =%d", t->curblock, t->hfsp_nnodes);
t->hfsp_part_start = t->curblock;
t->curblock++;
t->hfsp_catalog_file_start = t->curblock; t->hfsp_catalog_file_start = t->curblock;
t->curblock += 2 * t->hfsp_nnodes; t->curblock += 2 * t->hfsp_nnodes;
@ -249,17 +365,7 @@ int hfsplus_writer_compute_data_blocks(IsoImageWriter *writer)
t->hfsp_extent_file_start = t->curblock; t->hfsp_extent_file_start = t->curblock;
t->curblock++; t->curblock++;
/* We need one bit for every block. */ iso_msg_debug(t->image->id, "(a) curblock=%d, nodes =%d", t->curblock, t->hfsp_nnodes);
/* So if we allocate x blocks we have to satisfy:
8 * HFSPLUS_BLOCK_SIZE * x >= total_size + x
(8 * HFSPLUS_BLOCK_SIZE - 1) * x >= total_size
*/
total_size = t->total_size + t->curblock - old_curblock;
t->hfsp_allocation_blocks = total_size / (8 * HFSPLUS_BLOCK_SIZE - 1) + 1;
t->hfsp_allocation_file_start = t->curblock;
t->curblock += t->hfsp_allocation_blocks;
iso_msg_debug(t->image->id, "curblock=%d, nodes =%d", t->curblock, t->hfsp_nnodes);
return ISO_SUCCESS; return ISO_SUCCESS;
} }
@ -269,88 +375,9 @@ static void set_time (uint32_t *tm, uint32_t t)
iso_msb ((uint8_t *) tm, t + 2082844800, 4); iso_msb ((uint8_t *) tm, t + 2082844800, 4);
} }
int hfsplus_writer_write_vol_desc(IsoImageWriter *writer) int nop_writer_write_vol_desc(IsoImageWriter *writer)
{ {
char buffer[1024]; return ISO_SUCCESS;
int ret;
IsoImage *image;
Ecma119Image *t;
struct hfsplus_volheader sb;
if (writer == NULL) {
return ISO_OUT_OF_MEM;
}
t = writer->target;
image = t->image;
t->hfsp_part_start = t->bytes_written / 0x800;
memset (buffer, 0, sizeof (buffer));
ret = iso_write(t, buffer, 1024);
if (ret < 0)
return ret;
iso_msg_debug(image->id, "Write HFS+ superblock");
memset (&sb, 0, sizeof (sb));
t->hfsp_total_blocks = t->total_size / HFSPLUS_BLOCK_SIZE - t->hfsp_part_start;
t->hfsp_allocation_size = (t->hfsp_total_blocks + 7) >> 3;
iso_msb ((uint8_t *) &sb.magic, 0x482b, 2);
iso_msb ((uint8_t *) &sb.version, 4, 2);
/* Cleanly unmounted, software locked. */
iso_msb ((uint8_t *) &sb.attributes, (1 << 8) | (1 << 15), 4);
iso_msb ((uint8_t *) &sb.last_mounted_version, 0x6c69736f, 4);
set_time (&sb.ctime, t->now);
set_time (&sb.utime, t->now);
set_time (&sb.fsck_time, t->now);
iso_msb ((uint8_t *) &sb.file_count, t->hfsp_nfiles, 4);
iso_msb ((uint8_t *) &sb.folder_count, t->hfsp_ndirs, 4);
iso_msb ((uint8_t *) &sb.blksize, 0x800, 4);
iso_msb ((uint8_t *) &sb.catalog_node_id, t->hfsp_cat_id, 4);
iso_msb ((uint8_t *) &sb.rsrc_clumpsize, HFSPLUS_BLOCK_SIZE, 4);
iso_msb ((uint8_t *) &sb.data_clumpsize, HFSPLUS_BLOCK_SIZE, 4);
iso_msb ((uint8_t *) &sb.total_blocks, t->hfsp_total_blocks, 4);
iso_msb ((uint8_t *) &sb.encodings_bitmap, 1, 8);
iso_msb ((uint8_t *) &sb.allocations_file.size, t->hfsp_allocation_size, 8);
iso_msb ((uint8_t *) &sb.allocations_file.clumpsize, HFSPLUS_BLOCK_SIZE, 4);
iso_msb ((uint8_t *) &sb.allocations_file.blocks, (t->hfsp_allocation_size + HFSPLUS_BLOCK_SIZE - 1) / HFSPLUS_BLOCK_SIZE, 4);
iso_msb ((uint8_t *) &sb.allocations_file.extents[0].start, t->hfsp_allocation_file_start - t->hfsp_part_start, 4);
iso_msb ((uint8_t *) &sb.allocations_file.extents[0].count, (t->hfsp_allocation_size + HFSPLUS_BLOCK_SIZE - 1) / HFSPLUS_BLOCK_SIZE, 4);
iso_msb ((uint8_t *) &sb.extents_file.size, HFSPLUS_BLOCK_SIZE, 8);
iso_msb ((uint8_t *) &sb.extents_file.clumpsize, HFSPLUS_BLOCK_SIZE, 4);
iso_msb ((uint8_t *) &sb.extents_file.blocks, 1, 4);
iso_msb ((uint8_t *) &sb.extents_file.extents[0].start, t->hfsp_extent_file_start - t->hfsp_part_start, 4);
iso_msb ((uint8_t *) &sb.extents_file.extents[0].count, 1, 4);
iso_msg_debug(t->image->id, "extent_file_start = %d\n", (int)t->hfsp_extent_file_start);
iso_msb ((uint8_t *) &sb.catalog_file.size, HFSPLUS_BLOCK_SIZE * 2 * t->hfsp_nnodes, 8);
iso_msb ((uint8_t *) &sb.catalog_file.clumpsize, HFSPLUS_BLOCK_SIZE * 2, 4);
iso_msb ((uint8_t *) &sb.catalog_file.blocks, 2 * t->hfsp_nnodes, 4);
iso_msb ((uint8_t *) &sb.catalog_file.extents[0].start, t->hfsp_catalog_file_start - t->hfsp_part_start, 4);
iso_msb ((uint8_t *) &sb.catalog_file.extents[0].count, 2 * t->hfsp_nnodes, 4);
iso_msg_debug(t->image->id, "catalog_file_start = %d\n", (int)t->hfsp_catalog_file_start);
/*
FIXME: set:
uint32_t ppc_bootdir;
uint32_t intel_bootfile;
uint32_t showfolder;
uint32_t os9folder;
uint32_t unused;
uint32_t osxfolder;
uint64_t num_serial;
*/
ret = iso_write(t, &sb, sizeof (sb));
if (ret < 0)
return ret;
return iso_write(t, buffer, 512);
} }
static static
@ -388,15 +415,84 @@ mode_t px_get_mode(Ecma119Image *t, IsoNode *n, int isdir)
return n->mode; return n->mode;
} }
int
write_sb (Ecma119Image *t)
{
struct hfsplus_volheader sb;
static char buffer[1024];
int ret;
iso_msg_debug(t->image->id, "Write HFS+ superblock");
memset (buffer, 0, sizeof (buffer));
ret = iso_write(t, buffer, 1024);
if (ret < 0)
return ret;
memset (&sb, 0, sizeof (sb));
t->hfsp_allocation_size = (t->hfsp_total_blocks + 7) >> 3;
iso_msb ((uint8_t *) &sb.magic, 0x482b, 2);
iso_msb ((uint8_t *) &sb.version, 4, 2);
/* Cleanly unmounted, software locked. */
iso_msb ((uint8_t *) &sb.attributes, (1 << 8) | (1 << 15), 4);
iso_msb ((uint8_t *) &sb.last_mounted_version, 0x6c69736f, 4);
set_time (&sb.ctime, t->now);
set_time (&sb.utime, t->now);
set_time (&sb.fsck_time, t->now);
iso_msb ((uint8_t *) &sb.file_count, t->hfsp_nfiles, 4);
iso_msb ((uint8_t *) &sb.folder_count, t->hfsp_ndirs, 4);
iso_msb ((uint8_t *) &sb.blksize, 0x800, 4);
iso_msb ((uint8_t *) &sb.catalog_node_id, t->hfsp_cat_id, 4);
iso_msb ((uint8_t *) &sb.rsrc_clumpsize, HFSPLUS_BLOCK_SIZE, 4);
iso_msb ((uint8_t *) &sb.data_clumpsize, HFSPLUS_BLOCK_SIZE, 4);
iso_msb ((uint8_t *) &sb.total_blocks, t->hfsp_total_blocks, 4);
iso_msb ((uint8_t *) &sb.encodings_bitmap + 4, 1, 4);
iso_msb ((uint8_t *) &sb.allocations_file.size + 4, t->hfsp_allocation_size, 4);
iso_msb ((uint8_t *) &sb.allocations_file.clumpsize, HFSPLUS_BLOCK_SIZE, 4);
iso_msb ((uint8_t *) &sb.allocations_file.blocks, (t->hfsp_allocation_size + HFSPLUS_BLOCK_SIZE - 1) / HFSPLUS_BLOCK_SIZE, 4);
iso_msb ((uint8_t *) &sb.allocations_file.extents[0].start, t->hfsp_allocation_file_start - t->hfsp_part_start, 4);
iso_msb ((uint8_t *) &sb.allocations_file.extents[0].count, (t->hfsp_allocation_size + HFSPLUS_BLOCK_SIZE - 1) / HFSPLUS_BLOCK_SIZE, 4);
iso_msb ((uint8_t *) &sb.extents_file.size + 4, HFSPLUS_BLOCK_SIZE, 4);
iso_msb ((uint8_t *) &sb.extents_file.clumpsize, HFSPLUS_BLOCK_SIZE, 4);
iso_msb ((uint8_t *) &sb.extents_file.blocks, 1, 4);
iso_msb ((uint8_t *) &sb.extents_file.extents[0].start, t->hfsp_extent_file_start - t->hfsp_part_start, 4);
iso_msb ((uint8_t *) &sb.extents_file.extents[0].count, 1, 4);
iso_msg_debug(t->image->id, "extent_file_start = %d\n", (int)t->hfsp_extent_file_start);
iso_msb ((uint8_t *) &sb.catalog_file.size + 4, HFSPLUS_BLOCK_SIZE * 2 * t->hfsp_nnodes, 4);
iso_msb ((uint8_t *) &sb.catalog_file.clumpsize, HFSPLUS_BLOCK_SIZE * 2, 4);
iso_msb ((uint8_t *) &sb.catalog_file.blocks, 2 * t->hfsp_nnodes, 4);
iso_msb ((uint8_t *) &sb.catalog_file.extents[0].start, t->hfsp_catalog_file_start - t->hfsp_part_start, 4);
iso_msb ((uint8_t *) &sb.catalog_file.extents[0].count, 2 * t->hfsp_nnodes, 4);
iso_msg_debug(t->image->id, "catalog_file_start = %d\n", (int)t->hfsp_catalog_file_start);
/*
FIXME: set:
uint32_t ppc_bootdir;
uint32_t intel_bootfile;
uint32_t showfolder;
uint32_t os9folder;
uint32_t unused;
uint32_t osxfolder;
uint64_t num_serial;
*/
ret = iso_write(t, &sb, sizeof (sb));
if (ret < 0)
return ret;
return iso_write(t, buffer, 512);
}
static static
int hfsplus_writer_write_data(IsoImageWriter *writer) int hfsplus_writer_write_data(IsoImageWriter *writer)
{ {
int ret; int ret;
static char buffer[2 * HFSPLUS_BLOCK_SIZE]; static char buffer[2 * HFSPLUS_BLOCK_SIZE];
uint32_t complete_blocks, remaining_blocks; Ecma119Image *t;
int over;
Ecma119Image *t = writer->target;
struct hfsplus_btnode *node_head; struct hfsplus_btnode *node_head;
struct hfsplus_btheader *tree_head; struct hfsplus_btheader *tree_head;
int level; int level;
@ -408,6 +504,16 @@ int hfsplus_writer_write_data(IsoImageWriter *writer)
return ISO_NULL_POINTER; return ISO_NULL_POINTER;
} }
t = writer->target;
iso_msg_debug(t->image->id, "(b) %d written", (int) t->bytes_written / 0x800);
ret = write_sb (t);
if (ret < 0)
return ret;
iso_msg_debug(t->image->id, "(c) %d written", (int) t->bytes_written / 0x800);
iso_msg_debug(t->image->id, "real catalog_file_start = %d\n", (int)t->bytes_written / 2048); iso_msg_debug(t->image->id, "real catalog_file_start = %d\n", (int)t->bytes_written / 2048);
memset (buffer, 0, sizeof (buffer)); memset (buffer, 0, sizeof (buffer));
@ -426,7 +532,7 @@ int hfsplus_writer_write_data(IsoImageWriter *writer)
iso_msb ((uint8_t *) &tree_head->free_nodes, 0, 4); iso_msb ((uint8_t *) &tree_head->free_nodes, 0, 4);
iso_msb ((uint8_t *) &tree_head->clump_size, HFSPLUS_CAT_NODE_SIZE, 4); iso_msb ((uint8_t *) &tree_head->clump_size, HFSPLUS_CAT_NODE_SIZE, 4);
tree_head->key_compare = 0xcf; tree_head->key_compare = 0xcf;
iso_msb ((uint8_t *) &tree_head->attributes, 2, 4); iso_msb ((uint8_t *) &tree_head->attributes, 2 | 4, 4);
memset (buffer + 0xf8, -1, t->hfsp_nnodes / 8); memset (buffer + 0xf8, -1, t->hfsp_nnodes / 8);
buffer[0xf8 + (t->hfsp_nnodes / 8)] = 0xff00 >> (t->hfsp_nnodes % 8); buffer[0xf8 + (t->hfsp_nnodes / 8)] = 0xff00 >> (t->hfsp_nnodes % 8);
@ -521,8 +627,8 @@ int hfsplus_writer_write_data(IsoImageWriter *writer)
curoff += 8; curoff += 8;
thread = (struct hfsplus_catfile_thread *) (buffer + curoff); thread = (struct hfsplus_catfile_thread *) (buffer + curoff);
((uint8_t *) &thread->type)[1] = t->hfsp_leafs[curnode].type; ((uint8_t *) &thread->type)[1] = t->hfsp_leafs[curnode].type;
iso_msb ((uint8_t *) &thread->parentid, t->hfsp_leafs[curnode].parent_id, 4); iso_msb ((uint8_t *) &thread->parentid, t->hfsp_leafs[curnode].cat_id, 4);
iso_msb ((uint8_t *) &thread->namelen, t->hfsp_leafs[curnode].strlen, 4); iso_msb ((uint8_t *) &thread->namelen, t->hfsp_leafs[curnode].strlen, 2);
curoff += sizeof (*thread); curoff += sizeof (*thread);
memcpy (buffer + curoff, t->hfsp_leafs[curnode].name, t->hfsp_leafs[curnode].strlen * 2); memcpy (buffer + curoff, t->hfsp_leafs[curnode].name, t->hfsp_leafs[curnode].strlen * 2);
curoff += t->hfsp_leafs[curnode].strlen * 2; curoff += t->hfsp_leafs[curnode].strlen * 2;
@ -542,7 +648,7 @@ int hfsplus_writer_write_data(IsoImageWriter *writer)
common = (struct hfsplus_catfile_common *) (buffer + curoff); common = (struct hfsplus_catfile_common *) (buffer + curoff);
((uint8_t *) &common->type)[1] = t->hfsp_leafs[curnode].type; ((uint8_t *) &common->type)[1] = t->hfsp_leafs[curnode].type;
iso_msb ((uint8_t *) &common->valence, t->hfsp_leafs[curnode].nchildren, 2); iso_msb ((uint8_t *) &common->valence, t->hfsp_leafs[curnode].nchildren, 4);
iso_msb ((uint8_t *) &common->fileid, t->hfsp_leafs[curnode].cat_id, 4); iso_msb ((uint8_t *) &common->fileid, t->hfsp_leafs[curnode].cat_id, 4);
set_time (&common->ctime, t->hfsp_leafs[curnode].node->ctime); set_time (&common->ctime, t->hfsp_leafs[curnode].node->ctime);
set_time (&common->mtime, t->hfsp_leafs[curnode].node->mtime); set_time (&common->mtime, t->hfsp_leafs[curnode].node->mtime);
@ -563,10 +669,11 @@ int hfsplus_writer_write_data(IsoImageWriter *writer)
*/ */
iso_msb ((uint8_t *) &common->flags, (t->hfsp_leafs[curnode].type == HFSPLUS_DIR) ? 0 : 2, 2); iso_msb ((uint8_t *) &common->flags, (t->hfsp_leafs[curnode].type == HFSPLUS_DIR) ? 0 : 2, 2);
curoff += sizeof (*common);
if (t->hfsp_leafs[curnode].type == HFSPLUS_FILE) if (t->hfsp_leafs[curnode].type == HFSPLUS_FILE)
{ {
curoff += sizeof (*common);
data_fork = (struct hfsplus_forkdata *) (buffer + curoff); data_fork = (struct hfsplus_forkdata *) (buffer + curoff);
ret = filesrc_block_and_size(t, t->hfsp_leafs[curnode].file, &src_start, &src_size); ret = filesrc_block_and_size(t, t->hfsp_leafs[curnode].file, &src_start, &src_size);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -594,7 +701,6 @@ int hfsplus_writer_write_data(IsoImageWriter *writer)
} }
curpos = next_lev; curpos = next_lev;
} }
iso_msg_debug(t->image->id, "%d written", (int) t->bytes_written);
iso_msg_debug(t->image->id, "real extent_file_start = %d\n", (int)t->bytes_written / 2048); iso_msg_debug(t->image->id, "real extent_file_start = %d\n", (int)t->bytes_written / 2048);
@ -621,6 +727,25 @@ int hfsplus_writer_write_data(IsoImageWriter *writer)
if (ret < 0) if (ret < 0)
return ret; return ret;
iso_msg_debug(t->image->id, "(a) %d written", (int) t->bytes_written / 0x800);
return ISO_SUCCESS;
}
static
int hfsplus_tail_writer_write_data(IsoImageWriter *writer)
{
int ret;
static char buffer[2 * HFSPLUS_BLOCK_SIZE];
uint32_t complete_blocks, remaining_blocks;
int over;
Ecma119Image *t;
if (writer == NULL) {
return ISO_NULL_POINTER;
}
t = writer->target;
memset (buffer, -1, sizeof (buffer)); memset (buffer, -1, sizeof (buffer));
complete_blocks = (t->hfsp_allocation_size - 1) / HFSPLUS_BLOCK_SIZE; complete_blocks = (t->hfsp_allocation_size - 1) / HFSPLUS_BLOCK_SIZE;
remaining_blocks = t->hfsp_allocation_blocks - complete_blocks; remaining_blocks = t->hfsp_allocation_blocks - complete_blocks;
@ -651,7 +776,8 @@ int hfsplus_writer_write_data(IsoImageWriter *writer)
} }
iso_msg_debug(t->image->id, "%d written", (int) t->bytes_written); iso_msg_debug(t->image->id, "%d written", (int) t->bytes_written);
return ISO_SUCCESS;
return write_sb (t);
} }
static static
@ -668,6 +794,12 @@ int hfsplus_writer_free_data(IsoImageWriter *writer)
return ISO_SUCCESS; return ISO_SUCCESS;
} }
static
int nop_writer_free_data(IsoImageWriter *writer)
{
return ISO_SUCCESS;
}
int hfsplus_writer_create(Ecma119Image *target) int hfsplus_writer_create(Ecma119Image *target)
{ {
int ret; int ret;
@ -683,7 +815,7 @@ int hfsplus_writer_create(Ecma119Image *target)
} }
writer->compute_data_blocks = hfsplus_writer_compute_data_blocks; writer->compute_data_blocks = hfsplus_writer_compute_data_blocks;
writer->write_vol_desc = hfsplus_writer_write_vol_desc; writer->write_vol_desc = nop_writer_write_vol_desc;
writer->write_data = hfsplus_writer_write_data; writer->write_data = hfsplus_writer_write_data;
writer->free_data = hfsplus_writer_free_data; writer->free_data = hfsplus_writer_free_data;
writer->data = NULL; writer->data = NULL;
@ -725,7 +857,7 @@ int hfsplus_writer_create(Ecma119Image *target)
target->hfsp_leafs[target->hfsp_curleaf].node = (IsoNode *) target->image->root; target->hfsp_leafs[target->hfsp_curleaf].node = (IsoNode *) target->image->root;
target->hfsp_leafs[target->hfsp_curleaf].type = HFSPLUS_DIR_THREAD; target->hfsp_leafs[target->hfsp_curleaf].type = HFSPLUS_DIR_THREAD;
target->hfsp_leafs[target->hfsp_curleaf].file = 0; target->hfsp_leafs[target->hfsp_curleaf].file = 0;
target->hfsp_leafs[target->hfsp_curleaf].cat_id = 2; target->hfsp_leafs[target->hfsp_curleaf].cat_id = 1;
target->hfsp_leafs[target->hfsp_curleaf].parent_id = 2; target->hfsp_leafs[target->hfsp_curleaf].parent_id = 2;
target->hfsp_curleaf++; target->hfsp_curleaf++;
@ -861,7 +993,27 @@ int hfsplus_writer_create(Ecma119Image *target)
/* add this writer to image */ /* add this writer to image */
target->writers[target->nwriters++] = writer; target->writers[target->nwriters++] = writer;
/* we need the volume descriptor */ return ISO_SUCCESS;
target->curblock++; }
int hfsplus_tail_writer_create(Ecma119Image *target)
{
IsoImageWriter *writer;
writer = malloc(sizeof(IsoImageWriter));
if (writer == NULL) {
return ISO_OUT_OF_MEM;
}
writer->compute_data_blocks = hfsplus_tail_writer_compute_data_blocks;
writer->write_vol_desc = nop_writer_write_vol_desc;
writer->write_data = hfsplus_tail_writer_write_data;
writer->free_data = nop_writer_free_data;
writer->data = NULL;
writer->target = target;
/* add this writer to image */
target->writers[target->nwriters++] = writer;
return ISO_SUCCESS; return ISO_SUCCESS;
} }

9
libisofs/hfsplus.h
View File

@ -59,7 +59,7 @@ struct hfsplus_node
}; };
int hfsplus_writer_create(Ecma119Image *target); int hfsplus_writer_create(Ecma119Image *target);
int hfsplus_writer_write_vol_desc(IsoImageWriter *writer); int hfsplus_tail_writer_create(Ecma119Image *target);
struct hfsplus_extent struct hfsplus_extent
{ {
@ -149,7 +149,7 @@ struct hfsplus_catfile_thread
uint16_t reserved; uint16_t reserved;
uint32_t parentid; uint32_t parentid;
uint16_t namelen; uint16_t namelen;
}; } __attribute__ ((packed));
struct hfsplus_catfile_common struct hfsplus_catfile_common
{ {
@ -173,5 +173,10 @@ struct hfsplus_catfile_common
uint32_t reserved; uint32_t reserved;
} __attribute__ ((packed)); } __attribute__ ((packed));
#define HFSPLUS_MAX_DECOMPOSE_LEN 4
extern const uint16_t (*hfsplus_decompose_pages[256])[HFSPLUS_MAX_DECOMPOSE_LEN + 1];
extern const uint16_t *hfsplus_class_pages[256];
extern const uint16_t hfsplus_casefold[];
#endif /* LIBISO_HFSPLUS_H */ #endif /* LIBISO_HFSPLUS_H */

397
libisofs/hfsplus_case.c Normal file
View File

@ -0,0 +1,397 @@
#ifdef HAVE_CONFIG_H
#include "../config.h"
#endif
#include "hfsplus.h"
/*
This is copied verbatim from tn1150 (HFS+ format specification)
*/
const uint16_t hfsplus_casefold[] = {
/* High-byte indices ( == 0 iff no case mapping and no ignorables ) */
/* 0 */ 0x0100, 0x0200, 0x0000, 0x0300, 0x0400, 0x0500, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 1 */ 0x0600, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 2 */ 0x0700, 0x0800, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 3 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 4 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 5 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 6 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 7 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 8 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 9 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* A */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* B */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* C */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* D */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* E */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* F */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0900, 0x0A00,
/* Table 1 (for high byte 0x00) */
/* 0 */ 0xFFFF, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
/* 1 */ 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017,
0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
/* 2 */ 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
/* 3 */ 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037,
0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
/* 4 */ 0x0040, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067,
0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
/* 5 */ 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077,
0x0078, 0x0079, 0x007A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
/* 6 */ 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067,
0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
/* 7 */ 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077,
0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
/* 8 */ 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
/* 9 */ 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
/* A */ 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
/* B */ 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
/* C */ 0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00E6, 0x00C7,
0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
/* D */ 0x00F0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
0x00F8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00FE, 0x00DF,
/* E */ 0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
/* F */ 0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF,
/* Table 2 (for high byte 0x01) */
/* 0 */ 0x0100, 0x0101, 0x0102, 0x0103, 0x0104, 0x0105, 0x0106, 0x0107,
0x0108, 0x0109, 0x010A, 0x010B, 0x010C, 0x010D, 0x010E, 0x010F,
/* 1 */ 0x0111, 0x0111, 0x0112, 0x0113, 0x0114, 0x0115, 0x0116, 0x0117,
0x0118, 0x0119, 0x011A, 0x011B, 0x011C, 0x011D, 0x011E, 0x011F,
/* 2 */ 0x0120, 0x0121, 0x0122, 0x0123, 0x0124, 0x0125, 0x0127, 0x0127,
0x0128, 0x0129, 0x012A, 0x012B, 0x012C, 0x012D, 0x012E, 0x012F,
/* 3 */ 0x0130, 0x0131, 0x0133, 0x0133, 0x0134, 0x0135, 0x0136, 0x0137,
0x0138, 0x0139, 0x013A, 0x013B, 0x013C, 0x013D, 0x013E, 0x0140,
/* 4 */ 0x0140, 0x0142, 0x0142, 0x0143, 0x0144, 0x0145, 0x0146, 0x0147,
0x0148, 0x0149, 0x014B, 0x014B, 0x014C, 0x014D, 0x014E, 0x014F,
/* 5 */ 0x0150, 0x0151, 0x0153, 0x0153, 0x0154, 0x0155, 0x0156, 0x0157,
0x0158, 0x0159, 0x015A, 0x015B, 0x015C, 0x015D, 0x015E, 0x015F,
/* 6 */ 0x0160, 0x0161, 0x0162, 0x0163, 0x0164, 0x0165, 0x0167, 0x0167,
0x0168, 0x0169, 0x016A, 0x016B, 0x016C, 0x016D, 0x016E, 0x016F,
/* 7 */ 0x0170, 0x0171, 0x0172, 0x0173, 0x0174, 0x0175, 0x0176, 0x0177,
0x0178, 0x0179, 0x017A, 0x017B, 0x017C, 0x017D, 0x017E, 0x017F,
/* 8 */ 0x0180, 0x0253, 0x0183, 0x0183, 0x0185, 0x0185, 0x0254, 0x0188,
0x0188, 0x0256, 0x0257, 0x018C, 0x018C, 0x018D, 0x01DD, 0x0259,
/* 9 */ 0x025B, 0x0192, 0x0192, 0x0260, 0x0263, 0x0195, 0x0269, 0x0268,
0x0199, 0x0199, 0x019A, 0x019B, 0x026F, 0x0272, 0x019E, 0x0275,
/* A */ 0x01A0, 0x01A1, 0x01A3, 0x01A3, 0x01A5, 0x01A5, 0x01A6, 0x01A8,
0x01A8, 0x0283, 0x01AA, 0x01AB, 0x01AD, 0x01AD, 0x0288, 0x01AF,
/* B */ 0x01B0, 0x028A, 0x028B, 0x01B4, 0x01B4, 0x01B6, 0x01B6, 0x0292,
0x01B9, 0x01B9, 0x01BA, 0x01BB, 0x01BD, 0x01BD, 0x01BE, 0x01BF,
/* C */ 0x01C0, 0x01C1, 0x01C2, 0x01C3, 0x01C6, 0x01C6, 0x01C6, 0x01C9,
0x01C9, 0x01C9, 0x01CC, 0x01CC, 0x01CC, 0x01CD, 0x01CE, 0x01CF,
/* D */ 0x01D0, 0x01D1, 0x01D2, 0x01D3, 0x01D4, 0x01D5, 0x01D6, 0x01D7,
0x01D8, 0x01D9, 0x01DA, 0x01DB, 0x01DC, 0x01DD, 0x01DE, 0x01DF,
/* E */ 0x01E0, 0x01E1, 0x01E2, 0x01E3, 0x01E5, 0x01E5, 0x01E6, 0x01E7,
0x01E8, 0x01E9, 0x01EA, 0x01EB, 0x01EC, 0x01ED, 0x01EE, 0x01EF,
/* F */ 0x01F0, 0x01F3, 0x01F3, 0x01F3, 0x01F4, 0x01F5, 0x01F6, 0x01F7,
0x01F8, 0x01F9, 0x01FA, 0x01FB, 0x01FC, 0x01FD, 0x01FE, 0x01FF,
/* Table 3 (for high byte 0x03) */
/* 0 */ 0x0300, 0x0301, 0x0302, 0x0303, 0x0304, 0x0305, 0x0306, 0x0307,
0x0308, 0x0309, 0x030A, 0x030B, 0x030C, 0x030D, 0x030E, 0x030F,
/* 1 */ 0x0310, 0x0311, 0x0312, 0x0313, 0x0314, 0x0315, 0x0316, 0x0317,
0x0318, 0x0319, 0x031A, 0x031B, 0x031C, 0x031D, 0x031E, 0x031F,
/* 2 */ 0x0320, 0x0321, 0x0322, 0x0323, 0x0324, 0x0325, 0x0326, 0x0327,
0x0328, 0x0329, 0x032A, 0x032B, 0x032C, 0x032D, 0x032E, 0x032F,
/* 3 */ 0x0330, 0x0331, 0x0332, 0x0333, 0x0334, 0x0335, 0x0336, 0x0337,
0x0338, 0x0339, 0x033A, 0x033B, 0x033C, 0x033D, 0x033E, 0x033F,
/* 4 */ 0x0340, 0x0341, 0x0342, 0x0343, 0x0344, 0x0345, 0x0346, 0x0347,
0x0348, 0x0349, 0x034A, 0x034B, 0x034C, 0x034D, 0x034E, 0x034F,
/* 5 */ 0x0350, 0x0351, 0x0352, 0x0353, 0x0354, 0x0355, 0x0356, 0x0357,
0x0358, 0x0359, 0x035A, 0x035B, 0x035C, 0x035D, 0x035E, 0x035F,
/* 6 */ 0x0360, 0x0361, 0x0362, 0x0363, 0x0364, 0x0365, 0x0366, 0x0367,
0x0368, 0x0369, 0x036A, 0x036B, 0x036C, 0x036D, 0x036E, 0x036F,
/* 7 */ 0x0370, 0x0371, 0x0372, 0x0373, 0x0374, 0x0375, 0x0376, 0x0377,
0x0378, 0x0379, 0x037A, 0x037B, 0x037C, 0x037D, 0x037E, 0x037F,
/* 8 */ 0x0380, 0x0381, 0x0382, 0x0383, 0x0384, 0x0385, 0x0386, 0x0387,
0x0388, 0x0389, 0x038A, 0x038B, 0x038C, 0x038D, 0x038E, 0x038F,
/* 9 */ 0x0390, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7,
0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF,
/* A */ 0x03C0, 0x03C1, 0x03A2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7,
0x03C8, 0x03C9, 0x03AA, 0x03AB, 0x03AC, 0x03AD, 0x03AE, 0x03AF,
/* B */ 0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7,
0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF,
/* C */ 0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7,
0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE, 0x03CF,
/* D */ 0x03D0, 0x03D1, 0x03D2, 0x03D3, 0x03D4, 0x03D5, 0x03D6, 0x03D7,
0x03D8, 0x03D9, 0x03DA, 0x03DB, 0x03DC, 0x03DD, 0x03DE, 0x03DF,
/* E */ 0x03E0, 0x03E1, 0x03E3, 0x03E3, 0x03E5, 0x03E5, 0x03E7, 0x03E7,
0x03E9, 0x03E9, 0x03EB, 0x03EB, 0x03ED, 0x03ED, 0x03EF, 0x03EF,
/* F */ 0x03F0, 0x03F1, 0x03F2, 0x03F3, 0x03F4, 0x03F5, 0x03F6, 0x03F7,
0x03F8, 0x03F9, 0x03FA, 0x03FB, 0x03FC, 0x03FD, 0x03FE, 0x03FF,
/* Table 4 (for high byte 0x04) */
/* 0 */ 0x0400, 0x0401, 0x0452, 0x0403, 0x0454, 0x0455, 0x0456, 0x0407,
0x0458, 0x0459, 0x045A, 0x045B, 0x040C, 0x040D, 0x040E, 0x045F,
/* 1 */ 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
0x0438, 0x0419, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
/* 2 */ 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F,
/* 3 */ 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
/* 4 */ 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F,
/* 5 */ 0x0450, 0x0451, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457,
0x0458, 0x0459, 0x045A, 0x045B, 0x045C, 0x045D, 0x045E, 0x045F,
/* 6 */ 0x0461, 0x0461, 0x0463, 0x0463, 0x0465, 0x0465, 0x0467, 0x0467,
0x0469, 0x0469, 0x046B, 0x046B, 0x046D, 0x046D, 0x046F, 0x046F,
/* 7 */ 0x0471, 0x0471, 0x0473, 0x0473, 0x0475, 0x0475, 0x0476, 0x0477,
0x0479, 0x0479, 0x047B, 0x047B, 0x047D, 0x047D, 0x047F, 0x047F,
/* 8 */ 0x0481, 0x0481, 0x0482, 0x0483, 0x0484, 0x0485, 0x0486, 0x0487,
0x0488, 0x0489, 0x048A, 0x048B, 0x048C, 0x048D, 0x048E, 0x048F,
/* 9 */ 0x0491, 0x0491, 0x0493, 0x0493, 0x0495, 0x0495, 0x0497, 0x0497,
0x0499, 0x0499, 0x049B, 0x049B, 0x049D, 0x049D, 0x049F, 0x049F,
/* A */ 0x04A1, 0x04A1, 0x04A3, 0x04A3, 0x04A5, 0x04A5, 0x04A7, 0x04A7,
0x04A9, 0x04A9, 0x04AB, 0x04AB, 0x04AD, 0x04AD, 0x04AF, 0x04AF,
/* B */ 0x04B1, 0x04B1, 0x04B3, 0x04B3, 0x04B5, 0x04B5, 0x04B7, 0x04B7,
0x04B9, 0x04B9, 0x04BB, 0x04BB, 0x04BD, 0x04BD, 0x04BF, 0x04BF,
/* C */ 0x04C0, 0x04C1, 0x04C2, 0x04C4, 0x04C4, 0x04C5, 0x04C6, 0x04C8,
0x04C8, 0x04C9, 0x04CA, 0x04CC, 0x04CC, 0x04CD, 0x04CE, 0x04CF,
/* D */ 0x04D0, 0x04D1, 0x04D2, 0x04D3, 0x04D4, 0x04D5, 0x04D6, 0x04D7,
0x04D8, 0x04D9, 0x04DA, 0x04DB, 0x04DC, 0x04DD, 0x04DE, 0x04DF,
/* E */ 0x04E0, 0x04E1, 0x04E2, 0x04E3, 0x04E4, 0x04E5, 0x04E6, 0x04E7,
0x04E8, 0x04E9, 0x04EA, 0x04EB, 0x04EC, 0x04ED, 0x04EE, 0x04EF,
/* F */ 0x04F0, 0x04F1, 0x04F2, 0x04F3, 0x04F4, 0x04F5, 0x04F6, 0x04F7,
0x04F8, 0x04F9, 0x04FA, 0x04FB, 0x04FC, 0x04FD, 0x04FE, 0x04FF,
/* Table 5 (for high byte 0x05) */
/* 0 */ 0x0500, 0x0501, 0x0502, 0x0503, 0x0504, 0x0505, 0x0506, 0x0507,
0x0508, 0x0509, 0x050A, 0x050B, 0x050C, 0x050D, 0x050E, 0x050F,
/* 1 */ 0x0510, 0x0511, 0x0512, 0x0513, 0x0514, 0x0515, 0x0516, 0x0517,
0x0518, 0x0519, 0x051A, 0x051B, 0x051C, 0x051D, 0x051E, 0x051F,
/* 2 */ 0x0520, 0x0521, 0x0522, 0x0523, 0x0524, 0x0525, 0x0526, 0x0527,
0x0528, 0x0529, 0x052A, 0x052B, 0x052C, 0x052D, 0x052E, 0x052F,
/* 3 */ 0x0530, 0x0561, 0x0562, 0x0563, 0x0564, 0x0565, 0x0566, 0x0567,
0x0568, 0x0569, 0x056A, 0x056B, 0x056C, 0x056D, 0x056E, 0x056F,
/* 4 */ 0x0570, 0x0571, 0x0572, 0x0573, 0x0574, 0x0575, 0x0576, 0x0577,
0x0578, 0x0579, 0x057A, 0x057B, 0x057C, 0x057D, 0x057E, 0x057F,
/* 5 */ 0x0580, 0x0581, 0x0582, 0x0583, 0x0584, 0x0585, 0x0586, 0x0557,
0x0558, 0x0559, 0x055A, 0x055B, 0x055C, 0x055D, 0x055E, 0x055F,
/* 6 */ 0x0560, 0x0561, 0x0562, 0x0563, 0x0564, 0x0565, 0x0566, 0x0567,
0x0568, 0x0569, 0x056A, 0x056B, 0x056C, 0x056D, 0x056E, 0x056F,
/* 7 */ 0x0570, 0x0571, 0x0572, 0x0573, 0x0574, 0x0575, 0x0576, 0x0577,
0x0578, 0x0579, 0x057A, 0x057B, 0x057C, 0x057D, 0x057E, 0x057F,
/* 8 */ 0x0580, 0x0581, 0x0582, 0x0583, 0x0584, 0x0585, 0x0586, 0x0587,
0x0588, 0x0589, 0x058A, 0x058B, 0x058C, 0x058D, 0x058E, 0x058F,
/* 9 */ 0x0590, 0x0591, 0x0592, 0x0593, 0x0594, 0x0595, 0x0596, 0x0597,
0x0598, 0x0599, 0x059A, 0x059B, 0x059C, 0x059D, 0x059E, 0x059F,
/* A */ 0x05A0, 0x05A1, 0x05A2, 0x05A3, 0x05A4, 0x05A5, 0x05A6, 0x05A7,
0x05A8, 0x05A9, 0x05AA, 0x05AB, 0x05AC, 0x05AD, 0x05AE, 0x05AF,
/* B */ 0x05B0, 0x05B1, 0x05B2, 0x05B3, 0x05B4, 0x05B5, 0x05B6, 0x05B7,
0x05B8, 0x05B9, 0x05BA, 0x05BB, 0x05BC, 0x05BD, 0x05BE, 0x05BF,
/* C */ 0x05C0, 0x05C1, 0x05C2, 0x05C3, 0x05C4, 0x05C5, 0x05C6, 0x05C7,
0x05C8, 0x05C9, 0x05CA, 0x05CB, 0x05CC, 0x05CD, 0x05CE, 0x05CF,
/* D */ 0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7,
0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF,
/* E */ 0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7,
0x05E8, 0x05E9, 0x05EA, 0x05EB, 0x05EC, 0x05ED, 0x05EE, 0x05EF,
/* F */ 0x05F0, 0x05F1, 0x05F2, 0x05F3, 0x05F4, 0x05F5, 0x05F6, 0x05F7,
0x05F8, 0x05F9, 0x05FA, 0x05FB, 0x05FC, 0x05FD, 0x05FE, 0x05FF,
/* Table 6 (for high byte 0x10) */
/* 0 */ 0x1000, 0x1001, 0x1002, 0x1003, 0x1004, 0x1005, 0x1006, 0x1007,
0x1008, 0x1009, 0x100A, 0x100B, 0x100C, 0x100D, 0x100E, 0x100F,
/* 1 */ 0x1010, 0x1011, 0x1012, 0x1013, 0x1014, 0x1015, 0x1016, 0x1017,
0x1018, 0x1019, 0x101A, 0x101B, 0x101C, 0x101D, 0x101E, 0x101F,
/* 2 */ 0x1020, 0x1021, 0x1022, 0x1023, 0x1024, 0x1025, 0x1026, 0x1027,
0x1028, 0x1029, 0x102A, 0x102B, 0x102C, 0x102D, 0x102E, 0x102F,
/* 3 */ 0x1030, 0x1031, 0x1032, 0x1033, 0x1034, 0x1035, 0x1036, 0x1037,
0x1038, 0x1039, 0x103A, 0x103B, 0x103C, 0x103D, 0x103E, 0x103F,
/* 4 */ 0x1040, 0x1041, 0x1042, 0x1043, 0x1044, 0x1045, 0x1046, 0x1047,
0x1048, 0x1049, 0x104A, 0x104B, 0x104C, 0x104D, 0x104E, 0x104F,
/* 5 */ 0x1050, 0x1051, 0x1052, 0x1053, 0x1054, 0x1055, 0x1056, 0x1057,
0x1058, 0x1059, 0x105A, 0x105B, 0x105C, 0x105D, 0x105E, 0x105F,
/* 6 */ 0x1060, 0x1061, 0x1062, 0x1063, 0x1064, 0x1065, 0x1066, 0x1067,
0x1068, 0x1069, 0x106A, 0x106B, 0x106C, 0x106D, 0x106E, 0x106F,
/* 7 */ 0x1070, 0x1071, 0x1072, 0x1073, 0x1074, 0x1075, 0x1076, 0x1077,
0x1078, 0x1079, 0x107A, 0x107B, 0x107C, 0x107D, 0x107E, 0x107F,
/* 8 */ 0x1080, 0x1081, 0x1082, 0x1083, 0x1084, 0x1085, 0x1086, 0x1087,
0x1088, 0x1089, 0x108A, 0x108B, 0x108C, 0x108D, 0x108E, 0x108F,
/* 9 */ 0x1090, 0x1091, 0x1092, 0x1093, 0x1094, 0x1095, 0x1096, 0x1097,
0x1098, 0x1099, 0x109A, 0x109B, 0x109C, 0x109D, 0x109E, 0x109F,
/* A */ 0x10D0, 0x10D1, 0x10D2, 0x10D3, 0x10D4, 0x10D5, 0x10D6, 0x10D7,
0x10D8, 0x10D9, 0x10DA, 0x10DB, 0x10DC, 0x10DD, 0x10DE, 0x10DF,
/* B */ 0x10E0, 0x10E1, 0x10E2, 0x10E3, 0x10E4, 0x10E5, 0x10E6, 0x10E7,
0x10E8, 0x10E9, 0x10EA, 0x10EB, 0x10EC, 0x10ED, 0x10EE, 0x10EF,
/* C */ 0x10F0, 0x10F1, 0x10F2, 0x10F3, 0x10F4, 0x10F5, 0x10C6, 0x10C7,
0x10C8, 0x10C9, 0x10CA, 0x10CB, 0x10CC, 0x10CD, 0x10CE, 0x10CF,
/* D */ 0x10D0, 0x10D1, 0x10D2, 0x10D3, 0x10D4, 0x10D5, 0x10D6, 0x10D7,
0x10D8, 0x10D9, 0x10DA, 0x10DB, 0x10DC, 0x10DD, 0x10DE, 0x10DF,
/* E */ 0x10E0, 0x10E1, 0x10E2, 0x10E3, 0x10E4, 0x10E5, 0x10E6, 0x10E7,
0x10E8, 0x10E9, 0x10EA, 0x10EB, 0x10EC, 0x10ED, 0x10EE, 0x10EF,
/* F */ 0x10F0, 0x10F1, 0x10F2, 0x10F3, 0x10F4, 0x10F5, 0x10F6, 0x10F7,
0x10F8, 0x10F9, 0x10FA, 0x10FB, 0x10FC, 0x10FD, 0x10FE, 0x10FF,
/* Table 7 (for high byte 0x20) */
/* 0 */ 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, 0x2006, 0x2007,
0x2008, 0x2009, 0x200A, 0x200B, 0x0000, 0x0000, 0x0000, 0x0000,
/* 1 */ 0x2010, 0x2011, 0x2012, 0x2013, 0x2014, 0x2015, 0x2016, 0x2017,
0x2018, 0x2019, 0x201A, 0x201B, 0x201C, 0x201D, 0x201E, 0x201F,
/* 2 */ 0x2020, 0x2021, 0x2022, 0x2023, 0x2024, 0x2025, 0x2026, 0x2027,
0x2028, 0x2029, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x202F,
/* 3 */ 0x2030, 0x2031, 0x2032, 0x2033, 0x2034, 0x2035, 0x2036, 0x2037,
0x2038, 0x2039, 0x203A, 0x203B, 0x203C, 0x203D, 0x203E, 0x203F,
/* 4 */ 0x2040, 0x2041, 0x2042, 0x2043, 0x2044, 0x2045, 0x2046, 0x2047,
0x2048, 0x2049, 0x204A, 0x204B, 0x204C, 0x204D, 0x204E, 0x204F,
/* 5 */ 0x2050, 0x2051, 0x2052, 0x2053, 0x2054, 0x2055, 0x2056, 0x2057,
0x2058, 0x2059, 0x205A, 0x205B, 0x205C, 0x205D, 0x205E, 0x205F,
/* 6 */ 0x2060, 0x2061, 0x2062, 0x2063, 0x2064, 0x2065, 0x2066, 0x2067,
0x2068, 0x2069, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 7 */ 0x2070, 0x2071, 0x2072, 0x2073, 0x2074, 0x2075, 0x2076, 0x2077,
0x2078, 0x2079, 0x207A, 0x207B, 0x207C, 0x207D, 0x207E, 0x207F,
/* 8 */ 0x2080, 0x2081, 0x2082, 0x2083, 0x2084, 0x2085, 0x2086, 0x2087,
0x2088, 0x2089, 0x208A, 0x208B, 0x208C, 0x208D, 0x208E, 0x208F,
/* 9 */ 0x2090, 0x2091, 0x2092, 0x2093, 0x2094, 0x2095, 0x2096, 0x2097,
0x2098, 0x2099, 0x209A, 0x209B, 0x209C, 0x209D, 0x209E, 0x209F,
/* A */ 0x20A0, 0x20A1, 0x20A2, 0x20A3, 0x20A4, 0x20A5, 0x20A6, 0x20A7,
0x20A8, 0x20A9, 0x20AA, 0x20AB, 0x20AC, 0x20AD, 0x20AE, 0x20AF,
/* B */ 0x20B0, 0x20B1, 0x20B2, 0x20B3, 0x20B4, 0x20B5, 0x20B6, 0x20B7,
0x20B8, 0x20B9, 0x20BA, 0x20BB, 0x20BC, 0x20BD, 0x20BE, 0x20BF,
/* C */ 0x20C0, 0x20C1, 0x20C2, 0x20C3, 0x20C4, 0x20C5, 0x20C6, 0x20C7,
0x20C8, 0x20C9, 0x20CA, 0x20CB, 0x20CC, 0x20CD, 0x20CE, 0x20CF,
/* D */ 0x20D0, 0x20D1, 0x20D2, 0x20D3, 0x20D4, 0x20D5, 0x20D6, 0x20D7,
0x20D8, 0x20D9, 0x20DA, 0x20DB, 0x20DC, 0x20DD, 0x20DE, 0x20DF,
/* E */ 0x20E0, 0x20E1, 0x20E2, 0x20E3, 0x20E4, 0x20E5, 0x20E6, 0x20E7,
0x20E8, 0x20E9, 0x20EA, 0x20EB, 0x20EC, 0x20ED, 0x20EE, 0x20EF,
/* F */ 0x20F0, 0x20F1, 0x20F2, 0x20F3, 0x20F4, 0x20F5, 0x20F6, 0x20F7,
0x20F8, 0x20F9, 0x20FA, 0x20FB, 0x20FC, 0x20FD, 0x20FE, 0x20FF,
/* Table 8 (for high byte 0x21) */
/* 0 */ 0x2100, 0x2101, 0x2102, 0x2103, 0x2104, 0x2105, 0x2106, 0x2107,
0x2108, 0x2109, 0x210A, 0x210B, 0x210C, 0x210D, 0x210E, 0x210F,
/* 1 */ 0x2110, 0x2111, 0x2112, 0x2113, 0x2114, 0x2115, 0x2116, 0x2117,
0x2118, 0x2119, 0x211A, 0x211B, 0x211C, 0x211D, 0x211E, 0x211F,
/* 2 */ 0x2120, 0x2121, 0x2122, 0x2123, 0x2124, 0x2125, 0x2126, 0x2127,
0x2128, 0x2129, 0x212A, 0x212B, 0x212C, 0x212D, 0x212E, 0x212F,
/* 3 */ 0x2130, 0x2131, 0x2132, 0x2133, 0x2134, 0x2135, 0x2136, 0x2137,
0x2138, 0x2139, 0x213A, 0x213B, 0x213C, 0x213D, 0x213E, 0x213F,
/* 4 */ 0x2140, 0x2141, 0x2142, 0x2143, 0x2144, 0x2145, 0x2146, 0x2147,
0x2148, 0x2149, 0x214A, 0x214B, 0x214C, 0x214D, 0x214E, 0x214F,
/* 5 */ 0x2150, 0x2151, 0x2152, 0x2153, 0x2154, 0x2155, 0x2156, 0x2157,
0x2158, 0x2159, 0x215A, 0x215B, 0x215C, 0x215D, 0x215E, 0x215F,
/* 6 */ 0x2170, 0x2171, 0x2172, 0x2173, 0x2174, 0x2175, 0x2176, 0x2177,
0x2178, 0x2179, 0x217A, 0x217B, 0x217C, 0x217D, 0x217E, 0x217F,
/* 7 */ 0x2170, 0x2171, 0x2172, 0x2173, 0x2174, 0x2175, 0x2176, 0x2177,
0x2178, 0x2179, 0x217A, 0x217B, 0x217C, 0x217D, 0x217E, 0x217F,
/* 8 */ 0x2180, 0x2181, 0x2182, 0x2183, 0x2184, 0x2185, 0x2186, 0x2187,
0x2188, 0x2189, 0x218A, 0x218B, 0x218C, 0x218D, 0x218E, 0x218F,
/* 9 */ 0x2190, 0x2191, 0x2192, 0x2193, 0x2194, 0x2195, 0x2196, 0x2197,
0x2198, 0x2199, 0x219A, 0x219B, 0x219C, 0x219D, 0x219E, 0x219F,
/* A */ 0x21A0, 0x21A1, 0x21A2, 0x21A3, 0x21A4, 0x21A5, 0x21A6, 0x21A7,
0x21A8, 0x21A9, 0x21AA, 0x21AB, 0x21AC, 0x21AD, 0x21AE, 0x21AF,
/* B */ 0x21B0, 0x21B1, 0x21B2, 0x21B3, 0x21B4, 0x21B5, 0x21B6, 0x21B7,
0x21B8, 0x21B9, 0x21BA, 0x21BB, 0x21BC, 0x21BD, 0x21BE, 0x21BF,
/* C */ 0x21C0, 0x21C1, 0x21C2, 0x21C3, 0x21C4, 0x21C5, 0x21C6, 0x21C7,
0x21C8, 0x21C9, 0x21CA, 0x21CB, 0x21CC, 0x21CD, 0x21CE, 0x21CF,
/* D */ 0x21D0, 0x21D1, 0x21D2, 0x21D3, 0x21D4, 0x21D5, 0x21D6, 0x21D7,
0x21D8, 0x21D9, 0x21DA, 0x21DB, 0x21DC, 0x21DD, 0x21DE, 0x21DF,
/* E */ 0x21E0, 0x21E1, 0x21E2, 0x21E3, 0x21E4, 0x21E5, 0x21E6, 0x21E7,
0x21E8, 0x21E9, 0x21EA, 0x21EB, 0x21EC, 0x21ED, 0x21EE, 0x21EF,
/* F */ 0x21F0, 0x21F1, 0x21F2, 0x21F3, 0x21F4, 0x21F5, 0x21F6, 0x21F7,
0x21F8, 0x21F9, 0x21FA, 0x21FB, 0x21FC, 0x21FD, 0x21FE, 0x21FF,
/* Table 9 (for high byte 0xFE) */
/* 0 */ 0xFE00, 0xFE01, 0xFE02, 0xFE03, 0xFE04, 0xFE05, 0xFE06, 0xFE07,
0xFE08, 0xFE09, 0xFE0A, 0xFE0B, 0xFE0C, 0xFE0D, 0xFE0E, 0xFE0F,
/* 1 */ 0xFE10, 0xFE11, 0xFE12, 0xFE13, 0xFE14, 0xFE15, 0xFE16, 0xFE17,
0xFE18, 0xFE19, 0xFE1A, 0xFE1B, 0xFE1C, 0xFE1D, 0xFE1E, 0xFE1F,
/* 2 */ 0xFE20, 0xFE21, 0xFE22, 0xFE23, 0xFE24, 0xFE25, 0xFE26, 0xFE27,
0xFE28, 0xFE29, 0xFE2A, 0xFE2B, 0xFE2C, 0xFE2D, 0xFE2E, 0xFE2F,
/* 3 */ 0xFE30, 0xFE31, 0xFE32, 0xFE33, 0xFE34, 0xFE35, 0xFE36, 0xFE37,
0xFE38, 0xFE39, 0xFE3A, 0xFE3B, 0xFE3C, 0xFE3D, 0xFE3E, 0xFE3F,
/* 4 */ 0xFE40, 0xFE41, 0xFE42, 0xFE43, 0xFE44, 0xFE45, 0xFE46, 0xFE47,
0xFE48, 0xFE49, 0xFE4A, 0xFE4B, 0xFE4C, 0xFE4D, 0xFE4E, 0xFE4F,
/* 5 */ 0xFE50, 0xFE51, 0xFE52, 0xFE53, 0xFE54, 0xFE55, 0xFE56, 0xFE57,
0xFE58, 0xFE59, 0xFE5A, 0xFE5B, 0xFE5C, 0xFE5D, 0xFE5E, 0xFE5F,
/* 6 */ 0xFE60, 0xFE61, 0xFE62, 0xFE63, 0xFE64, 0xFE65, 0xFE66, 0xFE67,
0xFE68, 0xFE69, 0xFE6A, 0xFE6B, 0xFE6C, 0xFE6D, 0xFE6E, 0xFE6F,
/* 7 */ 0xFE70, 0xFE71, 0xFE72, 0xFE73, 0xFE74, 0xFE75, 0xFE76, 0xFE77,
0xFE78, 0xFE79, 0xFE7A, 0xFE7B, 0xFE7C, 0xFE7D, 0xFE7E, 0xFE7F,
/* 8 */ 0xFE80, 0xFE81, 0xFE82, 0xFE83, 0xFE84, 0xFE85, 0xFE86, 0xFE87,
0xFE88, 0xFE89, 0xFE8A, 0xFE8B, 0xFE8C, 0xFE8D, 0xFE8E, 0xFE8F,
/* 9 */ 0xFE90, 0xFE91, 0xFE92, 0xFE93, 0xFE94, 0xFE95, 0xFE96, 0xFE97,
0xFE98, 0xFE99, 0xFE9A, 0xFE9B, 0xFE9C, 0xFE9D, 0xFE9E, 0xFE9F,
/* A */ 0xFEA0, 0xFEA1, 0xFEA2, 0xFEA3, 0xFEA4, 0xFEA5, 0xFEA6, 0xFEA7,
0xFEA8, 0xFEA9, 0xFEAA, 0xFEAB, 0xFEAC, 0xFEAD, 0xFEAE, 0xFEAF,
/* B */ 0xFEB0, 0xFEB1, 0xFEB2, 0xFEB3, 0xFEB4, 0xFEB5, 0xFEB6, 0xFEB7,
0xFEB8, 0xFEB9, 0xFEBA, 0xFEBB, 0xFEBC, 0xFEBD, 0xFEBE, 0xFEBF,
/* C */ 0xFEC0, 0xFEC1, 0xFEC2, 0xFEC3, 0xFEC4, 0xFEC5, 0xFEC6, 0xFEC7,
0xFEC8, 0xFEC9, 0xFECA, 0xFECB, 0xFECC, 0xFECD, 0xFECE, 0xFECF,
/* D */ 0xFED0, 0xFED1, 0xFED2, 0xFED3, 0xFED4, 0xFED5, 0xFED6, 0xFED7,
0xFED8, 0xFED9, 0xFEDA, 0xFEDB, 0xFEDC, 0xFEDD, 0xFEDE, 0xFEDF,
/* E */ 0xFEE0, 0xFEE1, 0xFEE2, 0xFEE3, 0xFEE4, 0xFEE5, 0xFEE6, 0xFEE7,
0xFEE8, 0xFEE9, 0xFEEA, 0xFEEB, 0xFEEC, 0xFEED, 0xFEEE, 0xFEEF,
/* F */ 0xFEF0, 0xFEF1, 0xFEF2, 0xFEF3, 0xFEF4, 0xFEF5, 0xFEF6, 0xFEF7,
0xFEF8, 0xFEF9, 0xFEFA, 0xFEFB, 0xFEFC, 0xFEFD, 0xFEFE, 0x0000,
/* Table 10 (for high byte 0xFF) */
/* 0 */ 0xFF00, 0xFF01, 0xFF02, 0xFF03, 0xFF04, 0xFF05, 0xFF06, 0xFF07,
0xFF08, 0xFF09, 0xFF0A, 0xFF0B, 0xFF0C, 0xFF0D, 0xFF0E, 0xFF0F,
/* 1 */ 0xFF10, 0xFF11, 0xFF12, 0xFF13, 0xFF14, 0xFF15, 0xFF16, 0xFF17,
0xFF18, 0xFF19, 0xFF1A, 0xFF1B, 0xFF1C, 0xFF1D, 0xFF1E, 0xFF1F,
/* 2 */ 0xFF20, 0xFF41, 0xFF42, 0xFF43, 0xFF44, 0xFF45, 0xFF46, 0xFF47,
0xFF48, 0xFF49, 0xFF4A, 0xFF4B, 0xFF4C, 0xFF4D, 0xFF4E, 0xFF4F,
/* 3 */ 0xFF50, 0xFF51, 0xFF52, 0xFF53, 0xFF54, 0xFF55, 0xFF56, 0xFF57,
0xFF58, 0xFF59, 0xFF5A, 0xFF3B, 0xFF3C, 0xFF3D, 0xFF3E, 0xFF3F,
/* 4 */ 0xFF40, 0xFF41, 0xFF42, 0xFF43, 0xFF44, 0xFF45, 0xFF46, 0xFF47,
0xFF48, 0xFF49, 0xFF4A, 0xFF4B, 0xFF4C, 0xFF4D, 0xFF4E, 0xFF4F,
/* 5 */ 0xFF50, 0xFF51, 0xFF52, 0xFF53, 0xFF54, 0xFF55, 0xFF56, 0xFF57,
0xFF58, 0xFF59, 0xFF5A, 0xFF5B, 0xFF5C, 0xFF5D, 0xFF5E, 0xFF5F,
/* 6 */ 0xFF60, 0xFF61, 0xFF62, 0xFF63, 0xFF64, 0xFF65, 0xFF66, 0xFF67,
0xFF68, 0xFF69, 0xFF6A, 0xFF6B, 0xFF6C, 0xFF6D, 0xFF6E, 0xFF6F,
/* 7 */ 0xFF70, 0xFF71, 0xFF72, 0xFF73, 0xFF74, 0xFF75, 0xFF76, 0xFF77,
0xFF78, 0xFF79, 0xFF7A, 0xFF7B, 0xFF7C, 0xFF7D, 0xFF7E, 0xFF7F,
/* 8 */ 0xFF80, 0xFF81, 0xFF82, 0xFF83, 0xFF84, 0xFF85, 0xFF86, 0xFF87,
0xFF88, 0xFF89, 0xFF8A, 0xFF8B, 0xFF8C, 0xFF8D, 0xFF8E, 0xFF8F,
/* 9 */ 0xFF90, 0xFF91, 0xFF92, 0xFF93, 0xFF94, 0xFF95, 0xFF96, 0xFF97,
0xFF98, 0xFF99, 0xFF9A, 0xFF9B, 0xFF9C, 0xFF9D, 0xFF9E, 0xFF9F,
/* A */ 0xFFA0, 0xFFA1, 0xFFA2, 0xFFA3, 0xFFA4, 0xFFA5, 0xFFA6, 0xFFA7,
0xFFA8, 0xFFA9, 0xFFAA, 0xFFAB, 0xFFAC, 0xFFAD, 0xFFAE, 0xFFAF,
/* B */ 0xFFB0, 0xFFB1, 0xFFB2, 0xFFB3, 0xFFB4, 0xFFB5, 0xFFB6, 0xFFB7,
0xFFB8, 0xFFB9, 0xFFBA, 0xFFBB, 0xFFBC, 0xFFBD, 0xFFBE, 0xFFBF,
/* C */ 0xFFC0, 0xFFC1, 0xFFC2, 0xFFC3, 0xFFC4, 0xFFC5, 0xFFC6, 0xFFC7,
0xFFC8, 0xFFC9, 0xFFCA, 0xFFCB, 0xFFCC, 0xFFCD, 0xFFCE, 0xFFCF,
/* D */ 0xFFD0, 0xFFD1, 0xFFD2, 0xFFD3, 0xFFD4, 0xFFD5, 0xFFD6, 0xFFD7,
0xFFD8, 0xFFD9, 0xFFDA, 0xFFDB, 0xFFDC, 0xFFDD, 0xFFDE, 0xFFDF,
/* E */ 0xFFE0, 0xFFE1, 0xFFE2, 0xFFE3, 0xFFE4, 0xFFE5, 0xFFE6, 0xFFE7,
0xFFE8, 0xFFE9, 0xFFEA, 0xFFEB, 0xFFEC, 0xFFED, 0xFFEE, 0xFFEF,
/* F */ 0xFFF0, 0xFFF1, 0xFFF2, 0xFFF3, 0xFFF4, 0xFFF5, 0xFFF6, 0xFFF7,
0xFFF8, 0xFFF9, 0xFFFA, 0xFFFB, 0xFFFC, 0xFFFD, 0xFFFE, 0xFFFF,
};

383
libisofs/hfsplus_classes.c Normal file
View File

@ -0,0 +1,383 @@
#ifdef HAVE_CONFIG_H
#include "../config.h"
#endif
#include "hfsplus.h"
/* Based on Unicode 3.2.0. */
static uint16_t page03[256] = {
[0x00] = 0x230,
[0x01] = 0x230,
[0x02] = 0x230,
[0x03] = 0x230,
[0x04] = 0x230,
[0x05] = 0x230,
[0x06] = 0x230,
[0x07] = 0x230,
[0x08] = 0x230,
[0x09] = 0x230,
[0x0a] = 0x230,
[0x0b] = 0x230,
[0x0c] = 0x230,
[0x0d] = 0x230,
[0x0e] = 0x230,
[0x0f] = 0x230,
[0x10] = 0x230,
[0x11] = 0x230,
[0x12] = 0x230,
[0x13] = 0x230,
[0x14] = 0x230,
[0x15] = 0x232,
[0x16] = 0x220,
[0x17] = 0x220,
[0x18] = 0x220,
[0x19] = 0x220,
[0x1a] = 0x232,
[0x1b] = 0x216,
[0x1c] = 0x220,
[0x1d] = 0x220,
[0x1e] = 0x220,
[0x1f] = 0x220,
[0x20] = 0x220,
[0x21] = 0x202,
[0x22] = 0x202,
[0x23] = 0x220,
[0x24] = 0x220,
[0x25] = 0x220,
[0x26] = 0x220,
[0x27] = 0x202,
[0x28] = 0x202,
[0x29] = 0x220,
[0x2a] = 0x220,
[0x2b] = 0x220,
[0x2c] = 0x220,
[0x2d] = 0x220,
[0x2e] = 0x220,
[0x2f] = 0x220,
[0x30] = 0x220,
[0x31] = 0x220,
[0x32] = 0x220,
[0x33] = 0x220,
[0x34] = 0x1,
[0x35] = 0x1,
[0x36] = 0x1,
[0x37] = 0x1,
[0x38] = 0x1,
[0x39] = 0x220,
[0x3a] = 0x220,
[0x3b] = 0x220,
[0x3c] = 0x220,
[0x3d] = 0x230,
[0x3e] = 0x230,
[0x3f] = 0x230,
[0x40] = 0x230,
[0x41] = 0x230,
[0x42] = 0x230,
[0x43] = 0x230,
[0x44] = 0x230,
[0x45] = 0x240,
[0x46] = 0x230,
[0x47] = 0x220,
[0x48] = 0x220,
[0x49] = 0x220,
[0x4a] = 0x230,
[0x4b] = 0x230,
[0x4c] = 0x230,
[0x4d] = 0x220,
[0x4e] = 0x220,
[0x60] = 0x234,
[0x61] = 0x234,
[0x62] = 0x233,
[0x63] = 0x230,
[0x64] = 0x230,
[0x65] = 0x230,
[0x66] = 0x230,
[0x67] = 0x230,
[0x68] = 0x230,
[0x69] = 0x230,
[0x6a] = 0x230,
[0x6b] = 0x230,
[0x6c] = 0x230,
[0x6d] = 0x230,
[0x6e] = 0x230,
[0x6f] = 0x230,
};
static uint16_t page04[256] = {
[0x83] = 0x230,
[0x84] = 0x230,
[0x85] = 0x230,
[0x86] = 0x230,
};
static uint16_t page05[256] = {
[0x91] = 0x220,
[0x92] = 0x230,
[0x93] = 0x230,
[0x94] = 0x230,
[0x95] = 0x230,
[0x96] = 0x220,
[0x97] = 0x230,
[0x98] = 0x230,
[0x99] = 0x230,
[0x9a] = 0x222,
[0x9b] = 0x220,
[0x9c] = 0x230,
[0x9d] = 0x230,
[0x9e] = 0x230,
[0x9f] = 0x230,
[0xa0] = 0x230,
[0xa1] = 0x230,
[0xa3] = 0x220,
[0xa4] = 0x220,
[0xa5] = 0x220,
[0xa6] = 0x220,
[0xa7] = 0x220,
[0xa8] = 0x230,
[0xa9] = 0x230,
[0xaa] = 0x220,
[0xab] = 0x230,
[0xac] = 0x230,
[0xad] = 0x222,
[0xae] = 0x228,
[0xaf] = 0x230,
[0xb0] = 0x10,
[0xb1] = 0x11,
[0xb2] = 0x12,
[0xb3] = 0x13,
[0xb4] = 0x14,
[0xb5] = 0x15,
[0xb6] = 0x16,
[0xb7] = 0x17,
[0xb8] = 0x18,
[0xb9] = 0x19,
[0xbb] = 0x20,
[0xbc] = 0x21,
[0xbd] = 0x22,
[0xbf] = 0x23,
[0xc1] = 0x24,
[0xc2] = 0x25,
[0xc4] = 0x230,
};
static uint16_t page06[256] = {
[0x4b] = 0x27,
[0x4c] = 0x28,
[0x4d] = 0x29,
[0x4e] = 0x30,
[0x4f] = 0x31,
[0x50] = 0x32,
[0x51] = 0x33,
[0x52] = 0x34,
[0x53] = 0x230,
[0x54] = 0x230,
[0x55] = 0x220,
[0x70] = 0x35,
[0xd6] = 0x230,
[0xd7] = 0x230,
[0xd8] = 0x230,
[0xd9] = 0x230,
[0xda] = 0x230,
[0xdb] = 0x230,
[0xdc] = 0x230,
[0xdf] = 0x230,
[0xe0] = 0x230,
[0xe1] = 0x230,
[0xe2] = 0x230,
[0xe3] = 0x220,
[0xe4] = 0x230,
[0xe7] = 0x230,
[0xe8] = 0x230,
[0xea] = 0x220,
[0xeb] = 0x230,
[0xec] = 0x230,
[0xed] = 0x220,
};
static uint16_t page07[256] = {
[0x11] = 0x36,
[0x30] = 0x230,
[0x31] = 0x220,
[0x32] = 0x230,
[0x33] = 0x230,
[0x34] = 0x220,
[0x35] = 0x230,
[0x36] = 0x230,
[0x37] = 0x220,
[0x38] = 0x220,
[0x39] = 0x220,
[0x3a] = 0x230,
[0x3b] = 0x220,
[0x3c] = 0x220,
[0x3d] = 0x230,
[0x3e] = 0x220,
[0x3f] = 0x230,
[0x40] = 0x230,
[0x41] = 0x230,
[0x42] = 0x220,
[0x43] = 0x230,
[0x44] = 0x220,
[0x45] = 0x230,
[0x46] = 0x220,
[0x47] = 0x230,
[0x48] = 0x220,
[0x49] = 0x230,
[0x4a] = 0x230,
};
static uint16_t page09[256] = {
[0x3c] = 0x7,
[0x4d] = 0x9,
[0x51] = 0x230,
[0x52] = 0x220,
[0x53] = 0x230,
[0x54] = 0x230,
[0xbc] = 0x7,
[0xcd] = 0x9,
};
static uint16_t page0a[256] = {
[0x3c] = 0x7,
[0x4d] = 0x9,
[0xbc] = 0x7,
[0xcd] = 0x9,
};
static uint16_t page0b[256] = {
[0x3c] = 0x7,
[0x4d] = 0x9,
[0xcd] = 0x9,
};
static uint16_t page0c[256] = {
[0x4d] = 0x9,
[0x55] = 0x84,
[0x56] = 0x91,
[0xcd] = 0x9,
};
static uint16_t page0d[256] = {
[0x4d] = 0x9,
[0xca] = 0x9,
};
static uint16_t page0e[256] = {
[0x38] = 0x103,
[0x39] = 0x103,
[0x3a] = 0x9,
[0x48] = 0x107,
[0x49] = 0x107,
[0x4a] = 0x107,
[0x4b] = 0x107,
[0xb8] = 0x118,
[0xb9] = 0x118,
[0xc8] = 0x122,
[0xc9] = 0x122,
[0xca] = 0x122,
[0xcb] = 0x122,
};
static uint16_t page0f[256] = {
[0x18] = 0x220,
[0x19] = 0x220,
[0x35] = 0x220,
[0x37] = 0x220,
[0x39] = 0x216,
[0x71] = 0x129,
[0x72] = 0x130,
[0x74] = 0x132,
[0x7a] = 0x130,
[0x7b] = 0x130,
[0x7c] = 0x130,
[0x7d] = 0x130,
[0x80] = 0x130,
[0x82] = 0x230,
[0x83] = 0x230,
[0x84] = 0x9,
[0x86] = 0x230,
[0x87] = 0x230,
[0xc6] = 0x220,
};
static uint16_t page10[256] = {
[0x37] = 0x7,
[0x39] = 0x9,
};
static uint16_t page17[256] = {
[0x14] = 0x9,
[0x34] = 0x9,
[0xd2] = 0x9,
};
static uint16_t page18[256] = {
[0xa9] = 0x228,
};
static uint16_t page20[256] = {
[0xd0] = 0x230,
[0xd1] = 0x230,
[0xd2] = 0x1,
[0xd3] = 0x1,
[0xd4] = 0x230,
[0xd5] = 0x230,
[0xd6] = 0x230,
[0xd7] = 0x230,
[0xd8] = 0x1,
[0xd9] = 0x1,
[0xda] = 0x1,
[0xdb] = 0x230,
[0xdc] = 0x230,
[0xe1] = 0x230,
[0xe5] = 0x1,
[0xe6] = 0x1,
[0xe7] = 0x230,
[0xe8] = 0x220,
[0xe9] = 0x230,
[0xea] = 0x1,
};
static uint16_t page30[256] = {
[0x2a] = 0x218,
[0x2b] = 0x228,
[0x2c] = 0x232,
[0x2d] = 0x222,
[0x2e] = 0x224,
[0x2f] = 0x224,
[0x99] = 0x8,
[0x9a] = 0x8,
};
static uint16_t pagefb[256] = {
[0x1e] = 0x26,
};
static uint16_t pagefe[256] = {
[0x20] = 0x230,
[0x21] = 0x230,
[0x22] = 0x230,
[0x23] = 0x230,
};
const uint16_t *hfsplus_class_pages[256] = {
[0x03] = page03,
[0x04] = page04,
[0x05] = page05,
[0x06] = page06,
[0x07] = page07,
[0x09] = page09,
[0x0a] = page0a,
[0x0b] = page0b,
[0x0c] = page0c,
[0x0d] = page0d,
[0x0e] = page0e,
[0x0f] = page0f,
[0x10] = page10,
[0x17] = page17,
[0x18] = page18,
[0x20] = page20,
[0x30] = page30,
[0xfb] = pagefb,
[0xfe] = pagefe,
};

1019
libisofs/hfsplus_decompose.c Normal file
View File

File diff suppressed because it is too large Load Diff