From 78f002c901a89bebbf7337c1797e3d9e8249309c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Mon, 22 May 2017 23:12:04 +0200 Subject: [PATCH] vvfat: handle KANJI lead byte 0xe5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Specification: "FAT: General overview of on-disk format" v1.03, page 23 Signed-off-by: Hervé Poussineau Signed-off-by: Kevin Wolf --- block/vvfat.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/block/vvfat.c b/block/vvfat.c index dc9af01167..9cb48ef6ac 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -589,6 +589,10 @@ static direntry_t *create_short_filename(BDRVVVFATState *s, } } + if (entry->name[0] == 0xe5) { + entry->name[0] = 0x05; + } + /* numeric-tail generation */ for (j = 0; j < 8; j++) { if (entry->name[j] == ' ') { @@ -709,8 +713,6 @@ static inline void init_fat(BDRVVVFATState* s) } -/* TODO: in create_short_filename, 0xe5->0x05 is not yet handled! */ -/* TODO: in parse_short_filename, 0x05->0xe5 is not yet handled! */ static inline direntry_t* create_short_and_long_name(BDRVVVFATState* s, unsigned int directory_start, const char* filename, int is_dot) { @@ -1743,6 +1745,9 @@ static int parse_short_name(BDRVVVFATState* s, } else lfn->name[i + j + 1] = '\0'; + if (lfn->name[0] == 0x05) { + lfn->name[0] = 0xe5; + } lfn->len = strlen((char*)lfn->name); return 0;