ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Util: Fix TBL control characters

This commit is contained in:
Jeffrey Pfau 2016-11-01 15:51:14 -07:00
parent e4c8b61709
commit 57894955a2
2 changed files with 63 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/util/test/text-codec.c
View File

@ -766,6 +766,64 @@ M_TEST_DEFINE(raggedEntry) {
vf->close(vf);
}
M_TEST_DEFINE(controlCodes) {
static const char file[] =
"*=01\n"
"/=02\n"
"\\=03";
struct VFile* vf = VFileFromConstMemory(file, sizeof(file) - 1);
struct TextCodec codec;
assert_true(TextCodecLoadTBL(&codec, vf, true));
struct TextCodecIterator iter;
uint8_t output[16] = {};
size_t len;
len = 0;
TextCodecStartDecode(&codec, &iter);
len += TextCodecAdvance(&iter, 1, output + len, sizeof(output) - len);
len += TextCodecFinish(&iter, output + len, sizeof(output) - len);
assert_int_equal(len, 1);
assert_memory_equal(output, "\n", 1);
len = 0;
TextCodecStartDecode(&codec, &iter);
len += TextCodecAdvance(&iter, 2, output + len, sizeof(output) - len);
len += TextCodecFinish(&iter, output + len, sizeof(output) - len);
assert_int_equal(len, 1);
assert_memory_equal(output, "\x1F", 1);
len = 0;
TextCodecStartDecode(&codec, &iter);
len += TextCodecAdvance(&iter, 3, output + len, sizeof(output) - len);
len += TextCodecFinish(&iter, output + len, sizeof(output) - len);
assert_int_equal(len, 1);
assert_memory_equal(output, "\x1E", 1);
len = 0;
TextCodecStartEncode(&codec, &iter);
len += TextCodecAdvance(&iter, '\n', output + len, sizeof(output) - len);
len += TextCodecFinish(&iter, output + len, sizeof(output) - len);
assert_int_equal(len, 1);
assert_memory_equal(output, "\1", 1);
len = 0;
TextCodecStartEncode(&codec, &iter);
len += TextCodecAdvance(&iter, '\x1F', output + len, sizeof(output) - len);
len += TextCodecFinish(&iter, output + len, sizeof(output) - len);
assert_int_equal(len, 1);
assert_memory_equal(output, "\2", 1);
len = 0;
TextCodecStartEncode(&codec, &iter);
len += TextCodecAdvance(&iter, '\x1E', output + len, sizeof(output) - len);
len += TextCodecFinish(&iter, output + len, sizeof(output) - len);
assert_int_equal(len, 1);
assert_memory_equal(output, "\3", 1);
TextCodecDeinit(&codec);
vf->close(vf);
}
M_TEST_SUITE_DEFINE(TextCodec,
cmocka_unit_test(emptyCodec),
cmocka_unit_test(singleEntry),
@ -775,4 +833,5 @@ M_TEST_SUITE_DEFINE(TextCodec,
cmocka_unit_test(longEntryReverse),
cmocka_unit_test(overlappingEntry),
cmocka_unit_test(overlappingEntryReverse),
cmocka_unit_test(raggedEntry))
cmocka_unit_test(raggedEntry),
cmocka_unit_test(controlCodes))

6
src/util/text-codec.c
View File

@ -79,13 +79,13 @@ bool TextCodecLoadTBL(struct TextCodec* codec, struct VFile* vf, bool createReve
if (!hex8(lineBuffer, &value)) {
switch (lineBuffer[0]) {
case '*':
wordBuffer[0] = '\n';
lineBuffer[0] = '\n';
break;
case '\\':
wordBuffer[0] = '\x30';
lineBuffer[0] = '\x1E';
break;
case '/':
wordBuffer[0] = '\x31';
lineBuffer[0] = '\x1F';
break;
default:
return false;